diff --git a/engine/client/application/Miff/src/linux/InputFileHandler.cpp b/engine/client/application/Miff/src/linux/InputFileHandler.cpp index ead23d7c..0cb2d496 100755 --- a/engine/client/application/Miff/src/linux/InputFileHandler.cpp +++ b/engine/client/application/Miff/src/linux/InputFileHandler.cpp @@ -124,7 +124,7 @@ int InputFileHandler::deleteFile( if (deleteHandleFlag && file) { delete file; - file = NULL; + file = nullptr; } return(unlink(filename)); } diff --git a/engine/client/application/Miff/src/linux/OutputFileHandler.cpp b/engine/client/application/Miff/src/linux/OutputFileHandler.cpp index 1c8ffe96..82fa61a9 100755 --- a/engine/client/application/Miff/src/linux/OutputFileHandler.cpp +++ b/engine/client/application/Miff/src/linux/OutputFileHandler.cpp @@ -20,7 +20,7 @@ OutputFileHandler::OutputFileHandler(const char *filename) { outputIFF = new Iff(MAXIFFDATASIZE); - outFilename = NULL; + outFilename = nullptr; setCurrentFilename(filename); } @@ -45,7 +45,7 @@ OutputFileHandler::~OutputFileHandler(void) delete [] outFilename; } - outputIFF = NULL; + outputIFF = nullptr; } diff --git a/engine/client/application/Miff/src/linux/miff.cpp b/engine/client/application/Miff/src/linux/miff.cpp index cd395ab5..5bf4af1b 100755 --- a/engine/client/application/Miff/src/linux/miff.cpp +++ b/engine/client/application/Miff/src/linux/miff.cpp @@ -55,7 +55,7 @@ //================================================= static vars assignment == const int entryPointVersion = 1; // constantly check DataEntryPoint.h to see if this value has changed -OutputFileHandler *outfileHandler = NULL; +OutputFileHandler *outfileHandler = nullptr; const int bufferSize = 16 * 1024 * 1024; const int maxStringSize = 256; const char version[] = "1.3 September 18, 2000"; @@ -242,7 +242,7 @@ int main( int argc, // number of args in commandline // static void callbackFunction(void) { - outfileHandler = NULL; + outfileHandler = nullptr; #ifdef WIN32 @@ -392,13 +392,13 @@ static errorType evaluateArgs(void) // get default values from DOS char currentDir[maxStringSize]; - if (NULL == getcwd(currentDir, maxStringSize)) // get current working directory + if (nullptr == getcwd(currentDir, maxStringSize)) // get current working directory { retVal = ERR_UNKNOWNDIR; return(retVal); } drive[0] = currentDir[0]; // drive letter - drive[1] = 0; // and null terminate it + drive[1] = 0; // and nullptr terminate it strcpy(extension, "IFF"); // default to uppercase .IFF strcpy(directory, ¤tDir[2]); // get everything after the Drive: including the first backslash filename[0] = 0; @@ -619,7 +619,7 @@ static errorType loadInputToBuffer( // we've successfully read the file, now close it... delete inFileHandler; } - else // inFileName is NULL + else // inFileName is nullptr { retVal = ERR_FILENOTFOUND; } @@ -746,7 +746,7 @@ static void handleError(errorType error) // Revisions and History: // 1/07/99 [] - created // -extern "C" void MIFFMessage(char *message, // null terminated string to be displayed +extern "C" void MIFFMessage(char *message, // nullptr terminated string to be displayed int forceOutput) // if non-zero, it will print out even in quiet mode (for ERRORs) { if (forceOutput) diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferClient.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferClient.cpp index eb67f237..c7ddebeb 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferClient.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferClient.cpp @@ -35,7 +35,7 @@ void AuctionTransferClient::addCoinToAuction( const ExchangeListCreditsMessage& // 2bi. if user connected: send VeAuctionCoinReply (with result code) to user's ES // 2bii. if user not connected: send immediate abort back to auction service - const unsigned uTrack = getNewTransactionID( NULL ); + const unsigned uTrack = getNewTransactionID( nullptr ); AuctionAssetDetails &details = m_mPendingRequestDetails[ uTrack ]; details.u8Type = AuctionAssetDetails::TYPE_COIN; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp index 6c412225..3735217d 100644 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp @@ -119,7 +119,7 @@ unsigned GenericAPICore::submitRequest(GenericRequest *req, GenericResponse *res } req->setTrack(m_currTrack); res->setTrack(m_currTrack); - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -138,7 +138,7 @@ void GenericAPICore::process() if (!m_suspended) { // Process timeout on pending requests - while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(NULL))) + while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(nullptr))) { --m_outCount; res = m_outboundQueue.front().second; @@ -150,7 +150,7 @@ void GenericAPICore::process() } // Process timeout on pending responses - while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(NULL))) + while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(nullptr))) { --m_pendingCount; m_pending.erase(m_pending.begin()); @@ -163,7 +163,7 @@ void GenericAPICore::process() pair out_pair = m_outboundQueue.front(); req = out_pair.first; res = out_pair.second; - GenericConnection *con = NULL; + GenericConnection *con = nullptr; if (req->getMappedServerTrack() == 0) // request has no originating "owner" server { con = getNextActiveConnection(); // it does not matter which server we send this to @@ -180,7 +180,7 @@ void GenericAPICore::process() } } - if (con != NULL) + if (con != nullptr) { Base::ByteStream msg; req->pack(msg); @@ -215,7 +215,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() unsigned startIndex = m_nextConnectionIndex; unsigned maxIndex = m_serverConnections.size() - 1; - GenericConnection *con = NULL; + GenericConnection *con = nullptr; //loop until we find an active connection, or until we get back // to where we started @@ -235,7 +235,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() //went past end of vector, start back at 0 m_nextConnectionIndex = 0; } - }while (con == NULL && m_nextConnectionIndex != startIndex); + }while (con == nullptr && m_nextConnectionIndex != startIndex); return con; } @@ -261,7 +261,7 @@ ServerTrackObject *GenericAPICore::findServer(unsigned server_track) { std::map::iterator iter = m_serverTracks.find(server_track); if (iter == m_serverTracks.end()) - return NULL; + return nullptr; ServerTrackObject *stobj = (*iter).second; m_serverTracks.erase(server_track); return stobj; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp index 318f5c20..8abb0dff 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericConnection.cpp @@ -25,7 +25,7 @@ using namespace Base; GenericConnection::GenericConnection(const char *host, short port, GenericAPICore *apiCore, unsigned reconnectTimeout, unsigned noDataTimeoutSecs, unsigned, unsigned incomingBufSizeInKB, unsigned outgoingBufSizeInKB, unsigned keepAlive, unsigned maxRecvMessageSizeInKB) : m_bConnected(CON_NONE), m_apiCore(apiCore), - m_con(NULL), + m_con(nullptr), m_host(host), m_port(port), m_lastTrack(123455), //random choice != 1 @@ -50,8 +50,8 @@ GenericConnection::~GenericConnection() { if(m_con) { - m_con->SetHandler(NULL); - m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to null, so it wont + m_con->SetHandler(nullptr); + m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to nullptr, so it wont m_con->Release(); } @@ -64,7 +64,7 @@ void GenericConnection::disconnect() { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; @@ -77,7 +77,7 @@ void GenericConnection::OnTerminated(TcpConnection *) if(m_con) { m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; @@ -93,7 +93,7 @@ void GenericConnection::OnRoutePacket(TcpConnection *, const unsigned char *data get(iter, type); get(iter, track); - GenericResponse *res = NULL; + GenericResponse *res = nullptr; // the following if block is a temporary fix that prevents // a crash with a game team in which they occasionally find @@ -152,7 +152,7 @@ void GenericConnection::process() { m_con->SetHandler(this); m_conState = CON_NEGOTIATE; - m_conTimeout = time(NULL) + m_reconnectTimeout; + m_conTimeout = time(nullptr) + m_reconnectTimeout; } break; case CON_NEGOTIATE: @@ -178,12 +178,12 @@ void GenericConnection::process() put(msg, std::string(m_apiCore->m_gameIdentifiers[index])); Send(msg); } - else if(time(NULL) > m_conTimeout) + else if(time(nullptr) > m_conTimeout) { // we did not connect m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; } @@ -199,7 +199,7 @@ void GenericConnection::process() { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } } m_manager->GiveTime(); diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp index 872eff5e..7e716a00 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPI.cpp @@ -25,9 +25,9 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi std::vector portArray; char hostConfig[4096]; char identifierConfig[4096]; - if (hostNames == NULL) + if (hostNames == nullptr) hostNames = DEFAULT_HOST; - if(identifiers == NULL) + if(identifiers == nullptr) identifiers = DEFAULT_IDENTIFIER; // parse the hosts and ports out : @@ -52,7 +52,7 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi portArray.push_back(port); } } - while ((ptr = strtok(NULL, " ")) != NULL); + while ((ptr = strtok(nullptr, " ")) != nullptr); } strncpy(identifierConfig, identifiers, 4096); identifierConfig[4095] = 0; @@ -67,7 +67,7 @@ AuctionTransferAPI::AuctionTransferAPI(const char *hostNames, const char *identi identifierArray.push_back(identifier); } } - while ((ptr = strtok(NULL, ";")) != NULL); + while ((ptr = strtok(nullptr, ";")) != nullptr); } if (hostArray.empty()) @@ -134,7 +134,7 @@ unsigned AuctionTransferAPI::sendCommitTransaction(long long transactionID, void unsigned AuctionTransferAPI::sendPrepareTransaction(const char *serverIdentifier, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const char *xmlAsset, void *user, bool compress) { RequestTypes requestEnum = GAME_REQUEST_SEND_PREPARE_TRANSACTION; - GenericRequest *req = NULL; + GenericRequest *req = nullptr; if( compress ) { requestEnum = GAME_REQUEST_SEND_PREPARE_TRANSACTION_COMPRESSED; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.cpp index e3400df0..8ad45428 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Base/Archive.cpp @@ -91,7 +91,7 @@ namespace Base ByteStream::ByteStream() : allocatedSize(0), beginReadIterator(), - data(NULL), + data(nullptr), size(0), lastPutSize(0) { @@ -208,7 +208,7 @@ namespace Base if(data->size < allocatedSize) { unsigned char * tmp = new unsigned char[newSize]; - if(data->buffer != NULL) + if(data->buffer != nullptr) memcpy(tmp, data->buffer, size); delete[] data->buffer; data->buffer = tmp; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp index 13291373..ed2e0ad3 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp @@ -7,7 +7,7 @@ void put(Base::ByteStream &msg, const Blob &source); ////////////////////////////////////////////////////////////////////////////////////// Blob::Blob(const unsigned char *data, unsigned len) - : m_data(NULL), + : m_data(nullptr), m_len(len) { if (m_len > 0) @@ -20,7 +20,7 @@ void put(Base::ByteStream &msg, const Blob &source); ////////////////////////////////////////////////////////////////////////////////////// Blob::Blob(const Blob &cpy) - : m_data(NULL), + : m_data(nullptr), m_len(cpy.m_len) { if (m_len > 0) @@ -45,7 +45,7 @@ void put(Base::ByteStream &msg, const Blob &source); if (m_data) { delete [] m_data; - m_data = NULL; + m_data = nullptr; } m_len = cpy.m_len; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/IPAddress.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/IPAddress.h index f6d5f886..03b59e8d 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/IPAddress.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/IPAddress.h @@ -32,7 +32,7 @@ public: * @brief Used to retreive the the dot-notation represenatatiion of this address. * * @param buffer A pointer to the buffer to place the ip address into. - * Must be at least 17 characters long, will be null terminated. + * Must be at least 17 characters long, will be nullptr terminated. * * @return A pointer to the buffer the address was placed into. */ diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpBlockAllocator.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpBlockAllocator.cpp index 6d476d78..b7da0f27 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpBlockAllocator.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpBlockAllocator.cpp @@ -6,7 +6,7 @@ namespace NAMESPACE #endif TcpBlockAllocator::TcpBlockAllocator(const unsigned initSize, const unsigned initCount) -: m_freeHead(NULL), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) +: m_freeHead(nullptr), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) { realloc(); } @@ -33,7 +33,7 @@ data_block *TcpBlockAllocator::getBlock() tmp = m_freeHead; m_freeHead = m_freeHead->m_next; - tmp->m_next = NULL; + tmp->m_next = nullptr; m_numAvailBlocks--; return(tmp); } @@ -56,7 +56,7 @@ void TcpBlockAllocator::returnBlock(data_block *b) void TcpBlockAllocator::realloc() { - data_block *tmp = NULL, *cursor = NULL; + data_block *tmp = nullptr, *cursor = nullptr; tmp = new data_block; m_numAvailBlocks++; cursor = tmp; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp index 41f75157..20fdad78 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.cpp @@ -11,28 +11,28 @@ namespace NAMESPACE //used when want to open new connection with this socket TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, const IPAddress &destIP, short destPort, unsigned timeout) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(INVALID_SOCKET), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusNegotiating), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(timeout), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -94,28 +94,28 @@ TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAllo //used when server mode creates new connection object representing a connect request TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, SOCKET socket, const IPAddress &destIP, short destPort) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(socket), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusConnected), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(0), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -208,7 +208,7 @@ int TcpConnection::finishConnect() t.tv_sec = 0; t.tv_usec = 0; - int err = select(m_socket + 1, NULL, &wrSet, NULL, &t); + int err = select(m_socket + 1, nullptr, &wrSet, nullptr, &t); if (err == 0) { @@ -303,7 +303,7 @@ TcpConnection::~TcpConnection() { delete [] m_recvBuff; - while(m_head != NULL) + while(m_head != nullptr) { data_block *tmp = m_head; m_head = m_head->m_next; @@ -327,22 +327,22 @@ void TcpConnection::Send(const char *data, unsigned int dataLen) { m_aliveListId = m_manager->m_keepAliveList.m_listID; - if (m_prevKeepAliveConnection != NULL) + if (m_prevKeepAliveConnection != nullptr) m_prevKeepAliveConnection->m_nextKeepAliveConnection = m_nextKeepAliveConnection; - if (m_nextKeepAliveConnection != NULL) + if (m_nextKeepAliveConnection != nullptr) m_nextKeepAliveConnection->m_prevKeepAliveConnection = m_prevKeepAliveConnection; if (m_manager->m_keepAliveList.m_beginList == this) m_manager->m_keepAliveList.m_beginList = m_nextKeepAliveConnection; m_nextKeepAliveConnection = m_manager->m_aliveList.m_beginList; - m_prevKeepAliveConnection = NULL; - if (m_manager->m_aliveList.m_beginList != NULL) + m_prevKeepAliveConnection = nullptr; + if (m_manager->m_aliveList.m_beginList != nullptr) m_manager->m_aliveList.m_beginList->m_prevKeepAliveConnection = this; m_manager->m_aliveList.m_beginList = this; } - data_block *work = NULL; + data_block *work = nullptr; // this connection has no send buffer. Get a block if(!m_tail) @@ -467,16 +467,16 @@ int TcpConnection::processIncoming() { m_recvDataListId = m_manager->m_noDataList.m_listID; - if (m_prevRecvDataConnection != NULL) + if (m_prevRecvDataConnection != nullptr) m_prevRecvDataConnection->m_nextRecvDataConnection = m_nextRecvDataConnection; - if (m_nextRecvDataConnection != NULL) + if (m_nextRecvDataConnection != nullptr) m_nextRecvDataConnection->m_prevRecvDataConnection = m_prevRecvDataConnection; if (m_manager->m_noDataList.m_beginList == this) m_manager->m_noDataList.m_beginList = m_nextRecvDataConnection; m_nextRecvDataConnection = m_manager->m_dataList.m_beginList; - m_prevRecvDataConnection = NULL; - if (m_manager->m_dataList.m_beginList != NULL) + m_prevRecvDataConnection = nullptr; + if (m_manager->m_dataList.m_beginList != nullptr) m_manager->m_dataList.m_beginList->m_prevRecvDataConnection = this; m_manager->m_dataList.m_beginList = this; } @@ -622,7 +622,7 @@ int TcpConnection::processOutgoing() int sendError = 1; - // If m_head is not null, then this connection has something to send + // If m_head is not nullptr, then this connection has something to send if(m_head) diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.h index 07eb4f42..92d631d1 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpConnection.h @@ -50,7 +50,7 @@ public: * connection is disconnected, you simply need to derive your class * (multiply if necessary) from TcpConnectionHandler, then you can use * this method to set the object the TcpConnection will call as appropriate. - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for notifications. */ diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp index a89065a6..7c00d9f6 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.cpp @@ -41,14 +41,14 @@ TcpManager::TcpParams::TcpParams(const TcpParams &cpy) } TcpManager::TcpManager(const TcpParams ¶ms) -: m_handler(NULL), - m_keepAliveList(NULL, 1), - m_aliveList(NULL, 2), - m_noDataList(NULL, 1), - m_dataList(NULL, 2), +: m_handler(nullptr), + m_keepAliveList(nullptr, 1), + m_aliveList(nullptr, 2), + m_noDataList(nullptr, 1), + m_dataList(nullptr, 2), m_params(params), m_refCount(1), - m_connectionList(NULL), + m_connectionList(nullptr), m_connectionListCount(0), m_socket(INVALID_SOCKET), m_boundAsServer(false), @@ -86,7 +86,7 @@ TcpManager::~TcpManager() close(m_socket); #endif } - while (m_connectionList != NULL) + while (m_connectionList != nullptr) { TcpConnection *con = m_connectionList; m_connectionList = m_connectionList->m_nextConnection; @@ -166,7 +166,7 @@ bool TcpManager::BindAsServer() { struct hostent * lphp; lphp = gethostbyname(m_params.bindAddress); - if (lphp != NULL) + if (lphp != nullptr) addr_loc.sin_addr.s_addr = ((struct in_addr *)(lphp->h_addr))->s_addr; } else @@ -191,7 +191,7 @@ bool TcpManager::BindAsServer() TcpConnection *TcpManager::acceptClient() { - TcpConnection *newConn = NULL; + TcpConnection *newConn = nullptr; if (m_boundAsServer && m_connectionListCount < m_params.maxConnections) { @@ -205,7 +205,7 @@ TcpConnection *TcpManager::acceptClient() { newConn = new TcpConnection(this, &m_allocator, m_params, sock, IPAddress(addr.sin_addr.s_addr), ntohs(addr.sin_port)); addNewConnection(newConn); - if (m_handler != NULL) + if (m_handler != nullptr) { m_handler->OnConnectRequest(newConn); } @@ -230,8 +230,8 @@ SOCKET TcpManager::getMaxFD() if (m_boundAsServer) maxfd = m_socket+1; - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->GetStatus() != TcpConnection::StatusDisconnected && con->m_socket > maxfd) @@ -245,8 +245,8 @@ SOCKET TcpManager::getMaxFD() TcpConnection *TcpManager::getConnection(SOCKET fd) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->m_socket == fd) @@ -255,7 +255,7 @@ TcpConnection *TcpManager::getConnection(SOCKET fd) } } //if get here ,couldn't find it - return NULL; + return nullptr; } bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendTimePerConnection, unsigned maxRecvTimePerConnection) @@ -277,8 +277,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT { // Send output from last heartbeat - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -345,7 +345,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT tmpfds = m_permfds; timeout.tv_sec = 0; timeout.tv_usec = 0; - int cnt = select(maxfd, &tmpfds, NULL, NULL, &timeout); // blocks for timeout + int cnt = select(maxfd, &tmpfds, nullptr, nullptr, &timeout); // blocks for timeout if (cnt > 0) @@ -371,8 +371,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //process incoming client messages if (maxRecvTimePerConnection != 0) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -437,8 +437,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT pollfds[0].events |= POLLIN; } - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next, idx++) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next, idx++) { next = con->m_nextConnection; pollfds[idx].fd = con->m_socket; @@ -478,7 +478,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT } //process regular msg(s) - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -510,7 +510,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT }//if(pollfds[... else if (pollfds[idx].revents & POLLHUP) { - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -528,21 +528,21 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any keepalives, if time to do that if (m_params.keepAliveDelay > 0 && m_keepAliveTimer.isDone(m_params.keepAliveDelay)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_keepAliveList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_keepAliveList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); next = con->m_nextKeepAliveConnection; if (next) next->AddRef(); - con->Send(NULL, 0); //note: this request will move the connection from the keepAliveList to the aliveList + con->Send(nullptr, 0); //note: this request will move the connection from the keepAliveList to the aliveList con->Release(); } //now move the complete alive list over to the keepalive list to reset those timers m_keepAliveList.m_beginList = m_aliveList.m_beginList; - m_aliveList.m_beginList = NULL; + m_aliveList.m_beginList = nullptr; //switch id's for those connections that were in the alive list last go - around int tmpID = m_aliveList.m_listID; @@ -556,8 +556,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any noDataCons, if time to do that if (m_params.noDataTimeout > 0 && m_noDataTimer.isDone(m_params.noDataTimeout)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_noDataList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_noDataList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -571,7 +571,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now move the complete data list over to the nodata list to reset those timers m_noDataList.m_beginList = m_dataList.m_beginList; - m_dataList.m_beginList = NULL; + m_dataList.m_beginList = nullptr; //switch id's for those connections that were in the data list last go - around int tmpID = m_dataList.m_listID; @@ -593,11 +593,11 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { //can't open outgoing connections when in server mode // use a different TcpManager to do that - return NULL; + return nullptr; } if (m_connectionListCount >= m_params.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); @@ -605,8 +605,8 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; } IPAddress destIP(address); @@ -631,22 +631,22 @@ void TcpManager::addNewConnection(TcpConnection *con) } #endif con->m_nextConnection = m_connectionList; - con->m_prevConnection = NULL; - if (m_connectionList != NULL) + con->m_prevConnection = nullptr; + if (m_connectionList != nullptr) m_connectionList->m_prevConnection = con; m_connectionList = con; m_connectionListCount++; con->m_nextKeepAliveConnection = m_aliveList.m_beginList; - con->m_prevKeepAliveConnection = NULL; - if (m_aliveList.m_beginList != NULL) + con->m_prevKeepAliveConnection = nullptr; + if (m_aliveList.m_beginList != nullptr) m_aliveList.m_beginList->m_prevKeepAliveConnection = con; m_aliveList.m_beginList = con; con->m_aliveListId = m_keepAliveList.m_listID;//start it out thinking it's already in the alive list, since it is con->m_nextRecvDataConnection = m_dataList.m_beginList; - con->m_prevRecvDataConnection = NULL; - if (m_dataList.m_beginList != NULL) + con->m_prevRecvDataConnection = nullptr; + if (m_dataList.m_beginList != nullptr) m_dataList.m_beginList->m_prevRecvDataConnection = con; m_dataList.m_beginList = con; con->m_recvDataListId = m_noDataList.m_listID;//start it out thinking it's already in the data list, since it is @@ -667,40 +667,40 @@ void TcpManager::removeConnection(TcpConnection *con) #pragma warning(pop) } #endif - if (con->m_prevConnection != NULL) + if (con->m_prevConnection != nullptr) con->m_prevConnection->m_nextConnection = con->m_nextConnection; - if (con->m_nextConnection != NULL) + if (con->m_nextConnection != nullptr) con->m_nextConnection->m_prevConnection = con->m_prevConnection; if (m_connectionList == con) m_connectionList = con->m_nextConnection; - con->m_nextConnection = NULL; - con->m_prevConnection = NULL; + con->m_nextConnection = nullptr; + con->m_prevConnection = nullptr; - if (con->m_prevKeepAliveConnection != NULL) + if (con->m_prevKeepAliveConnection != nullptr) con->m_prevKeepAliveConnection->m_nextKeepAliveConnection = con->m_nextKeepAliveConnection; - if (con->m_nextKeepAliveConnection != NULL) + if (con->m_nextKeepAliveConnection != nullptr) con->m_nextKeepAliveConnection->m_prevKeepAliveConnection = con->m_prevKeepAliveConnection; if (m_aliveList.m_beginList == con) m_aliveList.m_beginList = con->m_nextKeepAliveConnection; else if (m_keepAliveList.m_beginList == con) m_keepAliveList.m_beginList = con->m_nextKeepAliveConnection; - con->m_nextKeepAliveConnection = NULL; - con->m_prevKeepAliveConnection = NULL; + con->m_nextKeepAliveConnection = nullptr; + con->m_prevKeepAliveConnection = nullptr; - if (con->m_prevRecvDataConnection != NULL) + if (con->m_prevRecvDataConnection != nullptr) con->m_prevRecvDataConnection->m_nextRecvDataConnection = con->m_nextRecvDataConnection; - if (con->m_nextRecvDataConnection != NULL) + if (con->m_nextRecvDataConnection != nullptr) con->m_nextRecvDataConnection->m_prevRecvDataConnection = con->m_prevRecvDataConnection; if (m_dataList.m_beginList == con) m_dataList.m_beginList = con->m_nextRecvDataConnection; else if (m_noDataList.m_beginList == con) m_noDataList.m_beginList = con->m_nextRecvDataConnection; - con->m_nextRecvDataConnection = NULL; - con->m_prevRecvDataConnection = NULL; + con->m_nextRecvDataConnection = nullptr; + con->m_prevRecvDataConnection = nullptr; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.h index 75eb6df4..c4e8b1cf 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/TcpLibrary/TcpManager.h @@ -156,7 +156,7 @@ public: * simply need to derive your class (multiply if necessary) from TcpManagerHandler, then you can use * this method to set the object the TcpManager will call as appropriate. The TcpConnection object * also has a handler mechanism that replaces the other callback functions below, see TcpConnection::SetHandler - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for manager related notifications. */ @@ -211,7 +211,7 @@ public: * the connect-complete callback to be called if the connection is succesfull. * * @return A pointer to a TcpConnection object. - * NULL if the manager object has exceeded its maximum number of connections + * nullptr if the manager object has exceeded its maximum number of connections * or if the serverAddress cannot be resolved to an IP address. */ TcpConnection *EstablishConnection(const char *serverAddress, unsigned short serverPort, unsigned timeout = 0); diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/GZipHelper.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/GZipHelper.h index a01bf682..dab0f9b3 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/GZipHelper.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/GZipHelper.h @@ -187,7 +187,7 @@ class CA2GZIPT int destroy() { int err = Z_OK; - if (m_zstream.state != NULL) { + if (m_zstream.state != nullptr) { err = deflateEnd(&(m_zstream)); } if (m_z_err < 0) err = m_z_err; @@ -459,7 +459,7 @@ class CGZIP2AT int destroy() { int err = Z_OK; - if (m_zstream.state != NULL) { + if (m_zstream.state != nullptr) { err = inflateEnd(&(m_zstream)); } if (m_z_err < 0) err = m_z_err; diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zlib.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zlib.h index 52cb529f..fb425a3b 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zlib.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zlib.h @@ -74,7 +74,7 @@ typedef struct z_stream_s { uInt avail_out; /* remaining free space at next_out */ uLong total_out; /* total nb of bytes output so far */ - char *msg; /* last error message, NULL if no error */ + char *msg; /* last error message, nullptr if no error */ struct internal_state FAR *state; /* not visible by applications */ alloc_func zalloc; /* used to allocate the internal state */ @@ -193,7 +193,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); enough memory, Z_STREAM_ERROR if level is not a valid compression level, Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible with the version assumed by the caller (ZLIB_VERSION). - msg is set to null if there is no error message. deflateInit does not + msg is set to nullptr if there is no error message. deflateInit does not perform any compression: this will be done by deflate(). */ @@ -271,7 +271,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); processed or more output produced), Z_STREAM_END if all input has been consumed and all output has been produced (only when flush is set to Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible + if next_in or next_out was nullptr), Z_BUF_ERROR if no progress is possible (for example avail_in or avail_out was zero). */ @@ -304,7 +304,7 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller. msg is set to null if there is no error + version assumed by the caller. msg is set to nullptr if there is no error message. inflateInit does not perform any decompression apart from reading the zlib header if present: this will be done by inflate(). (So next_in and avail_in may be modified, but next_out and avail_out are unchanged.) @@ -372,7 +372,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); preset dictionary is needed at this point, Z_DATA_ERROR if the input data was corrupted (input stream not conforming to the zlib format or incorrect adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent - (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not + (for example if next_in or next_out was nullptr), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if no progress is possible or if there was not enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the application may then call inflateSync to look for a good @@ -437,7 +437,7 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid - method). msg is set to null if there is no error message. deflateInit2 does + method). msg is set to nullptr if there is no error message. deflateInit2 does not perform any compression: this will be done by deflate(). */ @@ -471,7 +471,7 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, actually used by the compressor.) deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is + parameter is invalid (such as nullptr dictionary) or the stream state is inconsistent (for example if deflate has already been called for this stream or if the compression method is bsort). deflateSetDictionary does not perform any compression: this will be done by deflate(). @@ -491,7 +491,7 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being NULL). msg is left unchanged in both source and + (such as zalloc being nullptr). msg is left unchanged in both source and destination. */ @@ -503,7 +503,7 @@ ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); that may have been set by deflateInit2. deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). + stream state was inconsistent (such as zalloc or state being nullptr). */ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, @@ -544,7 +544,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative - memLevel). msg is set to null if there is no error message. inflateInit2 + memLevel). msg is set to nullptr if there is no error message. inflateInit2 does not perform any decompression apart from reading the zlib header if present: this will be done by inflate(). (So next_in and avail_in may be modified, but next_out and avail_out are unchanged.) @@ -562,7 +562,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, dictionary (see deflateSetDictionary). inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is + parameter is invalid (such as nullptr dictionary) or the stream state is inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the expected one (incorrect Adler32 value). inflateSetDictionary does not perform any decompression: this will be done by subsequent calls of @@ -591,7 +591,7 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); The stream will keep attributes that may have been set by inflateInit2. inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). + stream state was inconsistent (such as zalloc or state being nullptr). */ @@ -667,7 +667,7 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); gzopen can be used to read a file which is not in gzip format; in this case gzread will directly read from the file without decompression. - gzopen returns NULL if the file could not be opened or if there was + gzopen returns nullptr if the file could not be opened or if there was insufficient memory to allocate the (de)compression state; errno can be checked to distinguish the two cases (if errno is zero, the zlib error is Z_MEM_ERROR). */ @@ -681,7 +681,7 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); The next call of gzclose on the returned gzFile will also close the file descriptor fd, just like fclose(fdopen(fd), mode) closes the file descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). - gzdopen returns NULL if there was insufficient memory to allocate + gzdopen returns nullptr if there was insufficient memory to allocate the (de)compression state. */ @@ -718,8 +718,8 @@ ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); /* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. + Writes the given nullptr-terminated string to the compressed file, excluding + the terminating nullptr character. gzputs returns the number of characters written, or -1 in case of error. */ @@ -727,7 +727,7 @@ ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); /* Reads bytes from the compressed file until len-1 characters are read, or a newline character is read and transferred to buf, or an end-of-file - condition is encountered. The string is then terminated with a null + condition is encountered. The string is then terminated with a nullptr character. gzgets returns buf, or Z_NULL in case of error. */ @@ -822,7 +822,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is NULL, this function returns + return the updated checksum. If buf is nullptr, this function returns the required initial value for the checksum. An Adler-32 checksum is almost as reliable as a CRC32 but can be computed much faster. Usage example: @@ -838,7 +838,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value + crc. If buf is nullptr, this function returns the required initial value for the crc. Pre- and post-conditioning (one's complement) is performed within this function so it shouldn't be done by the application. Usage example: diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zutil.h b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zutil.h index 718ebc15..fecd535d 100755 --- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zutil.h +++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/zip/Zip/zutil.h @@ -116,7 +116,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ # include /* for fdopen */ # else # ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ +# define fdopen(fd,mode) nullptr /* No fdopen() */ # endif # endif #endif @@ -130,7 +130,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ #endif #if defined(_BEOS_) || defined(RISCOS) -# define fdopen(fd,mode) NULL /* No fdopen() */ +# define fdopen(fd,mode) nullptr /* No fdopen() */ #endif #if (defined(_MSC_VER) && (_MSC_VER > 600)) diff --git a/engine/server/application/CentralServer/src/shared/CentralCSHandler.h b/engine/server/application/CentralServer/src/shared/CentralCSHandler.h index e2b5fd0b..b07690de 100755 --- a/engine/server/application/CentralServer/src/shared/CentralCSHandler.h +++ b/engine/server/application/CentralServer/src/shared/CentralCSHandler.h @@ -69,7 +69,7 @@ protected: std::string name; EntryType type; - CentralCSHandlerFunc func; // will be null unless it's of TYPE_CENTRAL. + CentralCSHandlerFunc func; // will be nullptr unless it's of TYPE_CENTRAL. }; diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index 35d9e51c..3c1578f9 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -587,7 +587,7 @@ void CentralServer::getReadyGameServers(std::vector &theList) GameServerConnection * CentralServer::getRandomGameServer(void) { if (m_gameServerConnectionsList.empty()) - return NULL; + return nullptr; // m_gameServerConnectionsList ***DOES NOT*** contain the DB server so // we don't have to worry about checking for and excluding the DB server @@ -611,7 +611,7 @@ GameServerConnection * CentralServer::getRandomGameServer(void) indexNextGameServer = 0; } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -696,7 +696,7 @@ void CentralServer::launchStartingProcesses() const if (!m_taskManager || !m_taskManager->isConnected() || (m_clusterId == 0)) { if (!m_taskManager) - REPORT_LOG(true, ("CentralServer not launching starting processes because m_taskManager is NULL\n")); + REPORT_LOG(true, ("CentralServer not launching starting processes because m_taskManager is nullptr\n")); else if (!m_taskManager->isConnected()) REPORT_LOG(true, ("CentralServer not launching starting processes because m_taskManager->isConnected() is false\n")); @@ -820,7 +820,7 @@ void CentralServer::launchStartingPlanetServers() char const * const p = ConfigCentralServer::getStartPlanet(i); if (p) { - FATAL(!*p, ("CentralServer::launchStartingPlanetServers: ConfigCentralServer::getStartPlanet(%d) specified a non-null but empty planet name", i)); + FATAL(!*p, ("CentralServer::launchStartingPlanetServers: ConfigCentralServer::getStartPlanet(%d) specified a non-nullptr but empty planet name", i)); std::string planetName; std::string hostName; @@ -1495,7 +1495,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons { ConnectionServerConnection * c = (*ci); - if ( (c != NULL) + if ( (c != nullptr) && !c->getChatServiceAddress().empty() && (c->getChatServicePort() != 0)) { @@ -1537,13 +1537,13 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons { ChatServerConnection *connection = (*iterChatServerConnections); - if (connection != NULL) + if (connection != nullptr) { connection->send(address, true); } else { - REPORT_LOG(true, ("Trying to send the customer service server: chat server service address to a NULL chat server\n")); + REPORT_LOG(true, ("Trying to send the customer service server: chat server service address to a nullptr chat server\n")); } } } @@ -1556,7 +1556,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons { ConnectionServerConnection * c = (*ci); - if ( (c != NULL) + if ( (c != nullptr) && !c->getCustomerServiceAddress().empty() && (c->getCustomerServicePort() != 0)) { @@ -1631,7 +1631,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); const RequestGameServerForLoginMessage msg(ri); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); PlayerSceneMapType::const_iterator i = m_playerSceneMap.find(msg.getCharacterId()); if ((i != m_playerSceneMap.end()) && (i->second.second > timeNow)) { @@ -1892,14 +1892,14 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons } else { - if(getInstance().m_transferServerConnection != NULL) + if(getInstance().m_transferServerConnection != nullptr) { getInstance().m_transferServerConnection->disconnect(); getInstance().m_transferServerConnection = 0; s_retryTransferServerConnection = false; } - if(getInstance().m_stationPlayersCollectorConnection != NULL) + if(getInstance().m_stationPlayersCollectorConnection != nullptr) { getInstance().m_stationPlayersCollectorConnection->disconnect(); getInstance().m_stationPlayersCollectorConnection = 0; @@ -1947,11 +1947,11 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons if (iterFind != s_pendingRenameCharacter.end()) { ++(iterFind->second.second); - iterFind->second.first = ::time(NULL) + 3600; // 1 hour timeout + iterFind->second.first = ::time(nullptr) + 3600; // 1 hour timeout } else { - s_pendingRenameCharacter.insert(std::make_pair(msg.getValue().second.first, std::make_pair((::time(NULL) + 3600), 1))); // 1 hour timeout + s_pendingRenameCharacter.insert(std::make_pair(msg.getValue().second.first, std::make_pair((::time(nullptr) + 3600), 1))); // 1 hour timeout } // tell the chat server to destroy any avatar with the new name, but only if the first name changed @@ -2099,11 +2099,11 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons { i->second.first = ssfp.getValue().second.first; if (ssfp.getValue().second.second) - i->second.second = ::time(NULL) + static_cast(ConfigCentralServer::getCtsDenyLoginThresholdSeconds()); + i->second.second = ::time(nullptr) + static_cast(ConfigCentralServer::getCtsDenyLoginThresholdSeconds()); } else { - m_playerSceneMap[ssfp.getValue().first]=std::make_pair(ssfp.getValue().second.first, (ssfp.getValue().second.second ? (::time(NULL) + static_cast(ConfigCentralServer::getCtsDenyLoginThresholdSeconds())) : 0)); + m_playerSceneMap[ssfp.getValue().first]=std::make_pair(ssfp.getValue().second.first, (ssfp.getValue().second.second ? (::time(nullptr) + static_cast(ConfigCentralServer::getCtsDenyLoginThresholdSeconds())) : 0)); } } } @@ -2250,7 +2250,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage > const msg(ri); - m_timePopulationStatisticsRefresh = ::time(NULL); + m_timePopulationStatisticsRefresh = ::time(nullptr); m_populationStatistics = msg.getValue(); } else if (message.isType("GcwScoreStatRsp")) @@ -2258,7 +2258,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage, std::pair >, std::map > > > > const msg(ri); - m_timeGcwScoreStatisticsRefresh = ::time(NULL); + m_timeGcwScoreStatisticsRefresh = ::time(nullptr); std::string const timeGcwScoreStatisticsRefreshStr = CalendarTime::convertEpochToTimeStringLocal(m_timeGcwScoreStatisticsRefresh); std::map const & gcwImperialScorePercentile = msg.getValue().first; @@ -2330,7 +2330,7 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage >, std::map > > > const msg(ri); - m_timeLastLoginTimeStatisticsRefresh = ::time(NULL); + m_timeLastLoginTimeStatisticsRefresh = ::time(nullptr); m_lastLoginTimeStatistics = msg.getValue().first; m_createTimeStatistics = msg.getValue().second; } @@ -2606,7 +2606,7 @@ void CentralServer::removeGameServer(GameServerConnection const *gameServer) } else { - DEBUG_WARNING(true, ("A game server crashed but our process ID ptr is null.")); + DEBUG_WARNING(true, ("A game server crashed but our process ID ptr is nullptr.")); } } @@ -2828,7 +2828,7 @@ void CentralServer::update() if ( ConfigCentralServer::getAuctionEnabled() ) // allow auctions? { - if ( m_pAuctionTransferClient == NULL ) + if ( m_pAuctionTransferClient == nullptr ) { const char* hostName[1] = { ConfigCentralServer::getAuctionServer() }; const short port[1] = { (short)ConfigCentralServer::getAuctionPort() }; @@ -2975,7 +2975,7 @@ void CentralServer::sendToPlanetServer(const std::string &sceneId, const GameNet // ---------------------------------------------------------------------- -void CentralServer::sendToAllConnectionServers(const GameNetworkMessage & message, const bool reliable, Connection const * exclude /*= NULL*/) +void CentralServer::sendToAllConnectionServers(const GameNetworkMessage & message, const bool reliable, Connection const * exclude /*= nullptr*/) { // send to all connection servers for (ConnectionServerConnectionList::const_iterator i = m_connectionServerConnections.begin(); i != m_connectionServerConnections.end(); ++i) @@ -3005,7 +3005,7 @@ void CentralServer::sendToDBProcess(const GameNetworkMessage & message, const bo bool CentralServer::hasDBConnection() const { const GameServerConnection * g = getGameServer(getDbProcessServerProcessId()); - return (g != NULL); + return (g != nullptr); } //----------------------------------------------------------------------- @@ -3110,7 +3110,7 @@ void CentralServer::startPlanetServer(const std::string & host, const std::strin TaskSpawnProcess spawn(host.empty() ? std::string("any") : host, "PlanetServer", options, spawnDelay); CentralServer::getInstance().sendTaskMessage(spawn); - m_pendingPlanetServers[sceneId] = std::make_pair(std::make_pair(host, options), ::time(NULL)); + m_pendingPlanetServers[sceneId] = std::make_pair(std::make_pair(host, options), ::time(nullptr)); IGNORE_RETURN(m_planetsWaitingForPreload.insert(sceneId)); bool const preloadFinished = isPreloadFinished(); @@ -3119,14 +3119,14 @@ void CentralServer::startPlanetServer(const std::string & host, const std::strin else if (m_timeClusterWentIntoLoadingState <= 0) m_timeClusterWentIntoLoadingState = time(0); - if(getInstance().m_transferServerConnection != NULL && !preloadFinished) + if(getInstance().m_transferServerConnection != nullptr && !preloadFinished) { getInstance().m_transferServerConnection->disconnect(); getInstance().m_transferServerConnection = 0; s_retryTransferServerConnection = false; } - if(getInstance().m_stationPlayersCollectorConnection != NULL && ! isPreloadFinished()) + if(getInstance().m_stationPlayersCollectorConnection != nullptr && ! isPreloadFinished()) { getInstance().m_stationPlayersCollectorConnection->disconnect(); getInstance().m_stationPlayersCollectorConnection = 0; @@ -3263,7 +3263,7 @@ void CentralServer::handleGameServerForLoginMessage(const GameServerForLoginMess void CentralServer::handleExchangeListCreditsMessage(const ExchangeListCreditsMessage &msg) { LOG("Exchange", ("Central Server got exchange list credits %d.",msg.getCredits())); - if ( m_pAuctionTransferClient == NULL ) + if ( m_pAuctionTransferClient == nullptr ) { // send failure packet } @@ -3299,7 +3299,7 @@ ConnectionServerConnection * CentralServer::getAnyConnectionServer() ConnectionServerConnection * CentralServer::getConnectionServerForAccount(StationId suid) { - ConnectionServerConnection * result = NULL; + ConnectionServerConnection * result = nullptr; ConnectionServerSUIDMap::iterator i=m_accountConnectionMap.find(suid); if (i!=m_accountConnectionMap.end()) { @@ -3707,7 +3707,7 @@ void CentralServer::checkShutdownProcess() { // if it's been "awhile" since we requested to restart the PlanetServer, // then assume that something has gone wrong, and try the restart again - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((iterPendingPlanetServer->second.second + static_cast(ConfigCentralServer::getMaxTimeToWaitForPlanetServerStartSeconds())) < timeNow) { @@ -3982,7 +3982,7 @@ int CentralServer::getSecondsClusterHasBeenInLoadingState() const const std::map & CentralServer::getPopulationStatistics(time_t & refreshTime) { // periodically request updated statistics from the game server - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if (m_timePopulationStatisticsNextRefresh <= timeNow) { GameServerConnection * universeGameServerConnection = getGameServer(UniverseManager::getInstance().getUniverseProcess()); @@ -4004,7 +4004,7 @@ const std::map & CentralServer::getPopulationStatistics(time_t const std::map > > & CentralServer::getGcwScoreStatistics(time_t & refreshTime) { // periodically request updated statistics from the game server - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if (m_timeGcwScoreStatisticsNextRefresh <= timeNow) { GameServerConnection * universeGameServerConnection = getGameServer(UniverseManager::getInstance().getUniverseProcess()); @@ -4026,7 +4026,7 @@ const std::map > std::pair > const *, std::map > const *> CentralServer::getLastLoginTimeStatistics(time_t & refreshTime) { // periodically request updated statistics from the game server - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if (m_timeLastLoginTimeStatisticsNextRefresh <= timeNow) { GameServerConnection * universeGameServerConnection = getGameServer(UniverseManager::getInstance().getUniverseProcess()); @@ -4049,7 +4049,7 @@ std::pair > const *, std::map characterMatchStatisticsRequest("LfgStatReq", 0); diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.h b/engine/server/application/CentralServer/src/shared/CentralServer.h index d628b2fa..262552b0 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServer.h +++ b/engine/server/application/CentralServer/src/shared/CentralServer.h @@ -121,7 +121,7 @@ public: void sendToAllGameServersExceptDBProcess(const GameNetworkMessage & message, const bool reliable); void sendToAllPlanetServers(const GameNetworkMessage & message, const bool reliable); void sendToPlanetServer(const std::string &sceneId, const GameNetworkMessage & message, const bool reliable); - void sendToAllConnectionServers(const GameNetworkMessage & message, const bool reliable, Connection const * exclude = NULL); + void sendToAllConnectionServers(const GameNetworkMessage & message, const bool reliable, Connection const * exclude = nullptr); void sendToConnectionServerForAccount(StationId account, const GameNetworkMessage & message, const bool reliable); void sendToDBProcess(const GameNetworkMessage & message, const bool reliable) const; void sendToLoginServer(uint32 loginServerId, const GameNetworkMessage &message); diff --git a/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp b/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp index 19307914..b34c0174 100755 --- a/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp @@ -148,7 +148,7 @@ void CentralServerMetricsData::updateData() // appear yellow to draw attention) for some amount of time // after detecting a system time mismatch issue #ifndef WIN32 - if ((lastTimeSystemTimeMismatchNotification + ConfigCentralServer::getSystemTimeMismatchAlertIntervalSeconds()) > ::time(NULL)) + if ((lastTimeSystemTimeMismatchNotification + ConfigCentralServer::getSystemTimeMismatchAlertIntervalSeconds()) > ::time(nullptr)) m_data[m_systemTimeMismatch].m_value = STATUS_LOADING; else m_data[m_systemTimeMismatch].m_value = 1; @@ -202,7 +202,7 @@ void CentralServerMetricsData::updateData() std::string label("population."); label += iter->first; - m_mapPopulationStatisticsIndex[iter->first] = addMetric(label.c_str(), 0, NULL, false, false); + m_mapPopulationStatisticsIndex[iter->first] = addMetric(label.c_str(), 0, nullptr, false, false); } } } @@ -235,7 +235,7 @@ void CentralServerMetricsData::updateData() } else { - gcwScoreStatisticsIndex = addMetric(iter->first.c_str(), 0, NULL, false, false); + gcwScoreStatisticsIndex = addMetric(iter->first.c_str(), 0, nullptr, false, false); IGNORE_RETURN(m_mapGcwScoreStatisticsIndex.insert(std::make_pair(iter->first, gcwScoreStatisticsIndex))); } @@ -263,7 +263,7 @@ void CentralServerMetricsData::updateData() std::string label("population."); label += secondIter.first; - m_mapLastLoginTimeStatisticsIndex[secondIter.first] = addMetric(label.c_str(), 0, NULL, false, false); + m_mapLastLoginTimeStatisticsIndex[secondIter.first] = addMetric(label.c_str(), 0, nullptr, false, false); } } } @@ -288,7 +288,7 @@ void CentralServerMetricsData::updateData() std::string label("population."); label += iter->second.first; - m_mapCreateTimeStatisticsIndex[iter->second.first] = addMetric(label.c_str(), 0, NULL, false, false); + m_mapCreateTimeStatisticsIndex[iter->second.first] = addMetric(label.c_str(), 0, nullptr, false, false); } } } diff --git a/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp b/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp index 5cbdb5c9..b56ee398 100755 --- a/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp +++ b/engine/server/application/CentralServer/src/shared/CharacterCreationTracker.cpp @@ -26,13 +26,13 @@ // ====================================================================== -CharacterCreationTracker * CharacterCreationTracker::ms_instance = NULL; +CharacterCreationTracker * CharacterCreationTracker::ms_instance = nullptr; // ====================================================================== void CharacterCreationTracker::install() { - DEBUG_FATAL(ms_instance != NULL,("Called install() twice.\n")); + DEBUG_FATAL(ms_instance != nullptr,("Called install() twice.\n")); ms_instance = new CharacterCreationTracker; ExitChain::add(CharacterCreationTracker::remove,"CharacterCreationTracker::remove"); } @@ -354,8 +354,8 @@ void CharacterCreationTracker::setFastCreationLock(StationId account) CharacterCreationTracker::CreationRecord::CreationRecord() : m_stage(S_queuedForGameServer), - m_gameCreationRequest(NULL), - m_loginCreationRequest(NULL), + m_gameCreationRequest(nullptr), + m_loginCreationRequest(nullptr), m_creationTime(ServerClock::getInstance().getGameTimeSeconds()), m_gameServerId(0), m_loginServerId(0), diff --git a/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp b/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp index 3231ecff..5c5f351d 100755 --- a/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp +++ b/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp @@ -117,8 +117,8 @@ bool ConsoleCommandParserGame::performParsing(const NetworkId & track, const Str if( argv.size() > 4 ) { LOG("ServerConsole", ("Received command to shutdown the cluster.")); - uint32 timeToShutdown = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10); - uint32 maxTime = strtoul(Unicode::wideToNarrow(argv[3]).c_str(), NULL, 10); + uint32 timeToShutdown = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), nullptr, 10); + uint32 maxTime = strtoul(Unicode::wideToNarrow(argv[3]).c_str(), nullptr, 10); Unicode::String systemMessage = Unicode::narrowToWide(""); for(unsigned int i = 4; i < argv.size(); ++i) { @@ -141,7 +141,7 @@ bool ConsoleCommandParserGame::performParsing(const NetworkId & track, const Str { if(argv.size() > 1) { - unsigned int stationId = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10); + unsigned int stationId = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), nullptr, 10); if(stationId > 0) { GenericValueTypeMessage auth("AuthorizeDownload", stationId); diff --git a/engine/server/application/CentralServer/src/shared/ConsoleManager.cpp b/engine/server/application/CentralServer/src/shared/ConsoleManager.cpp index d162fbb3..6535d3db 100755 --- a/engine/server/application/CentralServer/src/shared/ConsoleManager.cpp +++ b/engine/server/application/CentralServer/src/shared/ConsoleManager.cpp @@ -16,7 +16,7 @@ namespace ConsoleManagerNamespace { - ConsoleCommandParser * s_consoleCommandParserRoot = NULL; + ConsoleCommandParser * s_consoleCommandParserRoot = nullptr; } using namespace ConsoleManagerNamespace; diff --git a/engine/server/application/CentralServer/src/shared/PlanetManager.cpp b/engine/server/application/CentralServer/src/shared/PlanetManager.cpp index f9912dde..33d47cbd 100755 --- a/engine/server/application/CentralServer/src/shared/PlanetManager.cpp +++ b/engine/server/application/CentralServer/src/shared/PlanetManager.cpp @@ -138,7 +138,7 @@ PlanetServerConnection *PlanetManager::getPlanetServerForScene(const std::string if (i!=instance().m_servers.end()) return (*i).second.m_connection; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/application/ChatServer/src/linux/main.cpp b/engine/server/application/ChatServer/src/linux/main.cpp index eecd0c24..295c53f2 100755 --- a/engine/server/application/ChatServer/src/linux/main.cpp +++ b/engine/server/application/ChatServer/src/linux/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char ** argv) SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(static_cast(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + SetupSharedRandom::install(static_cast(time(nullptr))); //lint !e1924 !e64 // nullptr is a C-Style cast? Os::setProgramName("ChatServer"); //setup the server diff --git a/engine/server/application/ChatServer/src/shared/CentralServerConnection.cpp b/engine/server/application/ChatServer/src/shared/CentralServerConnection.cpp index b9fa2835..decda6cf 100755 --- a/engine/server/application/ChatServer/src/shared/CentralServerConnection.cpp +++ b/engine/server/application/ChatServer/src/shared/CentralServerConnection.cpp @@ -98,7 +98,7 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message) std::string const newNameNormalized(newName, 0, newName.find(' ')); ChatAvatarId const newAvatar("SWG", ConfigChatServer::getClusterName(), newNameNormalized); - IGNORE_RETURN(ChatServer::getChatInterface()->RequestTransferAvatar(msg.getStationId(), oldAvatar.getName(), oldAvatar.getAPIAddress(), msg.getStationId(), newAvatar.getName(), newAvatar.getAPIAddress(), true, NULL)); + IGNORE_RETURN(ChatServer::getChatInterface()->RequestTransferAvatar(msg.getStationId(), oldAvatar.getName(), oldAvatar.getAPIAddress(), msg.getStationId(), newAvatar.getName(), newAvatar.getAPIAddress(), true, nullptr)); } } else if (m.isType("ChatDestroyAvatar")) diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp index 1ad72571..75aeae1b 100755 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp @@ -350,7 +350,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r if (room) makeRoomName(room, roomName); //printf("!!!!!!!!!!!!got room %s\n", roomName.c_str()); - if (strstr(roomName.c_str(), "group") == NULL) + if (strstr(roomName.c_str(), "group") == nullptr) { ChatServer::putSystemAvatarInRoom(roomName); } @@ -373,7 +373,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r } } - ChatServerRoomOwner *owner = NULL; + ChatServerRoomOwner *owner = nullptr; if (room) owner = getRoomOwner(room->getRoomID()); @@ -709,12 +709,12 @@ std::string makeCanonicalName(const std::string &characterName) { retVal = toUpper(tmp); } - tmp = strtok(NULL, "."); + tmp = strtok(nullptr, "."); if (tmp) { retVal += (dot + tmp); } - tmp = strtok(NULL, "."); + tmp = strtok(nullptr, "."); if (tmp) { retVal += (dot + tmp); @@ -796,7 +796,7 @@ void ChatInterface::DestroyAvatar(const std::string & characterName) // track how many times we have called RequestGetAnyAvatar() for this particular DestroyAvatar // operation, so that we can stop if we somehow get stuck in an infinite loop - unsigned const trackID = RequestGetAnyAvatar(ChatUnicodeString(avatar.getName()), ChatUnicodeString(avatar.getAPIAddress()), NULL); + unsigned const trackID = RequestGetAnyAvatar(ChatUnicodeString(avatar.getName()), ChatUnicodeString(avatar.getAPIAddress()), nullptr); trackingRequestGetAnyAvatarForDestroy[trackID] = std::make_pair(std::make_pair(ChatUnicodeString(avatar.getName()), ChatUnicodeString(avatar.getAPIAddress())), 1); } @@ -848,7 +848,7 @@ void ChatInterface::sendQueuedHeadersToClient() const unsigned long queuedHeadersSendTime = currentTime + static_cast(s_intervalToSendHeadersToClientSeconds); int numberHeadersSent = 0; - const ChatPersistentMessageToClient * header = NULL; + const ChatPersistentMessageToClient * header = nullptr; for (std::map > >::iterator iter = queuedHeaders.begin(); iter != queuedHeaders.end();) { @@ -900,7 +900,7 @@ void ChatInterface::clearQueuedHeadersForAvatar(const ChatAvatarId & avatarId) void ChatInterface::addQueuedHeaderForAvatar(const ChatAvatarId & avatarId, const ChatPersistentMessageToClient * header, unsigned long sendTime) { - if (header == NULL) + if (header == nullptr) return; std::pair > & queuedHeader = queuedHeaders[avatarId]; @@ -923,7 +923,7 @@ ChatServerAvatarOwner *ChatInterface::getAvatarOwner(const ChatAvatar *avatar) return (*f).second; } } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -944,7 +944,7 @@ void ChatInterface::OnAddModerator(unsigned track, unsigned result, const ChatAv sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } ChatAvatarId srcId; @@ -1057,7 +1057,7 @@ void ChatInterface::OnRemoveModerator(unsigned track, unsigned result, const Cha sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } ChatAvatarId srcId; @@ -1178,7 +1178,7 @@ void ChatInterface::OnAddFriend(unsigned track, unsigned result, const ChatAvata ChatAvatarId d; makeAvatarId(destName, destAddress, d); - ChatServerAvatarOwner * mo = NULL; + ChatServerAvatarOwner * mo = nullptr; if (srcAvatar) mo = getAvatarOwner(srcAvatar); @@ -1206,7 +1206,7 @@ void ChatInterface::OnRemoveFriend(unsigned track, unsigned result, const ChatAv ChatAvatarId d; makeAvatarId(destName, destAddress, d); - ChatServerAvatarOwner * mo = NULL; + ChatServerAvatarOwner * mo = nullptr; if (srcAvatar) mo = getAvatarOwner(srcAvatar); @@ -1245,7 +1245,7 @@ void ChatInterface::OnIgnoreStatus(unsigned track, unsigned result, const ChatAv } } - ChatServerAvatarOwner * mo = NULL; + ChatServerAvatarOwner * mo = nullptr; if (srcAvatar) mo = getAvatarOwner(srcAvatar); if(mo) @@ -1281,7 +1281,7 @@ void ChatInterface::OnFriendStatus(unsigned track, unsigned result, const ChatAv idList.push_back(id); } } - ChatServerAvatarOwner * mo = NULL; + ChatServerAvatarOwner * mo = nullptr; if (srcAvatar) mo = getAvatarOwner(srcAvatar); if(mo) @@ -1304,7 +1304,7 @@ void ChatInterface::OnReceiveFriendLogin(const ChatAvatar *srcAvatar, const Chat PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceiveFriendLogin"); UNREF(srcAddress); - ChatServerAvatarOwner * owner = NULL; + ChatServerAvatarOwner * owner = nullptr; if (destAvatar) owner = getAvatarOwner(destAvatar); if(owner) @@ -1332,7 +1332,7 @@ void ChatInterface::OnReceiveFriendLogout(const ChatAvatar *srcAvatar, const Cha PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceiveFriendLogout"); UNREF(srcAddress); - ChatServerAvatarOwner * owner = NULL; + ChatServerAvatarOwner * owner = nullptr; if (destAvatar) owner = getAvatarOwner(destAvatar); if(owner) @@ -1395,7 +1395,7 @@ void ChatInterface::OnRemoveIgnore(unsigned track, unsigned result, const ChatAv ChatAvatarId d; makeAvatarId(destName, destAddress, d); - ChatServerAvatarOwner * mo = NULL; + ChatServerAvatarOwner * mo = nullptr; if (srcAvatar) mo = getAvatarOwner(srcAvatar); if(mo) @@ -1435,7 +1435,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva if ((result == CHATRESULT_SUCCESS) && newAvatar) { // destroy chat avatar - unsigned const trackID = RequestDestroyAvatar(newAvatar, NULL); + unsigned const trackID = RequestDestroyAvatar(newAvatar, nullptr); trackingRequestGetAnyAvatarForDestroy[trackID] = iterFind->second; } @@ -1504,7 +1504,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva static Unicode::String wideFilter = Unicode::narrowToWide(""); static ChatUnicodeString swgNode(wideSWG.data(), wideSWG.size()); static ChatUnicodeString filter(wideFilter.data(), wideFilter.size()); - IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, NULL)); + IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, nullptr)); } } else @@ -1525,11 +1525,11 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva if(ChatServer::isGod(f->second)) { - RequestSetAvatarAttributes(newAvatar, AVATARATTR_GM, NULL); + RequestSetAvatarAttributes(newAvatar, AVATARATTR_GM, nullptr); } else { - RequestSetAvatarAttributes(newAvatar, 0, NULL); + RequestSetAvatarAttributes(newAvatar, 0, nullptr); } ChatServer::chatConnectedAvatar((*f).second, *newAvatar); @@ -1549,7 +1549,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva //ChatServer::getFriendsList(id); clearQueuedHeadersForAvatar(avId); - IGNORE_RETURN(RequestGetPersistentHeaders(newAvatar, NULL)); + IGNORE_RETURN(RequestGetPersistentHeaders(newAvatar, nullptr)); //REPORT_LOG(true, ("Connection to chat system for %s.%s.%s confirmed\n", avatar.GetGameCode().c_str(), avatar.GetGameServerName().c_str(), avatar.GetCharacterName().c_str())); }//lint !e429 Custodial pointer 'owner' has not been freed or returned // jrandall avatar owns it pendingAvatars.erase(f); @@ -1560,7 +1560,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva // the time they connected to the connection server and the time // this message arrived from the chat backend. if (newAvatar) - IGNORE_RETURN(RequestLogoutAvatar(newAvatar, NULL)); + IGNORE_RETURN(RequestLogoutAvatar(newAvatar, nullptr)); } } ChatOnConnectAvatar const connect; @@ -1585,7 +1585,7 @@ void ChatInterface::OnCreateRoom(unsigned track,unsigned result, const ChatRoom static ChatUnicodeString swgNode(wideSWG.data(), wideSWG.size()); static ChatUnicodeString filter(wideFilter.data(), wideFilter.size()); //printf("!!!!Calling GetRoomSummaries from OnCreateRoom\n"); - //IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, NULL)); + //IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, nullptr)); ChatRoomData roomData; @@ -1598,7 +1598,7 @@ void ChatInterface::OnCreateRoom(unsigned track,unsigned result, const ChatRoom //Unicode::String wideRoomName(newRoom->getRoomName().string_data, newRoom->getRoomName().string_length); std::string roomName; makeRoomName(newRoom, roomName); - if (strstr(roomName.c_str(), "group") == NULL) + if (strstr(roomName.c_str(), "group") == nullptr) { ChatServer::putSystemAvatarInRoom(roomName); } @@ -1644,7 +1644,7 @@ void ChatInterface::OnGetRoomSummaries(unsigned track, unsigned result, unsigned std::unordered_map::const_iterator f = roomList.find(lowerRoomName); if(f == roomList.end()) { - RequestGetRoom(foundRooms[i].getRoomAddress(), NULL); + RequestGetRoom(foundRooms[i].getRoomAddress(), nullptr); //ChatServerRoomOwner * o = new ChatServerRoomOwner((*i)); //(*i)->SetRoomOwnerPtr(o); //IGNORE_RETURN(roomList.insert(std::make_pair(lowerRoomName, *o))); @@ -1664,7 +1664,7 @@ const ChatServerRoomOwner *ChatInterface::getRoomOwner(const std::string & roomN { return &((*f).second); } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -1680,7 +1680,7 @@ ChatServerRoomOwner *ChatInterface::getRoomOwner(unsigned roomId) } ++f; } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -1727,13 +1727,13 @@ void ChatInterface::OnDestroyRoom(unsigned track, unsigned result, void *user) static Unicode::String wideFilter = Unicode::narrowToWide(""); static ChatUnicodeString swgNode(wideSWG.data(), wideSWG.size()); static ChatUnicodeString filter(wideFilter.data(), wideFilter.size()); - //IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, NULL)); + //IGNORE_RETURN(RequestGetRoomSummaries(swgNode, filter, nullptr)); ChatAvatarId destroyer; RoomOwnerSequencePair *pair = (RoomOwnerSequencePair *)user; - const ChatServerRoomOwner * owner = NULL; + const ChatServerRoomOwner * owner = nullptr; unsigned sequence = 0; if (pair) { @@ -1805,7 +1805,7 @@ void ChatInterface::OnDestroyAvatar(unsigned track, unsigned result, const ChatA // stop if it looks like we're in an infinite loop if (iterFind->second.second <= 25) { - unsigned const trackID = RequestGetAnyAvatar(iterFind->second.first.first, iterFind->second.first.second, NULL); + unsigned const trackID = RequestGetAnyAvatar(iterFind->second.first.first, iterFind->second.first.second, nullptr); trackingRequestGetAnyAvatarForDestroy[trackID] = std::make_pair(iterFind->second.first, (iterFind->second.second + 1)); } } @@ -1828,13 +1828,13 @@ void ChatInterface::OnGetAnyAvatar(unsigned track, unsigned result, const ChatAv // can only destroy the avatar if he is logged in if (loggedIn) { - unsigned const trackID = RequestDestroyAvatar(foundAvatar, NULL); + unsigned const trackID = RequestDestroyAvatar(foundAvatar, nullptr); trackingRequestGetAnyAvatarForDestroy[trackID] = iterFind->second; } // log in the chat avatar so we can destroy him else { - unsigned const trackID = RequestLoginAvatar(foundAvatar->getUserID(), foundAvatar->getName(), foundAvatar->getAddress(), NULL); + unsigned const trackID = RequestLoginAvatar(foundAvatar->getUserID(), foundAvatar->getName(), foundAvatar->getAddress(), nullptr); trackingRequestGetAnyAvatarForDestroy[trackID] = iterFind->second; } } @@ -1850,9 +1850,9 @@ void ChatInterface::OnReceiveForcedLogout(const ChatAvatar *oldAvatar) ChatServer::fileLog(false, "ChatInterface", "OnReceiveForcedLogout() oldAvatar(%s)", ChatServer::getFullChatAvatarName(oldAvatar).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceiveForcedLogout"); - if (oldAvatar == NULL) + if (oldAvatar == nullptr) { - DEBUG_WARNING(true, ("We received an OnReceiveForcedLogout with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnReceiveForcedLogout with a success result code but nullptr data. This is an error that the API should never give.")); return; } ChatAvatarId id; @@ -1876,9 +1876,9 @@ void ChatInterface::OnEnterRoom(unsigned track, unsigned result, const ChatAvata PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnEnterRoom"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnEnterRoom with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnEnterRoom with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2097,9 +2097,9 @@ void ChatInterface::OnAddBan(unsigned track, unsigned result, const ChatAvatar * PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnAddBan"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnAddBan with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnAddBan with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2113,7 +2113,7 @@ void ChatInterface::OnAddBan(unsigned track, unsigned result, const ChatAvatar * sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } ChatAvatarId srcId; @@ -2218,9 +2218,9 @@ void ChatInterface::OnRemoveBan(unsigned track, unsigned result, const ChatAvata PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnRemoveBan"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnRemoveBan with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnRemoveBan with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2234,7 +2234,7 @@ void ChatInterface::OnRemoveBan(unsigned track, unsigned result, const ChatAvata sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } ChatAvatarId srcId; @@ -2337,9 +2337,9 @@ void ChatInterface::OnAddInvite(unsigned track, unsigned result, const ChatAvata PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnAddInvite"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnAddInvite with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnAddInvite with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2353,7 +2353,7 @@ void ChatInterface::OnAddInvite(unsigned track, unsigned result, const ChatAvata sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } ChatAvatarId srcId; @@ -2378,7 +2378,7 @@ void ChatInterface::OnAddInvite(unsigned track, unsigned result, const ChatAvata { // Calling this on a room will cause the API to cache the room // and to receive room updates for the room. - RequestGetRoom(destRoom->getAddress(), NULL); + RequestGetRoom(destRoom->getAddress(), nullptr); // Send the room data for the room the avatar was invited to join // since the room may be private and may be unknown to the player @@ -2455,9 +2455,9 @@ void ChatInterface::OnRemoveInvite(unsigned track, unsigned result, const ChatAv PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnRemoveInvite"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnRemoveInvite with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnRemoveInvite with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2471,7 +2471,7 @@ void ChatInterface::OnRemoveInvite(unsigned track, unsigned result, const ChatAv sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } std::string roomName; @@ -2555,9 +2555,9 @@ void ChatInterface::OnLeaveRoom(unsigned track, unsigned result, const ChatAvata PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnLeaveRoom"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnLeaveRoom with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnLeaveRoom with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2653,7 +2653,7 @@ void ChatInterface::OnKickAvatar(unsigned track, unsigned result, const ChatAvat sequence = pair->sequence; delete pair; - pair = NULL; + pair = nullptr; } std::string roomName; @@ -2755,9 +2755,9 @@ void ChatInterface::OnGetPersistentMessage(unsigned track, unsigned result, Chat ChatServer::fileLog(false, "ChatInterface", "OnGetPersistentMessage() track(%u) result(%u) destAvatar(%s)", track, result, ChatServer::getFullChatAvatarName(destAvatar).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnGetPersistentMessage"); - if (result == CHATRESULT_SUCCESS && (destAvatar == NULL)) + if (result == CHATRESULT_SUCCESS && (destAvatar == nullptr)) { - DEBUG_WARNING(true, ("We received an OnGetPersistentMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnGetPersistentMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } UNREF(user); @@ -2807,9 +2807,9 @@ void ChatInterface::OnGetPersistentHeaders(unsigned track, unsigned result, Chat ChatServer::fileLog(false, "ChatInterface", "OnGetPersistentHeaders() track(%u) result(%u) destAvatar(%s)", track, result, ChatServer::getFullChatAvatarName(destAvatar).c_str(), listLength); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnGetPersistentHeaders"); - if (result == CHATRESULT_SUCCESS && (destAvatar == NULL)) + if (result == CHATRESULT_SUCCESS && (destAvatar == nullptr)) { - DEBUG_WARNING(true, ("We received an OnGetPersistentHeaders with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnGetPersistentHeaders with a success result code but nullptr data. This is an error that the API should never give.")); return; } UNREF(track); @@ -2876,9 +2876,9 @@ void ChatInterface::OnReceivePersistentMessage(const ChatAvatar *destAvatar, con ChatServer::fileLog(false, "ChatInterface", "OnReceivePersistentMessage() destAvatar(%s)", ChatServer::getFullChatAvatarName(destAvatar).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceivePersistentMessage"); - if (destAvatar == NULL) + if (destAvatar == nullptr) { - DEBUG_WARNING(true, ("We received an OnREceivePersistentMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnREceivePersistentMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } if (!header) @@ -2910,9 +2910,9 @@ void ChatInterface::OnSendRoomMessage(unsigned track, unsigned result, const Cha ChatServer::fileLog(false, "ChatInterface", "OnSendRoomMessage() track(%u) result(%u) srcAvatar(%s) destRoom(%s)", track, result, ChatServer::getFullChatAvatarName(srcAvatar).c_str(), ChatServer::getChatRoomNameNarrow(destRoom).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnSendRoomMessage"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL || destRoom == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr || destRoom == nullptr)) { - DEBUG_WARNING(true, ("We received an OnsendRoomMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnsendRoomMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } UNREF(srcAvatar); @@ -2931,7 +2931,7 @@ void ChatInterface::OnReceiveRoomMessage(const ChatAvatar *srcAvatar, const Chat PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceiveRoomMessage"); if(! srcAvatar || ! destAvatar || ! destRoom) { - DEBUG_WARNING(true, ("We received an OnREceiveRoomMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnREceiveRoomMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } @@ -2995,9 +2995,9 @@ void ChatInterface::OnSendInstantMessage(unsigned track, unsigned result, const PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnSendInstantMessage"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr)) { - DEBUG_WARNING(true, ("We received an OnSendInstantMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnSendInstantMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } UNREF(srcAvatar); @@ -3015,9 +3015,9 @@ void ChatInterface::OnReceiveInstantMessage(const ChatAvatar *srcAvatar, const C ChatServer::fileLog(false, "ChatInterface", "OnReceiveInstantMessage() srcAvatar(%s) destAvatar(%s)", ChatServer::getFullChatAvatarName(srcAvatar).c_str(), ChatServer::getFullChatAvatarName(destAvatar).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnReceiveInstantMessage"); - if ((srcAvatar == NULL || destAvatar == NULL)) + if ((srcAvatar == nullptr || destAvatar == nullptr)) { - DEBUG_WARNING(true, ("We received an OnReceiveInstantMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnReceiveInstantMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } ChatAvatarId fromId; @@ -3052,9 +3052,9 @@ void ChatInterface::OnSendPersistentMessage(unsigned track, unsigned result, con ChatServer::fileLog(false, "ChatInterface", "OnSendPersistentMessage() track(%u) result(%u) srcAvatar(%s)", track, result, ChatServer::getFullChatAvatarName(srcAvatar).c_str()); PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnSendPersistentMessage"); - if (result == CHATRESULT_SUCCESS && (srcAvatar == NULL)) + if (result == CHATRESULT_SUCCESS && (srcAvatar == nullptr)) { - DEBUG_WARNING(true, ("We received an OnSendPersistentMessage with a success result code but NULL data. This is an error that the API should never give.")); + DEBUG_WARNING(true, ("We received an OnSendPersistentMessage with a success result code but nullptr data. This is an error that the API should never give.")); return; } unsigned sequence = (unsigned)user; @@ -3120,7 +3120,7 @@ void ChatInterface::OnUpdatePersistentMessages(unsigned track, unsigned result, ChatAvatarId targetChatAvatarId; - if (targetAvatar != NULL) + if (targetAvatar != nullptr) { makeAvatarId(*targetAvatar, targetChatAvatarId); } @@ -3130,17 +3130,17 @@ void ChatInterface::OnUpdatePersistentMessages(unsigned track, unsigned result, ChatAvatarId sourceChatAvatarId; NetworkId const *tmpNetworkId = reinterpret_cast(user); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { ChatAvatar const *sourceAvatar = ChatServer::getAvatarByNetworkId(*tmpNetworkId); - if (sourceAvatar != NULL) + if (sourceAvatar != nullptr) { makeAvatarId(*sourceAvatar, sourceChatAvatarId); } delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } ChatServer::fileLog(false, "ChatInterface", "OnUpdatePersistentMessage() track(%u) result(%u) sourceAvatar(%s) targetAvatar(%s)", track, result, sourceChatAvatarId.getFullName().c_str(), targetChatAvatarId.getFullName().c_str()); diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/engine/server/application/ChatServer/src/shared/ChatServer.cpp index 76d47a9c..c8e12a6d 100755 --- a/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -162,7 +162,7 @@ void ChatServerNamespace::cleanChatLog() //----------------------------------------------------------------------- -ChatServer *ChatServer::m_instance = NULL; +ChatServer *ChatServer::m_instance = nullptr; #include @@ -250,7 +250,7 @@ if ((t3 - t2) > (1000 * 5)) static Unicode::String wideFilter = Unicode::narrowToWide(""); static ChatUnicodeString swgNode(wideSWG.data(), wideSWG.size()); static ChatUnicodeString filter(wideFilter.data(), wideFilter.size()); - instance().chatInterface->RequestGetRoomSummaries(swgNode, filter, NULL); + instance().chatInterface->RequestGetRoomSummaries(swgNode, filter, nullptr); } ++i; @@ -286,7 +286,7 @@ gameService(0), planetService(), ownerSystem(0), systemAvatarId("SWG", ConfigChatServer::getClusterName(), "SYSTEM"), -customerServiceServerConnection(NULL), +customerServiceServerConnection(nullptr), m_gameServerConnectionRegistry(), m_voiceChatIdMap() { @@ -452,7 +452,7 @@ void ChatServer::setOwnerSystem(const ChatAvatar * o) Connection *connection = safe_cast(instance().centralServerConnection); - if (connection != NULL) + if (connection != nullptr) { connection->send(bs, true); } @@ -618,7 +618,7 @@ const ChatAvatar * ChatServer::getAvatarByNetworkId(const NetworkId & id) { if (id.getValue() == 0) { - return NULL; + return nullptr; } const ChatAvatar * result = 0; ChatAvatarList::const_iterator f = instance().chatAvatars.find(id); @@ -635,7 +635,7 @@ ChatServer::AvatarExtendedData * ChatServer::getAvatarExtendedDataByNetworkId(co { if (id.getValue() == 0) { - return NULL; + return nullptr; } ChatServer::AvatarExtendedData * result = 0; ChatAvatarList::iterator f = instance().chatAvatars.find(id); @@ -783,7 +783,7 @@ void ChatServer::addFriend(const NetworkId & id, const unsigned int sequence, co unsigned track = instance().chatInterface->RequestAddFriend(from, ChatUnicodeString(friendName.data(), friendName.length()), ChatUnicodeString(friendAddress.data(), friendAddress.length()), - false, NULL); + false, nullptr); instance().pendingRequests[track] = id; } else @@ -810,7 +810,7 @@ void ChatServer::removeFriend(const NetworkId & id, const unsigned int sequence, splitChatAvatarId(friendId, friendName, friendAddress); unsigned track = instance().chatInterface->RequestRemoveFriend(from, ChatUnicodeString(friendName.data(), friendName.length()), - ChatUnicodeString(friendAddress.data(), friendAddress.length()), NULL); + ChatUnicodeString(friendAddress.data(), friendAddress.length()), nullptr); instance().pendingRequests[track] = id; } else @@ -829,7 +829,7 @@ void ChatServer::getFriendsList(const ChatAvatarId &characterName) const ChatAvatar *avatar = getAvatarByNetworkId(id); if (avatar) { - unsigned track = instance().chatInterface->RequestFriendStatus(avatar, NULL); + unsigned track = instance().chatInterface->RequestFriendStatus(avatar, nullptr); instance().pendingRequests[track] = id; } else @@ -857,7 +857,7 @@ void ChatServer::addIgnore(const NetworkId & id, const unsigned int sequence, co unsigned track = instance().chatInterface->RequestAddIgnore(from, ChatUnicodeString(ignoreName.data(), ignoreName.length()), ChatUnicodeString(ignoreAddress.data(), ignoreAddress.length()), - NULL); + nullptr); instance().pendingRequests[track] = id; } else @@ -884,7 +884,7 @@ void ChatServer::removeIgnore(const NetworkId & id, const unsigned int sequence, splitChatAvatarId(ignoreId, ignoreName, ignoreAddress); unsigned track = instance().chatInterface->RequestRemoveIgnore(from, ChatUnicodeString(ignoreName.data(), ignoreName.length()), - ChatUnicodeString(ignoreAddress.data(), ignoreAddress.length()), NULL); + ChatUnicodeString(ignoreAddress.data(), ignoreAddress.length()), nullptr); instance().pendingRequests[track] = id; } else @@ -905,7 +905,7 @@ void ChatServer::getIgnoreList(const ChatAvatarId &characterName) if (avatar) { - unsigned track = instance().chatInterface->RequestIgnoreStatus(avatar, NULL); + unsigned track = instance().chatInterface->RequestIgnoreStatus(avatar, nullptr); instance().pendingRequests[track] = id; } else @@ -1160,7 +1160,7 @@ void ChatServer::createRoom(const NetworkId & id, const unsigned int sequence, c { roomAttr |= ROOMATTR_PRIVATE; } - if (isSystemOwner && (strstr(roomName.c_str(), "system") != NULL)) + if (isSystemOwner && (strstr(roomName.c_str(), "system") != nullptr)) { roomAttr |= ROOMATTR_PERSISTENT; } @@ -1193,7 +1193,7 @@ void ChatServer::deleteAllPersistentMessages(const NetworkId &sourceNetworkId, c ChatAvatar const *avatar = getAvatarByNetworkId(targetNetworkId); - if (avatar != NULL) + if (avatar != nullptr) { { NetworkId *tmpNetworkId = new NetworkId(sourceNetworkId); @@ -1225,7 +1225,7 @@ void ChatServer::deletePersistentMessage(const NetworkId &id, const unsigned int const ChatAvatar *avatar = getAvatarByNetworkId(id); if (avatar) { - instance().chatInterface->RequestUpdatePersistentMessage(avatar, messageId, PERSISTENT_DELETED, NULL); + instance().chatInterface->RequestUpdatePersistentMessage(avatar, messageId, PERSISTENT_DELETED, nullptr); } } @@ -1290,10 +1290,10 @@ void ChatServer::destroyRoom(const std::string & roomName) { ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "destroyRoom() roomName(%s)", roomName.c_str()); - if ((strstr(roomName.c_str(), ConfigChatServer::getClusterName()) != NULL) || + if ((strstr(roomName.c_str(), ConfigChatServer::getClusterName()) != nullptr) || (strstr(roomName.c_str(), toLower(std::string(ConfigChatServer::getClusterName() ) ).c_str() ) )) { - if ((strstr(roomName.c_str(), "GroupChat") != NULL) || (strstr(roomName.c_str(), "groupchat") != NULL)) + if ((strstr(roomName.c_str(), "GroupChat") != nullptr) || (strstr(roomName.c_str(), "groupchat") != nullptr)) { size_t pos = roomName.rfind("."); if (pos != roomName.npos) @@ -1311,7 +1311,7 @@ void ChatServer::destroyRoom(const std::string & roomName) const ChatServerRoomOwner *owner = instance().chatInterface->getRoomOwner(roomName); if (!instance().ownerSystem) { - DEBUG_WARNING(true, ("Chat ownerSystem is NULL")); + DEBUG_WARNING(true, ("Chat ownerSystem is nullptr")); return; } if (owner) @@ -1331,7 +1331,7 @@ void ChatServer::disconnectAvatar(const ChatAvatar & avatar) if (&avatar == instance().ownerSystem) { - instance().ownerSystem = NULL; + instance().ownerSystem = nullptr; } ChatAvatarList::iterator i; for(i = instance().chatAvatars.begin(); i != instance().chatAvatars.end(); ++i) @@ -1423,7 +1423,7 @@ void ChatServer::enterRoom(const ChatAvatarId & id, const std::string & roomName const ChatAvatar *avatar = getAvatarByNetworkId(getNetworkIdByAvatarId(id)); if (room && avatar) { - instance().chatInterface->RequestEnterRoom(avatar, room->getAddress(), NULL); + instance().chatInterface->RequestEnterRoom(avatar, room->getAddress(), nullptr); } else { @@ -1450,7 +1450,7 @@ void ChatServer::putSystemAvatarInRoom(const std::string & roomName) const ChatServerRoomOwner *room = instance().chatInterface->getRoomOwner(roomName); if (room && instance().ownerSystem) { - instance().chatInterface->RequestEnterRoom(instance().ownerSystem, room->getAddress(), NULL); + instance().chatInterface->RequestEnterRoom(instance().ownerSystem, room->getAddress(), nullptr); } } @@ -1619,7 +1619,7 @@ void ChatServer::invite(const NetworkId & id, const ChatAvatarId & avatarId, con ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "invite() id(%s) avatar(%s) roomName(%s)", id.getValueString().c_str(), avatarId.getFullName().c_str(), roomName.c_str()); // Try to get an invitor - ChatAvatar const * invitor = NULL; + ChatAvatar const * invitor = nullptr; if (id != NetworkId::cms_invalid) { invitor = getAvatarByNetworkId(id); @@ -1738,7 +1738,7 @@ void ChatServer::inviteGroupMembers(const NetworkId & id, const ChatAvatarId & a void ChatServer::removeSystemAvatarFromRoom(const ChatRoom *room) { - ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "removeSystemAvatarFromRoom() room(%s)", (room != NULL) ? toNarrowString(room->getRoomName()).c_str() : "NULL"); + ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "removeSystemAvatarFromRoom() room(%s)", (room != nullptr) ? toNarrowString(room->getRoomName()).c_str() : "nullptr"); if (!room || !instance().ownerSystem) { @@ -1754,7 +1754,7 @@ void ChatServer::removeSystemAvatarFromRoom(const ChatRoom *room) } } - instance().chatInterface->RequestLeaveRoom(instance().ownerSystem, room->getAddress(), NULL); + instance().chatInterface->RequestLeaveRoom(instance().ownerSystem, room->getAddress(), nullptr); } //----------------------------------------------------------------------- @@ -1991,7 +1991,7 @@ void ChatServer::sendInstantMessage(const ChatAvatarId & from, const ChatAvatarI const NetworkId &toNetworkId = getNetworkIdByAvatarId(to); const ChatAvatar * toAvatar = getAvatarByNetworkId(toNetworkId); - if (toAvatar != NULL) + if (toAvatar != nullptr) { ChatServer::fileLog(false, "ChatServer", "sendInstantMessage() resolved tell locally"); @@ -2022,7 +2022,7 @@ void ChatServer::sendInstantMessage(const ChatAvatarId & from, const ChatAvatarI IGNORE_RETURN(instance().chatInterface->RequestSendInstantMessage(fromAvatar, ChatUnicodeString(friendName.data(), friendName.size()), ChatUnicodeString(friendAddress.data(), friendAddress.size()), - ChatUnicodeString(message.data(), message.size()), ChatUnicodeString(outOfBand.data(), outOfBand.size()), NULL)); + ChatUnicodeString(message.data(), message.size()), ChatUnicodeString(outOfBand.data(), outOfBand.size()), nullptr)); } } } @@ -2054,7 +2054,7 @@ void ChatServer::sendInstantMessage(const NetworkId & fromId, const unsigned int { return; } - else if (::time(NULL) < aed->unsquelchTime) // still in squelch period + else if (::time(nullptr) < aed->unsquelchTime) // still in squelch period { return; } @@ -2076,14 +2076,14 @@ void ChatServer::sendInstantMessage(const NetworkId & fromId, const unsigned int Unicode::String wideFrom; Unicode::String wideTo; - if (from != NULL) + if (from != nullptr) { makeAvatarId(*from, fromAvatarId); wideFrom = (Unicode::narrowToWide(fromAvatarId.getFullName())); } ChatAvatarId toAvatarId; - if (toAvatar != NULL) + if (toAvatar != nullptr) { ChatServer::fileLog(false, "ChatServer", "sendInstantMessage() resolved tell locally"); @@ -2158,7 +2158,7 @@ void ChatServer::sendPersistentMessage(const ChatAvatarId & from, const ChatAvat ChatUnicodeString(subject.data(), subject.size()), ChatUnicodeString(message.data(), message.size()), ChatUnicodeString(oob.data(), oob.size()), - NULL + nullptr ); Unicode::String log; @@ -2187,7 +2187,7 @@ void ChatServer::sendPersistentMessage(const NetworkId & fromId, const unsigned // to.cluster.c_str(), to.name.c_str()); UNREF(sequenceId); ChatServer::AvatarExtendedData * aed = getAvatarExtendedDataByNetworkId(fromId); - const ChatAvatar * from = (aed ? &(aed->chatAvatar) : NULL); + const ChatAvatar * from = (aed ? &(aed->chatAvatar) : nullptr); if(from) { // see if player is squelched @@ -2197,7 +2197,7 @@ void ChatServer::sendPersistentMessage(const NetworkId & fromId, const unsigned { return; } - else if (::time(NULL) < aed->unsquelchTime) // still in squelch period + else if (::time(nullptr) < aed->unsquelchTime) // still in squelch period { return; } @@ -2225,7 +2225,7 @@ void ChatServer::sendPersistentMessage(const NetworkId & fromId, const unsigned ChatAvatarId fromAvatarId; - if (from != NULL) + if (from != nullptr) { makeAvatarId(*from, fromAvatarId); } @@ -2255,7 +2255,7 @@ void ChatServer::sendRoomMessage(const ChatAvatarId &id, const std::string & roo if (!instance().ownerSystem) { - DEBUG_WARNING(true, ("Chat ownerSystem is NULL")); + DEBUG_WARNING(true, ("Chat ownerSystem is nullptr")); return; } // get room id @@ -2265,7 +2265,7 @@ void ChatServer::sendRoomMessage(const ChatAvatarId &id, const std::string & roo { const ChatAvatar *sender = instance().ownerSystem; - IGNORE_RETURN(instance().chatInterface->RequestSendRoomMessage(sender, (*f).second.getAddress(), ChatUnicodeString(msg.data(), msg.size()), ChatUnicodeString(oob.data(), oob.size()), NULL)); + IGNORE_RETURN(instance().chatInterface->RequestSendRoomMessage(sender, (*f).second.getAddress(), ChatUnicodeString(msg.data(), msg.size()), ChatUnicodeString(oob.data(), oob.size()), nullptr)); } } } @@ -2280,7 +2280,7 @@ void ChatServer::sendRoomMessage(const NetworkId & id, const unsigned int sequen UNREF(sequence); ChatServer::AvatarExtendedData * aed = getAvatarExtendedDataByNetworkId(id); - const ChatAvatar * sender = (aed ? &(aed->chatAvatar) : NULL); + const ChatAvatar * sender = (aed ? &(aed->chatAvatar) : nullptr); const ChatServerRoomOwner *room = instance().chatInterface->getRoomOwner(roomId); if(sender && room) { @@ -2296,7 +2296,7 @@ void ChatServer::sendRoomMessage(const NetworkId & id, const unsigned int sequen aed->nonSpatialCharCount += msg.size(); // sync chat character count with game server - timeNow = ::time(NULL); + timeNow = ::time(nullptr); if ((timeNow > aed->chatSpamNextTimeToSyncWithGameServer) || (timeNow > aed->chatSpamTimeEndInterval)) { GenericValueTypeMessage, std::pair > > chatStatistics("ChatStatisticsCS", std::make_pair(std::make_pair(id, static_cast(aed->chatSpamTimeEndInterval)), std::make_pair(aed->spatialCharCount, aed->nonSpatialCharCount))); @@ -2322,7 +2322,7 @@ void ChatServer::sendRoomMessage(const NetworkId & id, const unsigned int sequen allowToSpeak = false; squelched = true; } - else if (::time(NULL) < aed->unsquelchTime) // still in squelch period + else if (::time(nullptr) < aed->unsquelchTime) // still in squelch period { allowToSpeak = false; squelched = true; @@ -2393,7 +2393,7 @@ void ChatServer::sendStandardRoomMessage(const ChatAvatarId &senderId, const std } if (sender) { - IGNORE_RETURN(instance().chatInterface->RequestSendRoomMessage(sender, (*f).second.getAddress(), ChatUnicodeString(msg.data(), msg.size()), ChatUnicodeString(oob.data(), oob.size()), NULL)); + IGNORE_RETURN(instance().chatInterface->RequestSendRoomMessage(sender, (*f).second.getAddress(), ChatUnicodeString(msg.data(), msg.size()), ChatUnicodeString(oob.data(), oob.size()), nullptr)); } } } @@ -2505,7 +2505,7 @@ std::string ChatServer::getFullChatAvatarName(ChatAvatar const *chatAvatar) { std::string result; - if (chatAvatar != NULL) + if (chatAvatar != nullptr) { result += toNarrowString(chatAvatar->getName()); result += '.'; @@ -2513,7 +2513,7 @@ std::string ChatServer::getFullChatAvatarName(ChatAvatar const *chatAvatar) } else { - result = "NULL"; + result = "nullptr"; } return result; @@ -2539,7 +2539,7 @@ std::string ChatServer::getConnectionAddress(Connection const *connection) { std::string result; - if (connection != NULL) + if (connection != nullptr) { char text[256]; snprintf(text, sizeof(text), "%s:%d", connection->getRemoteAddress().c_str(), connection->getRemotePort()); @@ -2547,7 +2547,7 @@ std::string ChatServer::getConnectionAddress(Connection const *connection) } else { - result = "NULL"; + result = "nullptr"; } return result; @@ -2566,13 +2566,13 @@ Unicode::String ChatServer::getChatRoomName(ChatRoom const *chatRoom) { Unicode::String result; - if (chatRoom != NULL) + if (chatRoom != nullptr) { result = toUnicodeString(chatRoom->getRoomName()); } else { - result = Unicode::narrowToWide("NULL"); + result = Unicode::narrowToWide("nullptr"); } return result; @@ -2582,12 +2582,12 @@ Unicode::String ChatServer::getChatRoomName(ChatRoom const *chatRoom) void ChatServer::clearCustomerServiceServerConnection() { - if (instance().customerServiceServerConnection != NULL) + if (instance().customerServiceServerConnection != nullptr) { instance().customerServiceServerConnection->disconnect(); } - instance().customerServiceServerConnection = NULL; + instance().customerServiceServerConnection = nullptr; } // ---------------------------------------------------------------------- @@ -2596,7 +2596,7 @@ void ChatServer::connectToCustomerServiceServer(const std::string &address, cons { //DEBUG_REPORT_LOG(true, ("***ChatServer::connectToCustomerServiceServer() address(%s) port(%d)\n", address.c_str(), port)); - if (instance().customerServiceServerConnection != NULL) + if (instance().customerServiceServerConnection != nullptr) { instance().customerServiceServerConnection->disconnect(); } @@ -2670,7 +2670,7 @@ bool ChatServer::isValidChatAvatarName(Unicode::String const &chatAvatarName) void ChatServer::logChatMessage(Unicode::String const &logPlayer, Unicode::String const &fromPlayer, Unicode::String const &toPlayer, Unicode::String const &text, Unicode::String const &channel) { - DEBUG_WARNING(toPlayer.empty(), ("toPlayer is NULL")); + DEBUG_WARNING(toPlayer.empty(), ("toPlayer is nullptr")); Unicode::String lowerLogPlayer(Unicode::toLower(logPlayer)); Unicode::String lowerFromPlayer(Unicode::toLower(fromPlayer)); @@ -2760,7 +2760,7 @@ void ChatServer::requestTransferAvatar(const TransferCharacterData & request) ChatAvatarId destinationAvatar("SWG", destination, request.getDestinationCharacterName()); - instance().chatInterface->RequestTransferAvatar(request.getSourceStationId(), makeChatUnicodeString(sourceAvatar.getName()), makeChatUnicodeString(sourceAvatar.getAPIAddress()), request.getDestinationStationId(), makeChatUnicodeString(destinationAvatar.getName()), makeChatUnicodeString(destinationAvatar.getAPIAddress()), true, NULL); + instance().chatInterface->RequestTransferAvatar(request.getSourceStationId(), makeChatUnicodeString(sourceAvatar.getName()), makeChatUnicodeString(sourceAvatar.getAPIAddress()), request.getDestinationStationId(), makeChatUnicodeString(destinationAvatar.getName()), makeChatUnicodeString(destinationAvatar.getAPIAddress()), true, nullptr); } } @@ -2845,7 +2845,7 @@ void ChatServer::handleChatStatisticsFromGameServer(NetworkId const & character, // non-spatial chat to report to the game server else if (aed->nonSpatialCharCount != nonSpatialNumCharacters) { - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if (timeNow > aed->chatSpamNextTimeToSyncWithGameServer) { GenericValueTypeMessage, std::pair > > chatStatistics("ChatStatisticsCS", std::make_pair(std::make_pair(character, static_cast(aed->chatSpamTimeEndInterval)), std::make_pair(aed->spatialCharCount, aed->nonSpatialCharCount))); @@ -2904,7 +2904,7 @@ void ChatServer::sendToGameServerById(unsigned const connectionId, GameNetworkMe GameServerConnection *ChatServer::getGameServerConnectionFromId(unsigned int sequence) { - GameServerConnection * result = NULL; + GameServerConnection * result = nullptr; std::unordered_map::iterator f = m_gameServerConnectionRegistry.find(sequence); if(f != m_gameServerConnectionRegistry.end()) { diff --git a/engine/server/application/ChatServer/src/shared/ChatServerRoomOwner.cpp b/engine/server/application/ChatServer/src/shared/ChatServerRoomOwner.cpp index 091a78ac..dc8cd1a3 100755 --- a/engine/server/application/ChatServer/src/shared/ChatServerRoomOwner.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServerRoomOwner.cpp @@ -86,7 +86,7 @@ const ChatRoom * ChatServerRoomOwner::getRoom() const if (chatInterface) return chatInterface->getRoom(roomID); - return NULL; + return nullptr; } //----------------------------------------------------------------------- diff --git a/engine/server/application/ChatServer/src/shared/VChatInterface.cpp b/engine/server/application/ChatServer/src/shared/VChatInterface.cpp index 6e7e257c..b98704bc 100755 --- a/engine/server/application/ChatServer/src/shared/VChatInterface.cpp +++ b/engine/server/application/ChatServer/src/shared/VChatInterface.cpp @@ -435,7 +435,7 @@ void VChatInterface::OnConnectionOpened( const char * address ) ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "OnConnectionOpened: %s", address); - uint32 track = VChatAPI::GetAccount(ms_systemAvatarName, ConfigChatServer::getGameCode(), ConfigChatServer::getClusterName(), 0, 0, NULL); + uint32 track = VChatAPI::GetAccount(ms_systemAvatarName, ConfigChatServer::getGameCode(), ConfigChatServer::getClusterName(), 0, 0, nullptr); ChatServer::fileLog(ms_voiceLoggingEnabled, ms_logLable, "Creating system avatar: %s track(%u)", getSystemLoginName().c_str(), track); } @@ -477,7 +477,7 @@ void VChatInterface::OnGetAccount(unsigned track, unsigned result, unsigned user { requestConnectPlayer(info->suid,info->avatarName,info->id, info->failedAttempts+1); delete info; - info = NULL; + info = nullptr; return; } } @@ -501,7 +501,7 @@ void VChatInterface::OnGetAccount(unsigned track, unsigned result, unsigned user } delete info; - info = NULL; + info = nullptr; } void VChatInterface::OnGetChannelV2(unsigned track, unsigned result, @@ -639,7 +639,7 @@ void VChatInterface::OnGetAllChannels(unsigned track, unsigned result, const VCh if(shouldRetry) { - GetAllChannels(NULL); + GetAllChannels(nullptr); } } @@ -832,7 +832,7 @@ void VChatInterface::checkForCharacterChannelAdd(std::string const & name, std:: data.m_channelPassword, data.m_channelURI, "en_US", - NULL); + nullptr); (*iter).second.push_back(playerOID); @@ -877,7 +877,7 @@ void VChatInterface::checkForCharacterChannelRemove(std::string const & name, st parseWorldName(std::string(avatar->getServer().c_str())), "SWG", "guild", - NULL); + nullptr); } iter = (*chanIter).second.erase(iter); diff --git a/engine/server/application/CommoditiesServer/src/linux/main.cpp b/engine/server/application/CommoditiesServer/src/linux/main.cpp index b93208f5..ce3735d1 100755 --- a/engine/server/application/CommoditiesServer/src/linux/main.cpp +++ b/engine/server/application/CommoditiesServer/src/linux/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char ** argv) Unicode::UnicodeNarrowStringVector localeVector; localeVector.push_back(defaultLocale); - LocalizationManager::install (new TreeFile::TreeFileFactory, localeVector, debugStringIds, NULL, displayBadStringIds); + LocalizationManager::install (new TreeFile::TreeFileFactory, localeVector, debugStringIds, nullptr, displayBadStringIds); ExitChain::add(LocalizationManager::remove, "LocalizationManager::remove"); DataTableManager::install(); diff --git a/engine/server/application/CommoditiesServer/src/shared/Auction.cpp b/engine/server/application/CommoditiesServer/src/shared/Auction.cpp index 0d1edd7f..63f43523 100755 --- a/engine/server/application/CommoditiesServer/src/shared/Auction.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/Auction.cpp @@ -208,7 +208,7 @@ namespace AuctionNamespace if (iterAttr != searchableAttributeString->end()) { applicableSearchCondition = true; - return (NULL != strstr(iterAttr->second.c_str(), searchCondition.stringValue.c_str())); // lowercase is assumed (and required) + return (nullptr != strstr(iterAttr->second.c_str(), searchCondition.stringValue.c_str())); // lowercase is assumed (and required) } } @@ -242,7 +242,7 @@ namespace AuctionNamespace if (iterAttr != searchableAttributeString->end()) { applicableSearchCondition = true; - return (NULL == strstr(iterAttr->second.c_str(), searchCondition.stringValue.c_str())); // lowercase is assumed (and required) + return (nullptr == strstr(iterAttr->second.c_str(), searchCondition.stringValue.c_str())); // lowercase is assumed (and required) } } @@ -293,10 +293,10 @@ m_userDescription(userDescription), m_oobLength(oobLength), m_oobData(oobData), m_attributes(), -m_searchableAttributeInt(NULL), -m_searchableAttributeFloat(NULL), -m_searchableAttributeString(NULL), -m_highBid(NULL), +m_searchableAttributeInt(nullptr), +m_searchableAttributeFloat(nullptr), +m_searchableAttributeString(nullptr), +m_highBid(nullptr), m_item(new AuctionItem(itemId, itemType, itemTemplateId, itemTimer, itemNameLength, itemName, creatorId, itemSize)), m_sold(false), m_active(true), @@ -395,10 +395,10 @@ m_userDescription(userDescription), m_oobLength(oobLength), m_oobData(oobData), m_attributes(), -m_searchableAttributeInt(NULL), -m_searchableAttributeFloat(NULL), -m_searchableAttributeString(NULL), -m_highBid(NULL), +m_searchableAttributeInt(nullptr), +m_searchableAttributeFloat(nullptr), +m_searchableAttributeString(nullptr), +m_highBid(nullptr), m_item(new AuctionItem(itemId, itemType, itemTemplateId, itemTimer, itemNameLength, itemName, creatorId, itemSize)), m_sold(isSold), m_active(isActive), @@ -488,7 +488,7 @@ void Auction::Initialization() #ifdef _DEBUG for (int i = 0; i < static_cast(AuctionQueryHeadersMessage::SCC_LAST); ++i) { - s_searchConditionComparisonFn[i] = NULL; + s_searchConditionComparisonFn[i] = nullptr; } #endif @@ -502,7 +502,7 @@ void Auction::Initialization() #ifdef _DEBUG for (int j = 0; j < static_cast(AuctionQueryHeadersMessage::SCC_LAST); ++j) { - DEBUG_FATAL((s_searchConditionComparisonFn[j] == NULL), ("s_searchConditionComparisonFn array is NULL at index (%d)", j)); + DEBUG_FATAL((s_searchConditionComparisonFn[j] == nullptr), ("s_searchConditionComparisonFn array is nullptr at index (%d)", j)); } #endif @@ -659,7 +659,7 @@ const AuctionBid *Auction::GetPreviousBid() const { if (m_bids.size() <= 1) { - return NULL; + return nullptr; } else { @@ -677,9 +677,9 @@ const AuctionBid *Auction::GetPreviousBid() const */ int Auction::GetActualBid(AuctionBid *bid) { - assert(bid != NULL); + assert(bid != nullptr); int bidNeeded = std::max(m_minBid, bid->GetBid()); - if (m_highBid != NULL) + if (m_highBid != nullptr) { bidNeeded = m_highBid->GetBid(); if (*bid > *m_highBid) @@ -765,7 +765,7 @@ AuctionResultCode Auction::AddBid( AuctionBid *auctionBid = new AuctionBid(bidderId, bid, maxProxyBid); int newBidForHighBidder = GetActualBid(auctionBid); - if (m_highBid != NULL) + if (m_highBid != nullptr) { if (*auctionBid <= *m_highBid) { @@ -810,7 +810,7 @@ const AuctionBid *Auction::GetPlayerBid(const NetworkId & playerId) const } ++iter; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -826,7 +826,7 @@ bool Auction::Update(int gameTime) //immediate sale DEBUG_REPORT_LOG(true, ("[Commodities Server Auction::Update] : Expiring immediate sale - Auction is active and sold.\n")); - if ((m_trackId != -1) && (CommodityServer::getInstance().getGameServer(m_trackId) != NULL)) + if ((m_trackId != -1) && (CommodityServer::getInstance().getGameServer(m_trackId) != nullptr)) { Expire(true, false, m_trackId); m_trackId = -1; @@ -840,14 +840,14 @@ bool Auction::Update(int gameTime) { DEBUG_REPORT_LOG(true, ("[Commodities Server Auction::Update] : Auction expiring based on timer.\n")); - if ((m_trackId != -1) && (CommodityServer::getInstance().getGameServer(m_trackId) != NULL)) + if ((m_trackId != -1) && (CommodityServer::getInstance().getGameServer(m_trackId) != nullptr)) { - Expire(m_highBid != NULL, true, m_trackId); + Expire(m_highBid != nullptr, true, m_trackId); m_trackId = -1; } else { - Expire(m_highBid != NULL, true); + Expire(m_highBid != nullptr, true); } } @@ -862,7 +862,7 @@ void Auction::Expire(bool sold, bool expiredBasedOnTimer, int track_id) m_auctionTimer = 0; m_active = false; - if (sold && m_highBid != NULL) + if (sold && m_highBid != nullptr) { m_sold = true; } @@ -934,7 +934,7 @@ void Auction::Expire(bool sold, bool expiredBasedOnTimer, int track_id) m_location.SetVendorFirstTimerExpiredAuctionDate(time(0)); } - DEBUG_REPORT_LOG(true, ("[Commodities Server Auction::Expire] : Sending OnAuctionExpired for non-sold auction and null high bid obj .\n")); + DEBUG_REPORT_LOG(true, ("[Commodities Server Auction::Expire] : Sending OnAuctionExpired for non-sold auction and nullptr high bid obj .\n")); AuctionMarket::getInstance().OnAuctionExpired( GetCreatorId(), m_sold, m_flags, NetworkId::cms_invalid, 0, m_item->GetItemId(), 0, @@ -1107,8 +1107,8 @@ void Auction::BuildSearchableAttributeList() std::map const & saAlias = CommoditiesAdvancedSearchAttribute::getSearchAttributeNameAliasesForGameObjectType(m_item->GetCategory()); // for factory crates, also include the attributes of the item inside the crate - std::map const * saItemInsideFactoryCrate = NULL; - std::map const * saAliasItemInsideFactoryCrate = NULL; + std::map const * saItemInsideFactoryCrate = nullptr; + std::map const * saAliasItemInsideFactoryCrate = nullptr; int gotItemInsideFactoryCrate = 0; if (m_item->GetCategory() == SharedObjectTemplate::GOT_misc_factory_crate) @@ -1134,10 +1134,10 @@ void Auction::BuildSearchableAttributeList() saAliasItemInsideFactoryCrate = &(CommoditiesAdvancedSearchAttribute::getSearchAttributeNameAliasesForGameObjectType(gotItemInsideFactoryCrate)); if (saItemInsideFactoryCrate->empty()) - saItemInsideFactoryCrate = NULL; + saItemInsideFactoryCrate = nullptr; if (saAliasItemInsideFactoryCrate->empty()) - saAliasItemInsideFactoryCrate = NULL; + saAliasItemInsideFactoryCrate = nullptr; } } diff --git a/engine/server/application/CommoditiesServer/src/shared/AuctionLocation.cpp b/engine/server/application/CommoditiesServer/src/shared/AuctionLocation.cpp index df458ef0..d692840d 100755 --- a/engine/server/application/CommoditiesServer/src/shared/AuctionLocation.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/AuctionLocation.cpp @@ -137,7 +137,7 @@ AuctionLocation::~AuctionLocation() bool AuctionLocation::AddAuction(Auction *auction) { - assert(auction != NULL); + assert(auction != nullptr); if (IsVendorMarket() && (!auction->IsActive() || !IsOwner(auction->GetCreatorId()))) { @@ -189,7 +189,7 @@ void AuctionLocation::CancelVendorSale(Auction *auction) bool AuctionLocation::RemoveAuction(Auction *auction) { - assert(auction != NULL); + assert(auction != nullptr); return RemoveAuction(auction->GetItem().GetItemId()); } @@ -265,7 +265,7 @@ Auction *AuctionLocation::GetAuction(const NetworkId & itemId) return((*i).second); } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp index a07b0864..328f189e 100644 --- a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp @@ -121,7 +121,7 @@ namespace AuctionMarketNamespace Auction const * const auction, int const type, int const entranceCharge, - AuctionBid const * const playerBid = NULL + AuctionBid const * const playerBid = nullptr ) { AuctionDataHeader *header = new AuctionDataHeader; @@ -301,7 +301,7 @@ namespace AuctionMarketNamespace std::map attributeValue; }; - GetItemAttributeDataRequest * getItemAttributeDataRequest = NULL; + GetItemAttributeDataRequest * getItemAttributeDataRequest = nullptr; void processItemAttributeData(std::map const & auctions); @@ -394,8 +394,8 @@ void AuctionMarketNamespace::processItemAttributeData(std::map const * skipAttribute = NULL; - std::map const * skipAttributeAlias = NULL; + std::map const * skipAttribute = nullptr; + std::map const * skipAttributeAlias = nullptr; if (getItemAttributeDataRequest->ignoreSearchableAttribute) { std::map const & sa = CommoditiesAdvancedSearchAttribute::getSearchAttributeForGameObjectType(iterAuction->second->GetItem().GetCategory()); @@ -590,7 +590,7 @@ void AuctionMarketNamespace::processItemAttributeData(std::mapGetLocation(); if (!location.IsOwner(auction->GetItem().GetOwnerId())) @@ -1979,7 +1979,7 @@ void AuctionMarket::AcceptHighBid(const AcceptHighBidMessage &message) DEBUG_REPORT_LOG(m_showAllDebugInfo, ("[Commodities Server AcceptHighBidMessage] : ResponseId : %d.\n", message.GetResponseId())); DEBUG_REPORT_LOG(m_showAllDebugInfo, ("[Commodities Server AcceptHighBidMessage] : TrackId : %d.\n", message.GetTrackId())); - Auction *auction = NULL; + Auction *auction = nullptr; AuctionResultCode result = ARC_Success; std::map::iterator iter = m_auctions.find( message.GetAuctionId()); @@ -1994,7 +1994,7 @@ void AuctionMarket::AcceptHighBid(const AcceptHighBidMessage &message) { result = ARC_NotItemOwner; } - else if (auction->GetHighBid() == NULL) + else if (auction->GetHighBid() == nullptr) { result = ARC_NoBids; } @@ -2525,19 +2525,19 @@ void AuctionMarket::QueryAuctionHeaders( int debugNumberLocationsMatched = 0; int debugNumberAuctionsTested = 0; - std::map *auctionsPtr = NULL; + std::map *auctionsPtr = nullptr; int entranceCharge = 0; - AuctionLocation *locationPtr = NULL; - Auction *auctionPtr = NULL; + AuctionLocation *locationPtr = nullptr; + Auction *auctionPtr = nullptr; std::map::const_iterator auctionIterator; - AuctionDataHeader *header = NULL; + AuctionDataHeader *header = nullptr; bool checkItemTemplate; while (locationIter != locationIterEnd) { ++debugNumberLocationsTested; checkItemTemplate = false; - auctionsPtr = NULL; + auctionsPtr = nullptr; entranceCharge = 0; locationPtr = (*locationIter).second; @@ -2606,7 +2606,7 @@ void AuctionMarket::QueryAuctionHeaders( auctionPtr = (*auctionIterator).second; const AuctionItem &item = auctionPtr->GetItem(); - header = NULL; + header = nullptr; // Check to see if the item template matches if (searchForResourceContainer && (itemTemplateId != 0)) @@ -4977,7 +4977,7 @@ void AuctionMarket::getAuctionLocationPriorityQueue(int requestingGameServerId, { std::string output; char buffer[2048]; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); for (std::set >::const_iterator iterPQ = m_priorityQueueAuctionLocation.begin(); iterPQ != m_priorityQueueAuctionLocation.end(); ++iterPQ) { if (count <= 0) diff --git a/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp b/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp index 1e2671be..3c2019cd 100755 --- a/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/CommodityServer.cpp @@ -191,7 +191,7 @@ void CommodityServer::run() s_commodityServerMetricsData = new CommodityServerMetricsData; MetricsManager::install(s_commodityServerMetricsData, false, "CommoditiesServer", "", 0); - time_t timePrevious = ::time(NULL); + time_t timePrevious = ::time(nullptr); time_t timeCurrent = timePrevious; while (true) @@ -202,7 +202,7 @@ void CommodityServer::run() break; NetworkHandler::update(); - timeCurrent = ::time(NULL); + timeCurrent = ::time(nullptr); MetricsManager::update(static_cast((timeCurrent - timePrevious) * 1000)); timePrevious = timeCurrent; @@ -229,18 +229,18 @@ void CommodityServer::run() // this is not a high priority thing, so wait until // the cluster has started and "stabilized" before // doing this; 3 hours should be adequate - time_t timeToRequestExcludedType = ::time(NULL) + 10800; + time_t timeToRequestExcludedType = ::time(nullptr) + 10800; // one time request from the game server (any game server) // to receive the resource tree hierarchy to support // searching for resource container - time_t timeToRequestResourceTree = ::time(NULL); + time_t timeToRequestResourceTree = ::time(nullptr); while(true) { NetworkHandler::update(); - timeCurrent = ::time(NULL); + timeCurrent = ::time(nullptr); MetricsManager::update(static_cast((timeCurrent - timePrevious) * 1000)); timePrevious = timeCurrent; diff --git a/engine/server/application/CommoditiesServer/src/shared/CommodityServerMetricsData.cpp b/engine/server/application/CommoditiesServer/src/shared/CommodityServerMetricsData.cpp index 4b1ff37e..90594e07 100755 --- a/engine/server/application/CommoditiesServer/src/shared/CommodityServerMetricsData.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/CommodityServerMetricsData.cpp @@ -74,7 +74,7 @@ void CommodityServerMetricsData::updateData() buffer[sizeof(buffer)-1] = '\0'; } - m_mapAuctionsCountByGameObjectTypeIndex[iterGameObjectType->first] = addMetric(buffer, 0, NULL, false, false); + m_mapAuctionsCountByGameObjectTypeIndex[iterGameObjectType->first] = addMetric(buffer, 0, nullptr, false, false); } } } diff --git a/engine/server/application/ConnectionServer/src/linux/main.cpp b/engine/server/application/ConnectionServer/src/linux/main.cpp index 24c76421..5984dd4c 100755 --- a/engine/server/application/ConnectionServer/src/linux/main.cpp +++ b/engine/server/application/ConnectionServer/src/linux/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char ** argv) SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(time(NULL)); + SetupSharedRandom::install(time(nullptr)); //setup the server NetworkHandler::install(); diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index f7b3020b..32b3811c 100755 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -82,7 +82,7 @@ m_canCreateRegularCharacter(false), m_canCreateJediCharacter(false), m_hasRequestedCharacterCreate(false), m_hasCreatedCharacter(false), -m_pendingCharacterCreate(NULL), +m_pendingCharacterCreate(nullptr), m_canSkipTutorial(false), m_characterId(NetworkId::cms_invalid), m_characterName(), @@ -144,7 +144,7 @@ ClientConnection::~ClientConnection() { hasBeenKicked = m_client->hasBeenKicked(); delete m_client; - m_client = NULL; + m_client = nullptr; } // tell Session to stop recording play time for the character @@ -177,7 +177,7 @@ ClientConnection::~ClientConnection() m_pendingChatQueryRoomRequests.clear(); delete m_pendingCharacterCreate; - m_pendingCharacterCreate = NULL; + m_pendingCharacterCreate = nullptr; } @@ -202,7 +202,7 @@ std::string ClientConnection::getPlayTimeDuration() const int playTimeDuration = 0; if (m_startPlayTime > 0) - playTimeDuration = static_cast(::time(NULL) - m_startPlayTime); + playTimeDuration = static_cast(::time(nullptr) - m_startPlayTime); return CalendarTime::convertSecondsToHMS(static_cast(playTimeDuration)); } @@ -214,7 +214,7 @@ std::string ClientConnection::getActivePlayTimeDuration() const int activePlayTimeDuration = static_cast(m_activePlayTimeDuration); if (m_lastActiveTime > 0) - activePlayTimeDuration += static_cast(::time(NULL) - m_lastActiveTime); + activePlayTimeDuration += static_cast(::time(nullptr) - m_lastActiveTime); return CalendarTime::convertSecondsToHMS(static_cast(activePlayTimeDuration)); } @@ -226,7 +226,7 @@ std::string ClientConnection::getCurrentActivePlayTimeDuration() const int activePlayTimeDuration = 0; if (m_lastActiveTime > 0) - activePlayTimeDuration = static_cast(::time(NULL) - m_lastActiveTime); + activePlayTimeDuration = static_cast(::time(nullptr) - m_lastActiveTime); return CalendarTime::convertSecondsToHMS(static_cast(activePlayTimeDuration)); } @@ -400,7 +400,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg) std::hash h; m_suid = h(m_accountName.c_str()); } - onValidateClient(m_suid, m_accountName, m_isSecure, NULL, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints()); + onValidateClient(m_suid, m_accountName, m_isSecure, nullptr, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints()); } } else @@ -452,7 +452,7 @@ void ClientConnection::onIdValidated(bool canLogin, bool canCreateRegularCharact } delete m_pendingCharacterCreate; - m_pendingCharacterCreate = NULL; + m_pendingCharacterCreate = nullptr; return; } @@ -683,7 +683,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) } else { - ConnectionServer::dropClient(this, "m_client is null while receiving a message!"); + ConnectionServer::dropClient(this, "m_client is nullptr while receiving a message!"); disconnect(); } } @@ -796,7 +796,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) } else { - ConnectionServer::dropClient(this, "m_client is null while receiving a message!"); + ConnectionServer::dropClient(this, "m_client is nullptr while receiving a message!"); disconnect(); } } @@ -839,7 +839,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) } else { - ConnectionServer::dropClient(this, "m_client is null while receiving a message!"); + ConnectionServer::dropClient(this, "m_client is nullptr while receiving a message!"); disconnect(); } } @@ -865,7 +865,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) //DEBUG_REPORT_LOG(true, ("CONSRV::CS - suid: %i\n", getSUID())); - if (customerServiceConnection != NULL) + if (customerServiceConnection != nullptr) { static std::vector v; v.clear(); @@ -935,7 +935,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) } else { - ConnectionServer::dropClient(this, "m_client is null while receiving a message!"); + ConnectionServer::dropClient(this, "m_client is nullptr while receiving a message!"); disconnect(); } } @@ -951,7 +951,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) if (m_lastActiveTime > 0) { // record the amount of active time - m_activePlayTimeDuration += static_cast(::time(NULL) - m_lastActiveTime); + m_activePlayTimeDuration += static_cast(::time(nullptr) - m_lastActiveTime); // tell Session to stop recording play time for the character if (ConnectionServer::getSessionApiClient() && ConfigConnectionServer::getSessionRecordPlayTime()) @@ -988,7 +988,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) if (m_lastActiveTime == 0) { // record the time client went active - m_lastActiveTime = ::time(NULL); + m_lastActiveTime = ::time(nullptr); // tell Session to start recording play time for the character if (ConnectionServer::getSessionApiClient() && ConfigConnectionServer::getSessionRecordPlayTime()) @@ -1616,7 +1616,7 @@ void ClientConnection::onValidateClient (uint32 suid, const std::string & userna } // tell client the server-side game and subscription feature bits and which ConnectionServer we are and the current server Epoch time - GenericValueTypeMessage, std::pair > > const msgFeatureBits("AccountFeatureBits", std::make_pair(std::make_pair(gameFeatures, subscriptionFeatures), std::make_pair(ConfigConnectionServer::getConnectionServerNumber(), static_cast(::time(NULL))))); + GenericValueTypeMessage, std::pair > > const msgFeatureBits("AccountFeatureBits", std::make_pair(std::make_pair(gameFeatures, subscriptionFeatures), std::make_pair(ConfigConnectionServer::getConnectionServerNumber(), static_cast(::time(nullptr))))); send(msgFeatureBits, true); std::string const gameFeaturesDescription = ClientGameFeature::getDescription(gameFeatures); diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp index b698ecb6..10d0c99f 100755 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp @@ -163,7 +163,7 @@ const CustomerServiceConnection * ConnectionServer::getCustomerServiceConnection { return (*(instance().customerServiceServers.begin())); } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -366,7 +366,7 @@ void ConnectionServer::addNewClient(ClientConnection* cconn, const NetworkId &oi //send the game server a message about this client. static const std::string loginTrace("TRACE_LOGIN"); LOG(loginTrace, ("NewClient(%d, %s, %s)", cconn->getSUID(), oid.getValueString().c_str(), cconn->getAccountName().c_str())); - NewClient m(oid, cconn->getAccountName(), cconn->getRemoteAddress(), cconn->getIsSecure(), false, cconn->getSUID(), NULL, cconn->getGameFeatures(), cconn->getSubscriptionFeatures(), cconn->getEntitlementTotalTime(), cconn->getEntitlementEntitledTime(), cconn->getEntitlementTotalTimeSinceLastLogin(), cconn->getEntitlementEntitledTimeSinceLastLogin(), cconn->getBuddyPoints(), cconn->getConsumedRewardEvents(), cconn->getClaimedRewardItems(), cconn->isUsingAdminLogin(), cconn->getCanSkipTutorial(), sendToStarport ); + NewClient m(oid, cconn->getAccountName(), cconn->getRemoteAddress(), cconn->getIsSecure(), false, cconn->getSUID(), nullptr, cconn->getGameFeatures(), cconn->getSubscriptionFeatures(), cconn->getEntitlementTotalTime(), cconn->getEntitlementEntitledTime(), cconn->getEntitlementTotalTimeSinceLastLogin(), cconn->getEntitlementEntitledTimeSinceLastLogin(), cconn->getBuddyPoints(), cconn->getConsumedRewardEvents(), cconn->getClaimedRewardItems(), cconn->isUsingAdminLogin(), cconn->getCanSkipTutorial(), sendToStarport ); gconn->send(m, true); //@todo move this to ClientConnection.cpp } @@ -375,7 +375,7 @@ void ConnectionServer::addNewClient(ClientConnection* cconn, const NetworkId &oi void ConnectionServer::dropClient(ClientConnection * conn, const std::string& description) { - DEBUG_FATAL(!conn, ("Cannot call dropClient with NULL connection")); + DEBUG_FATAL(!conn, ("Cannot call dropClient with nullptr connection")); if (!conn) //lint !e774 // boolean within 'if' always evaluates to False //suppresed because this is only relevant in DEBUG builds return; @@ -466,7 +466,7 @@ GameConnection* ConnectionServer::getGameConnection(const std::string &sceneName return (*i).second; } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -477,15 +477,15 @@ void ConnectionServer::handleConnectionServerIdMessage(const ConnectionServerId const Service * const servicePrivate = getClientServicePrivate(); const Service * const servicePublic = getClientServicePublic(); - FATAL(servicePrivate == NULL && servicePublic == NULL, ("No client service is active!")); + FATAL(servicePrivate == nullptr && servicePublic == nullptr, ("No client service is active!")); const Service * const g = getGameService(); - FATAL(g == NULL, ("No game service is active!")); + FATAL(g == nullptr, ("No game service is active!")); const Service * const c = getChatService(); const Service * const cs = getCustomerService(); const uint16 pingPort = getPingPort (); - if((servicePrivate != NULL || servicePublic != NULL) && g != NULL) //lint !e774 // always evaluates to false // suppresed because the FATAL macro triggers this lint warning + if((servicePrivate != nullptr || servicePublic != nullptr) && g != nullptr) //lint !e774 // always evaluates to false // suppresed because the FATAL macro triggers this lint warning { uint16 chatPort = 0; uint16 csPort = 0; @@ -739,7 +739,7 @@ void ConnectionServer::receiveMessage(const MessageDispatch::Emitter & source, c std::set::const_iterator i; for(i = clients.begin(); i != clients.end(); ++ i) { - (*i)->setChatConnection(NULL); + (*i)->setChatConnection(nullptr); } } } @@ -782,7 +782,7 @@ void ConnectionServer::receiveMessage(const MessageDispatch::Emitter & source, c std::set::const_iterator i; for(i = clients.begin(); i != clients.end(); ++ i) { - (*i)->setCustomerServiceConnection(NULL); + (*i)->setCustomerServiceConnection(nullptr); } } @@ -960,7 +960,7 @@ void ConnectionServer::remove() // explicitly delete all connections that were setup from setupConnections rather than letting // Connection::remove do it. There are connections that require a valid s_connectionServer which is deleted - // and set to NULL. + // and set to nullptr. s_connectionServer->unsetupConnections(); SetupSharedLog::remove(); @@ -1316,7 +1316,7 @@ GameConnection* ConnectionServer::getGameConnection(uint32 gameServerId) if (i != cs.gameServerMap.end()) return (*i).second; - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -1327,7 +1327,7 @@ GameConnection* ConnectionServer::getAnyGameConnection() if (!cs.gameServerMap.empty()) return cs.gameServerMap.begin()->second; - return NULL; + return nullptr; } //----------------------------------------------------------------------- diff --git a/engine/server/application/ConnectionServer/src/shared/GameConnection.cpp b/engine/server/application/ConnectionServer/src/shared/GameConnection.cpp index ddf0fe38..ecfede1e 100755 --- a/engine/server/application/ConnectionServer/src/shared/GameConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/GameConnection.cpp @@ -157,7 +157,7 @@ void GameConnection::onReceive(const Archive::ByteStream & message) ca.getStartYaw(), ca.getTemplateName(), ca.getTimeSeconds(), - static_cast(::time(NULL)), + static_cast(::time(nullptr)), ConfigConnectionServer::getDisableWorldSnapshot()); client->getClientConnection()->send(startScene, true); } @@ -166,7 +166,7 @@ void GameConnection::onReceive(const Archive::ByteStream & message) // record the time when play started for the character if (client->getClientConnection()->getStartPlayTime() == 0) { - client->getClientConnection()->setStartPlayTime(::time(NULL)); + client->getClientConnection()->setStartPlayTime(::time(nullptr)); } // update the play time info on the game server diff --git a/engine/server/application/ConnectionServer/src/shared/PseudoClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/PseudoClientConnection.cpp index 49553a04..9caa85e9 100755 --- a/engine/server/application/ConnectionServer/src/shared/PseudoClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/PseudoClientConnection.cpp @@ -246,9 +246,9 @@ void PseudoClientConnection::receiveMessage(const Archive::ByteStream & message) characterId = m_transferCharacterData.getDestinationCharacterId(); } std::vector > static const emptyStringVector; - NewClient m(characterId, "TransferServer", NetworkHandler::getHostName(), true, false, stationId, NULL, 0, 0, 0, 0, 0, 0, 0, emptyStringVector, emptyStringVector, m_transferCharacterData.getCSToolId() != 0, true); + NewClient m(characterId, "TransferServer", NetworkHandler::getHostName(), true, false, stationId, nullptr, 0, 0, 0, 0, 0, 0, 0, emptyStringVector, emptyStringVector, m_transferCharacterData.getCSToolId() != 0, true); m_gameConnection->send(m, true); - LOG("CustomerService", ("CharacterTransfer: Sent NewClient(%s, \"TransferServer\", \"%s\", true, false, %d, NULL, 0, 0)\n", characterId.getValueString().c_str(), NetworkHandler::getHostName().c_str(), stationId)); + LOG("CustomerService", ("CharacterTransfer: Sent NewClient(%s, \"TransferServer\", \"%s\", true, false, %d, nullptr, 0, 0)\n", characterId.getValueString().c_str(), NetworkHandler::getHostName().c_str(), stationId)); } } else if(msg.isType("TransferLoginCharacterToSourceServer")) diff --git a/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp b/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp index dba551e9..67598bb4 100755 --- a/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp +++ b/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp @@ -303,10 +303,10 @@ void SessionApiClient::OnGetFeatures(const apiTrackingNumber trackingNumber, if (i != ms_getFeaturesTrackingNumberMap.end()) { bool reuseMessage = false; - AccountFeatureIdRequest const * accountFeatureIdRequest = NULL; - AdjustAccountFeatureIdRequest const * adjustAccountFeatureIdRequest = NULL; - AdjustAccountFeatureIdResponse * adjustAccountFeatureIdResponse = NULL; - ClaimRewardsMessage * claimRewardsMessage = NULL; + AccountFeatureIdRequest const * accountFeatureIdRequest = nullptr; + AdjustAccountFeatureIdRequest const * adjustAccountFeatureIdRequest = nullptr; + AdjustAccountFeatureIdResponse * adjustAccountFeatureIdResponse = nullptr; + ClaimRewardsMessage * claimRewardsMessage = nullptr; if (i->second->isType("AccountFeatureIdRequest")) accountFeatureIdRequest = dynamic_cast(i->second); @@ -319,7 +319,7 @@ void SessionApiClient::OnGetFeatures(const apiTrackingNumber trackingNumber, if (result == RESULT_SUCCESS) { - ClientConnection * clientConnection = NULL; + ClientConnection * clientConnection = nullptr; if (accountFeatureIdRequest) clientConnection = ConnectionServer::getClientConnection(accountFeatureIdRequest->getTargetStationId()); else if (adjustAccountFeatureIdRequest) @@ -391,7 +391,7 @@ void SessionApiClient::OnGetFeatures(const apiTrackingNumber trackingNumber, else { // if account already has the feature, adjust it, otherwise add the feature - LoginAPI::Feature const * existingFeature = NULL; + LoginAPI::Feature const * existingFeature = nullptr; for (unsigned k = 0; k < featureCount; ++k) { @@ -444,7 +444,7 @@ void SessionApiClient::OnGetFeatures(const apiTrackingNumber trackingNumber, } else { - LoginAPI::Feature const * newlyAddedFeature = NULL; + LoginAPI::Feature const * newlyAddedFeature = nullptr; for (unsigned k = 0; k < featureCount; ++k) { @@ -506,7 +506,7 @@ void SessionApiClient::OnGetFeatures(const apiTrackingNumber trackingNumber, else { // see if account already has the required feature - LoginAPI::Feature const * existingFeature = NULL; + LoginAPI::Feature const * existingFeature = nullptr; for (unsigned k = 0; k < featureCount; ++k) { @@ -904,7 +904,7 @@ void SessionApiClient::validateClient (ClientConnection* client, const std::stri void SessionApiClient::startPlay(const ClientConnection& client) { - IGNORE_RETURN(SessionStartPlay(client.getSessionId().c_str(), ConfigConnectionServer::getClusterName(), client.getCharacterName().c_str(), NULL)); + IGNORE_RETURN(SessionStartPlay(client.getSessionId().c_str(), ConfigConnectionServer::getClusterName(), client.getCharacterName().c_str(), nullptr)); } //------------------------------------------------------------ diff --git a/engine/server/application/CustomerServiceServer/src/linux/main.cpp b/engine/server/application/CustomerServiceServer/src/linux/main.cpp index 7cdc4016..35924a2c 100755 --- a/engine/server/application/CustomerServiceServer/src/linux/main.cpp +++ b/engine/server/application/CustomerServiceServer/src/linux/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(static_cast(time(NULL))); + SetupSharedRandom::install(static_cast(time(nullptr))); Os::setProgramName("CustomerServiceServer"); ConfigCustomerServiceServer::install(); NetworkHandler::install(); diff --git a/engine/server/application/CustomerServiceServer/src/shared/CentralServerConnection.cpp b/engine/server/application/CustomerServiceServer/src/shared/CentralServerConnection.cpp index 68a2ded3..8e74a876 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CentralServerConnection.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/CentralServerConnection.cpp @@ -49,7 +49,7 @@ void CentralServerConnection::onConnectionOpened() Service *chatServerService = CustomerServiceServer::getInstance().getChatServerService(); - if (chatServerService != NULL) + if (chatServerService != nullptr) { const std::string address(chatServerService->getBindAddress()); const int port = chatServerService->getBindPort(); @@ -62,7 +62,7 @@ void CentralServerConnection::onConnectionOpened() } else { - LOG("CentralServerConnection", ("onConnectionOpened() ERROR: ChatServerService is NULL")); + LOG("CentralServerConnection", ("onConnectionOpened() ERROR: ChatServerService is nullptr")); } } @@ -71,7 +71,7 @@ void CentralServerConnection::onConnectionOpened() Service *gameServerService = CustomerServiceServer::getInstance().getGameServerService(); - if (gameServerService != NULL) + if (gameServerService != nullptr) { const std::string address(gameServerService->getBindAddress()); const int port = gameServerService->getBindPort(); @@ -84,7 +84,7 @@ void CentralServerConnection::onConnectionOpened() } else { - LOG("CentralServerConnection", ("onConnectionOpened() ERROR: GameServerService is NULL")); + LOG("CentralServerConnection", ("onConnectionOpened() ERROR: GameServerService is nullptr")); } } } diff --git a/engine/server/application/CustomerServiceServer/src/shared/ChatServerConnection.cpp b/engine/server/application/CustomerServiceServer/src/shared/ChatServerConnection.cpp index 239a4630..30a167b1 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/ChatServerConnection.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/ChatServerConnection.cpp @@ -64,13 +64,13 @@ void ChatServerConnection::sendTo(GameNetworkMessage const &message) { LOG("ChatServerConnection", ("sendTo() message(%s)", message.getCmdName().c_str())); - if (s_connection != NULL) + if (s_connection != nullptr) { s_connection->send(message, true); } else { - LOG("ChatServerConnection", ("sendTo() Unable to send, NULL ChatServerConnection")); + LOG("ChatServerConnection", ("sendTo() Unable to send, nullptr ChatServerConnection")); } } diff --git a/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp b/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp index eff05cf2..d0e93110 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/ConfigCustomerServiceServer.cpp @@ -12,19 +12,19 @@ namespace ConfigCustomerServiceServerNamespace { - const char * s_clusterName = NULL; - const char * s_centralServerAddress = NULL; + const char * s_clusterName = nullptr; + const char * s_centralServerAddress = nullptr; int s_centralServerPort = 0; - const char * s_gameCode = NULL; - const char * s_csServerAddress = NULL; + const char * s_gameCode = nullptr; + const char * s_csServerAddress = nullptr; int s_csServerPort = 0; int s_maxPacketsPerSecond = 50; int s_requestTimeoutSeconds = 300; int s_maxAllowedNumberOfTickets = 1; int s_gameServicePort = 0; int s_chatServicePort = 0; - const char* s_chatServiceBindInterface = NULL; - const char* s_gameServiceBindInterface = NULL; + const char* s_chatServiceBindInterface = nullptr; + const char* s_gameServiceBindInterface = nullptr; bool s_writeTicketToBugLog = false; }; diff --git a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.cpp b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.cpp index e1e93c31..333117be 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.cpp @@ -38,7 +38,7 @@ using namespace CSAssist; /////////////////////////////////////////////////////////////////////////////// CustomerServiceInterface::ClientInfo::ClientInfo() - : m_connection(NULL) + : m_connection(nullptr) , m_stationUserId(0) , m_ticketCount(-1) , m_pendingTicketCount(0) @@ -71,10 +71,10 @@ CustomerServiceInterface::~CustomerServiceInterface() delete m_japaneseCategoryList; delete m_clientConnectionMap; - m_clientConnectionMap = NULL; + m_clientConnectionMap = nullptr; delete m_suidToNetworkIdMap; - m_suidToNetworkIdMap = NULL; + m_suidToNetworkIdMap = nullptr; } //----------------------------------------------------------------------- @@ -97,8 +97,8 @@ void CustomerServiceInterface::OnConnectCSAssist( } m_connectionToBackEndEstablised = true; - m_englishCategoryTrack = requestGetIssueHierarchy(NULL, Unicode::narrowToWide("Default").data(), Unicode::narrowToWide("en").data());; - m_japaneseCategoryTrack = requestGetIssueHierarchy(NULL, Unicode::narrowToWide("Default").data(), Unicode::narrowToWide("ja").data());; + m_englishCategoryTrack = requestGetIssueHierarchy(nullptr, Unicode::narrowToWide("Default").data(), Unicode::narrowToWide("en").data());; + m_japaneseCategoryTrack = requestGetIssueHierarchy(nullptr, Unicode::narrowToWide("Default").data(), Unicode::narrowToWide("ja").data());; } } @@ -117,7 +117,7 @@ void CustomerServiceInterface::OnConnectRejectedCSAssist(const CSAssistGameAPITr void CustomerServiceInterface::parseIssueChild(CategoryList & categoryList, xmlNodePtr childPtr) { - static CustomerServiceCategory *currentCategory = NULL; + static CustomerServiceCategory *currentCategory = nullptr; xmlNodePtr child = childPtr->children; //start element @@ -142,19 +142,19 @@ void CustomerServiceInterface::parseIssueChild(CategoryList & categoryList, xmlN val = reinterpret_cast(xmlGetProp(childPtr, (const unsigned char *)"isBugType")); - bool const isBugType = (val != NULL) && (strcmp(val, "true") == 0); + bool const isBugType = (val != nullptr) && (strcmp(val, "true") == 0); // Check for service type val = reinterpret_cast(xmlGetProp(childPtr, (const unsigned char *)"isServiceType")); - bool const isServiceType = (val != NULL) && (strcmp(val, "true") == 0); + bool const isServiceType = (val != nullptr) && (strcmp(val, "true") == 0); // Check if valid val = reinterpret_cast(xmlGetProp(childPtr, (const unsigned char *)"invalid")); - bool const invalid = (val != NULL) && (strcmp(val, "true") == 0); + bool const invalid = (val != nullptr) && (strcmp(val, "true") == 0); if (!invalid) { @@ -187,9 +187,9 @@ void CustomerServiceInterface::parseIssueChild(CategoryList & categoryList, xmlN } } - while (child != NULL) + while (child != nullptr) { - if (child->name != NULL) + if (child->name != nullptr) { parseIssueChild(categoryList, child); } @@ -204,7 +204,7 @@ void CustomerServiceInterface::parseIssueChild(CategoryList & categoryList, xmlN if (currentCategory) { delete currentCategory; - currentCategory = NULL; + currentCategory = nullptr; } } @@ -215,13 +215,13 @@ void CustomerServiceInterface::parseIssueChild(CategoryList & categoryList, xmlN void CustomerServiceInterface::parseIssueHierarchy(CategoryList & categoryList, Unicode::String const & xmlData) { - xmlDocPtr xmlInfo = NULL; + xmlDocPtr xmlInfo = nullptr; Unicode::UTF8String xmlDataUtf8(Unicode::wideToUTF8(xmlData)); - if ((xmlInfo = xmlParseMemory(xmlDataUtf8.c_str(), xmlDataUtf8.length())) != NULL) + if ((xmlInfo = xmlParseMemory(xmlDataUtf8.c_str(), xmlDataUtf8.length())) != nullptr) { xmlNodePtr xmlCurrent = xmlDocGetRootElement(xmlInfo); - if (xmlCurrent != NULL) + if (xmlCurrent != nullptr) { parseIssueChild(categoryList, xmlCurrent); } @@ -247,7 +247,7 @@ void CustomerServiceInterface::OnGetIssueHierarchy( return; } - if (hierarchyBody != NULL) + if (hierarchyBody != nullptr) { if (track == m_englishCategoryTrack) { @@ -266,7 +266,7 @@ void CustomerServiceInterface::OnGetIssueHierarchy( } else { - LOG("CSServer", ("ERROR: NULL hierarchy returned from platform...why did this happen?", track, modifyData, result, getErrorString(result))); + LOG("CSServer", ("ERROR: nullptr hierarchy returned from platform...why did this happen?", track, modifyData, result, getErrorString(result))); } } @@ -282,9 +282,9 @@ void CustomerServiceInterface::OnCreateTicket( CreateTicketResponseMessage message(result, ticket); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnCreateTicket() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); + LOG("CSServer", ("OnCreateTicket() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { if (result == CSASSIST_RESULT_SUCCESS) { @@ -296,7 +296,7 @@ void CustomerServiceInterface::OnCreateTicket( sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -312,14 +312,14 @@ void CustomerServiceInterface::OnAppendTicketComment( AppendCommentResponseMessage message(result, ticket); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnAppendTicketComment() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); + LOG("CSServer", ("OnAppendTicketComment() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -335,9 +335,9 @@ void CustomerServiceInterface::OnCancelTicket( CancelTicketResponseMessage message(result, ticket); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnCancelTicket() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); + LOG("CSServer", ("OnCancelTicket() track(%i) result(%i) (%s) networkId(%s) ticketId(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", ticket)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { if (result == CSASSIST_RESULT_SUCCESS) { @@ -347,7 +347,7 @@ void CustomerServiceInterface::OnCancelTicket( sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -378,9 +378,9 @@ void CustomerServiceInterface::OnGetTicketByCharacter( GetTicketsResponseMessage message(result, totalNumber, tickets); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnGetTicketByCharacter() track(%i) result(%i) (%s) networkId(%s) totalNumber(%i) numberReturned(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", totalNumber, numberReturned)); + LOG("CSServer", ("OnGetTicketByCharacter() track(%i) result(%i) (%s) networkId(%s) totalNumber(%i) numberReturned(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", totalNumber, numberReturned)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { // Save the number of tickets this player has @@ -396,7 +396,7 @@ void CustomerServiceInterface::OnGetTicketByCharacter( sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -423,14 +423,14 @@ void CustomerServiceInterface::OnGetTicketComments( const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnGetTicketComments() track(%i) result(%i) (%s) networkId(%s) numberRead(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", numberRead)); + LOG("CSServer", ("OnGetTicketComments() track(%i) result(%i) (%s) networkId(%s) numberRead(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", numberRead)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -455,14 +455,14 @@ void CustomerServiceInterface::OnSearchKB( SearchKnowledgeBaseResponseMessage message(result, searchResultsVector); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnSearchKB() track(%i) result(%i) (%s) networkId(%s) numberRead(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", numberRead)); + LOG("CSServer", ("OnSearchKB() track(%i) result(%i) (%s) networkId(%s) numberRead(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", numberRead)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -482,12 +482,12 @@ void CustomerServiceInterface::OnGetKBArticle( { GetArticleResponseMessage message(result, Unicode::String(articleBody)); const NetworkId *tmpNetworkId = reinterpret_cast(userData); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } } @@ -501,7 +501,7 @@ void CustomerServiceInterface::OnIssueHierarchyChanged( { LOG("CSServer", ("OnIssueHierarchyChanged()")); - requestGetIssueHierarchy(NULL, version, language); + requestGetIssueHierarchy(nullptr, version, language); } //----------------------------------------------------------------------- @@ -512,9 +512,9 @@ void CustomerServiceInterface::OnNewTicketActivity(const CSAssistGameAPITrack tr const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnNewTicketActivity() track(%i) result(%i) (%s) networkId(%s) activity(%s) ticket count(%i)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA", NewActivityFlag ? "yes" : "no", HasTickets)); + LOG("CSServer", ("OnNewTicketActivity() track(%i) result(%i) (%s) networkId(%s) activity(%s) ticket count(%i)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA", NewActivityFlag ? "yes" : "no", HasTickets)); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { // Save the number of tickets this player has @@ -530,7 +530,7 @@ void CustomerServiceInterface::OnNewTicketActivity(const CSAssistGameAPITrack tr sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -540,12 +540,12 @@ void CustomerServiceInterface::OnMarkTicketRead(const CSAssistGameAPITrack track { const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnMarkTicketRead() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA")); + LOG("CSServer", ("OnMarkTicketRead() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA")); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -575,16 +575,16 @@ void CustomerServiceInterface::OnRegisterCharacter(const CSAssistGameAPITrack tr { const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnRegisterCharacter() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA")); + LOG("CSServer", ("OnRegisterCharacter() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA")); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { ConnectPlayerResponseMessage message(result); sendToClient(*tmpNetworkId, message); delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -594,9 +594,9 @@ void CustomerServiceInterface::OnUnRegisterCharacter(const CSAssistGameAPITrack { const NetworkId *tmpNetworkId = reinterpret_cast(userData); - LOG("CSServer", ("OnUnRegisterCharacter() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != NULL) ? tmpNetworkId->getValueString().c_str() : "NA")); + LOG("CSServer", ("OnUnRegisterCharacter() track(%i) result(%i) (%s) networkId(%s)", track, result, getErrorString(result), (tmpNetworkId != nullptr) ? tmpNetworkId->getValueString().c_str() : "NA")); - if (tmpNetworkId != NULL) + if (tmpNetworkId != nullptr) { // If the player was successfully unregistered, remove the local cached reference @@ -606,7 +606,7 @@ void CustomerServiceInterface::OnUnRegisterCharacter(const CSAssistGameAPITrack } delete tmpNetworkId; - tmpNetworkId = NULL; + tmpNetworkId = nullptr; } } @@ -708,7 +708,7 @@ void CustomerServiceInterface::sendToClient(const NetworkId &player, const GameN } else { - LOG("CSServer", ("sendToClient() Connection is NULL: networkId(%s) cmdName(%s)", player.getValueString().c_str(), message.getCmdName().c_str())); + LOG("CSServer", ("sendToClient() Connection is nullptr: networkId(%s) cmdName(%s)", player.getValueString().c_str(), message.getCmdName().c_str())); } } else @@ -779,7 +779,7 @@ void CustomerServiceInterface::requestUnRegisterCharacter(const NetworkId &reque LOG("CSServer", ("requestUnRegisterCharacter() networkId(%s) suid(%i)", requester.getValueString().c_str(), suid)); NetworkId *tmpNetworkId = new NetworkId(requester); - CSAssistGameAPI::requestUnRegisterCharacter(reinterpret_cast(tmpNetworkId), suid, NULL); + CSAssistGameAPI::requestUnRegisterCharacter(reinterpret_cast(tmpNetworkId), suid, nullptr); } else { diff --git a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.cpp b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.cpp index 7beaacc5..fb4e7abe 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.cpp +++ b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.cpp @@ -49,7 +49,7 @@ namespace CustomerServiceServerNamespace using namespace CustomerServiceServerNamespace; -CustomerServiceServer *CustomerServiceServer::m_instance = NULL; +CustomerServiceServer *CustomerServiceServer::m_instance = nullptr; /////////////////////////////////////////////////////////////////////////////// // @@ -83,12 +83,12 @@ CustomerServiceServer::PendingTicket::PendingTicket() CustomerServiceServer::CustomerServiceServer() : m_callback(new MessageDispatch::Callback), -m_centralServerConnection(NULL), +m_centralServerConnection(nullptr), m_connectionServerSet(new ConnectionServerSet), m_done(false), m_csInterface(ConfigCustomerServiceServer::getCustomerServiceServerAddress(), ConfigCustomerServiceServer::getCustomerServiceServerPort(), ConfigCustomerServiceServer::getRequestTimeoutSeconds()), -m_gameServerService(NULL), -m_chatServerService(NULL), +m_gameServerService(nullptr), +m_chatServerService(nullptr), m_nextSequenceId(0), m_pendingTicketList(new PendingTicketList) { @@ -113,7 +113,7 @@ m_pendingTicketList(new PendingTicketList) m_csInterface.setMaxPacketsPerSecond(ConfigCustomerServiceServer::getMaxPacketsPerSecond()); - m_csInterface.connectCSAssist(NULL, + m_csInterface.connectCSAssist(nullptr, Unicode::narrowToWide(ConfigCustomerServiceServer::getGameCode()).data(), Unicode::narrowToWide(ConfigCustomerServiceServer::getClusterName()).data()); @@ -148,19 +148,19 @@ CustomerServiceServer::~CustomerServiceServer() m_centralServerConnection->disconnect(); delete m_callback; - m_callback = NULL; + m_callback = nullptr; delete m_connectionServerSet; - m_connectionServerSet = NULL; + m_connectionServerSet = nullptr; delete m_gameServerService; - m_gameServerService = NULL; + m_gameServerService = nullptr; delete m_chatServerService; - m_chatServerService = NULL; + m_chatServerService = nullptr; delete m_pendingTicketList; - m_pendingTicketList = NULL; + m_pendingTicketList = nullptr; MetricsManager::remove(); delete s_customerServiceServerMetricsData; @@ -233,7 +233,7 @@ void CustomerServiceServer::update() CustomerServiceServer &CustomerServiceServer::getInstance() { - if (m_instance == NULL) + if (m_instance == nullptr) { m_instance = new CustomerServiceServer; } @@ -405,7 +405,7 @@ void CustomerServiceServer::getTickets( NetworkId *tmpNetworkId = new NetworkId(requester); m_csInterface.requestGetTicketByCharacter( - reinterpret_cast(tmpNetworkId), suid, NULL, + reinterpret_cast(tmpNetworkId), suid, nullptr, start, count, markAsRead); } @@ -475,7 +475,7 @@ void CustomerServiceServer::requestNewTicketActivity(const NetworkId &requester, NetworkId *tmpNetworkId = new NetworkId(requester); - m_csInterface.requestNewTicketActivity(reinterpret_cast(tmpNetworkId), suid, NULL); + m_csInterface.requestNewTicketActivity(reinterpret_cast(tmpNetworkId), suid, nullptr); } //----------------------------------------------------------------------- @@ -497,7 +497,7 @@ void CustomerServiceServer::requestRegisterCharacter(const NetworkId &requester, LOG("CSServer", ("CustomerServiceInterface::requestRegisterCharacter() - networkId(%s) suid(%i)", requester.getValueString().c_str(), suid)); NetworkId *tmpNetworkId = new NetworkId(requester); - m_csInterface.requestRegisterCharacter(reinterpret_cast(tmpNetworkId), suid, NULL, 0); + m_csInterface.requestRegisterCharacter(reinterpret_cast(tmpNetworkId), suid, nullptr, 0); } } diff --git a/engine/server/application/LogServer/src/shared/LoggingServerApi.cpp b/engine/server/application/LogServer/src/shared/LoggingServerApi.cpp index 89591848..a6b9920f 100755 --- a/engine/server/application/LogServer/src/shared/LoggingServerApi.cpp +++ b/engine/server/application/LogServer/src/shared/LoggingServerApi.cpp @@ -23,16 +23,16 @@ LoggingServerApi::LoggingServerApi(LoggingServerHandler *handler, int queueSize) mLoginName[0] = 0; mPassword[0] = 0; mDefaultDirectory[0] = 0; - mConnection = NULL; - mUdpManager = NULL; - mTransaction = NULL; - mSessionId = int(time(NULL)); + mConnection = nullptr; + mUdpManager = nullptr; + mTransaction = nullptr; + mSessionId = int(time(nullptr)); mSessionSequence = 1; } LoggingServerApi::~LoggingServerApi() { - if (mTransaction != NULL) + if (mTransaction != nullptr) StopTransaction(); for (int i = 0; i < mQueueCount; i++) @@ -77,7 +77,7 @@ void LoggingServerApi::Connect(const char *address, int port, const char *loginN mUdpManager = new UdpManager(¶ms); mConnection = mUdpManager->EstablishConnection(address, port, 30000); - if (mConnection != NULL) + if (mConnection != nullptr) mConnection->SetHandler(this); mLoginSent = false; } @@ -89,17 +89,17 @@ void LoggingServerApi::Disconnect() mPassword[0] = 0; mDefaultDirectory[0] = 0; - if (mConnection != NULL) + if (mConnection != nullptr) { mConnection->Disconnect(); mConnection->Release(); - mConnection = NULL; + mConnection = nullptr; } - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->Release(); - mUdpManager = NULL; + mUdpManager = nullptr; } } @@ -119,7 +119,7 @@ void LoggingServerApi::Flush(int timeout) LoggingServerApi::Status LoggingServerApi::GetStatus() const { - if (mConnection != NULL) + if (mConnection != nullptr) { switch (mConnection->GetStatus()) { @@ -153,7 +153,7 @@ void LoggingServerApi::OnRoutePacket(UdpConnection *, const uchar *data, int) FlushQueue(); } - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->LshOnLoginConfirm(mAuthenticated); break; } @@ -171,13 +171,13 @@ void LoggingServerApi::OnRoutePacket(UdpConnection *, const uchar *data, int) char *filename = ptr; ptr += strlen(ptr) + 1; char *message = ptr; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->LshOnMonitor(sessionId, sequenceNumber, name, filename, typeCode, message); break; } case cS2CPacketFileList: { - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->LshOnFileList((char *)(data + 1)); break; } @@ -188,7 +188,7 @@ void LoggingServerApi::OnRoutePacket(UdpConnection *, const uchar *data, int) void LoggingServerApi::OnTerminated(UdpConnection *con) { - if(mHandler != NULL) + if(mHandler != nullptr) { mHandler->LshOnTerminated( con->GetDisconnectReason() ); } @@ -196,7 +196,7 @@ void LoggingServerApi::OnTerminated(UdpConnection *con) void LoggingServerApi::GiveTime() { - if (mConnection != NULL && mConnection->GetStatus() == UdpConnection::cStatusConnected) + if (mConnection != nullptr && mConnection->GetStatus() == UdpConnection::cStatusConnected) { if (!mLoginSent) { @@ -225,7 +225,7 @@ void LoggingServerApi::GiveTime() if (mQueue[spot].sentTime != 0 && UdpMisc::ClockElapsed(mQueue[spot].sentTime) > cSafetyQueueTime) { mQueue[spot].packet->Release(); - mQueue[spot].packet = NULL; + mQueue[spot].packet = nullptr; mQueuePosition++; mQueueCount--; } @@ -235,7 +235,7 @@ void LoggingServerApi::GiveTime() } } - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->GiveTime(); } @@ -243,17 +243,17 @@ void LoggingServerApi::GiveTime() void LoggingServerApi::StartTransaction() { - if (mTransaction == NULL) + if (mTransaction == nullptr) mTransaction = new GroupLogicalPacket(); } void LoggingServerApi::StopTransaction() { - if (mTransaction != NULL) + if (mTransaction != nullptr) { PacketSend(mTransaction); mTransaction->Release(); - mTransaction = NULL; + mTransaction = nullptr; } } @@ -264,7 +264,7 @@ void LoggingServerApi::PacketSend(LogicalPacket *lp) { int spot = mQueuePosition % mQueueSize; mQueue[spot].packet->Release(); - mQueue[spot].packet = NULL; + mQueue[spot].packet = nullptr; mQueuePosition++; mQueueCount--; } @@ -374,7 +374,7 @@ void LoggingServerApi::Log(const char *filename, int typeCode, const char *messa void LoggingServerApi::LogPacket(char *data, int len) { - if (mTransaction != NULL) + if (mTransaction != nullptr) { // add it to the transaction mTransaction->AddPacket(data, len); @@ -389,7 +389,7 @@ void LoggingServerApi::LogPacket(char *data, int len) LogicalPacket *LoggingServerApi::CreatePacket(char *data, int dataLen) { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { return(mUdpManager->CreatePacket(data, dataLen)); } @@ -440,7 +440,7 @@ void LoggingServerApi::GetStatistics(LoggingServerApiStatistics *stats) memset( stats, 0, sizeof( *stats) ); UdpConnectionStatistics udpConnectionStats; memset( &udpConnectionStats, 0, sizeof( udpConnectionStats ) ); - if( mConnection != NULL ) + if( mConnection != nullptr ) { mConnection->GetStats( &udpConnectionStats ); stats->applicationPacketsReceived = udpConnectionStats.applicationPacketsReceived; @@ -454,7 +454,7 @@ void LoggingServerApi::GetStatistics(LoggingServerApiStatistics *stats) } UdpManagerStatistics managerStats; - if( mUdpManager != NULL ) + if( mUdpManager != nullptr ) { mUdpManager->GetStats( &managerStats ); udp_int64 iterations = managerStats.iterations; diff --git a/engine/server/application/LoginServer/src/linux/main.cpp b/engine/server/application/LoginServer/src/linux/main.cpp index 7b4d7c1b..e08cb606 100755 --- a/engine/server/application/LoginServer/src/linux/main.cpp +++ b/engine/server/application/LoginServer/src/linux/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char ** argv) SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(static_cast(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + SetupSharedRandom::install(static_cast(time(nullptr))); //lint !e1924 !e64 // nullptr is a C-Style cast? Os::setProgramName("LoginServer"); //setup the server diff --git a/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp b/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp index 3da0b98b..7e10c623 100755 --- a/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp @@ -51,7 +51,7 @@ void CSToolConnection::validateCSTool(uint32 toolId, apiResult result, const api p_connection->m_bSecure = true; } - // if we have a null session type, then we aren't connected to the + // if we have a nullptr session type, then we aren't connected to the // Session Server and are in debug mode. // // if we *do* have a good session, then check the admin table for access level. @@ -71,7 +71,7 @@ void CSToolConnection::validateCSTool(uint32 toolId, apiResult result, const api bool canLogin = isInternal; // we always have to be internal. if (sessionNull) { - // null session means we can skip everything else. + // nullptr session means we can skip everything else. canLogin = canLogin && true; accessLevel = 100; } diff --git a/engine/server/application/LoginServer/src/shared/CentralServerConnection.cpp b/engine/server/application/LoginServer/src/shared/CentralServerConnection.cpp index 6b803038..2f096fce 100755 --- a/engine/server/application/LoginServer/src/shared/CentralServerConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/CentralServerConnection.cpp @@ -282,13 +282,13 @@ void CentralServerConnection::onReceive(const Archive::ByteStream & message) else if(m.isType("GcwScoreStatRaw")) { GenericValueTypeMessage >, std::map > > > > const msg(ri); - LoginServer::getInstance().sendToAllClusters(msg, NULL, 0, msg.getValue().first.c_str()); + LoginServer::getInstance().sendToAllClusters(msg, nullptr, 0, msg.getValue().first.c_str()); } else if(m.isType("GcwScoreStatPct")) { GenericValueTypeMessage, std::map > > > const msg(ri); - LoginServer::getInstance().sendToAllClusters(msg, NULL, 0, msg.getValue().first.c_str()); + LoginServer::getInstance().sendToAllClusters(msg, nullptr, 0, msg.getValue().first.c_str()); } } diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index 087796db..6fe81a51 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -100,7 +100,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message) // client has an idea of how much difference there is between // the client's Epoch time and the server Epoch time GenericValueTypeMessage const serverNowEpochTime( - "ServerNowEpochTime", static_cast(::time(NULL))); + "ServerNowEpochTime", static_cast(::time(nullptr))); send(serverNowEpochTime, true); LoginClientId id(ri); @@ -202,7 +202,7 @@ void ClientConnection::validateClient(const std::string & id, const std::string LOG("LoginClientConnection", ("validateClient() for stationId (%lu) at IP (%s), id (%s) key (%s), skipping validating session", m_stationId, getRemoteAddress().c_str(), id.c_str(), key.c_str())); - LoginServer::getInstance().onValidateClient(suid, id, this, true, NULL, 0xFFFFFFFF, 0xFFFFFFFF); + LoginServer::getInstance().onValidateClient(suid, id, this, true, nullptr, 0xFFFFFFFF, 0xFFFFFFFF); } } diff --git a/engine/server/application/LoginServer/src/shared/ConsoleManager.cpp b/engine/server/application/LoginServer/src/shared/ConsoleManager.cpp index ecaaa8fa..8721d5c6 100755 --- a/engine/server/application/LoginServer/src/shared/ConsoleManager.cpp +++ b/engine/server/application/LoginServer/src/shared/ConsoleManager.cpp @@ -14,7 +14,7 @@ namespace ConsoleManagerNamespace { - ConsoleCommandParser * s_consoleCommandParserRoot = NULL; + ConsoleCommandParser * s_consoleCommandParserRoot = nullptr; } using namespace ConsoleManagerNamespace; diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp index a38d3725..759331b4 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp +++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp @@ -130,7 +130,7 @@ LoginServer::LoginServer() : Singleton(), MessageDispatch::Receiver(), done(false), -m_centralService(NULL), +m_centralService(nullptr), clientService(0), pingService(0), keyServer(0), @@ -391,7 +391,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const { CentralServerConnection * connection = const_cast(safe_cast(&source)); DEBUG_REPORT_LOG(true, ("Cluster connection %s opened\n", msg.getClusterName().c_str())); - ClusterListEntry *cle=NULL; + ClusterListEntry *cle=nullptr; if (ConfigLoginServer::getDevelopmentMode()) { // in this mode, we trust the name sent by the cluster and we dynamically add clusters we don't know about @@ -410,7 +410,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const { WARNING(true,("Server %i is named \"%s\" in the database. The server at the specified address (%s:%hu) reports its name as \"%s\". It will not be allowed in the service. Either the name in the database or the name in Central's config file should be corrected.\n",cle->m_clusterId, cle->m_clusterName.c_str(), connection->getRemoteAddress().c_str(), connection->getRemotePort(), msg.getClusterName().c_str())); disconnectCluster(*cle,true,false); - cle=NULL; + cle=nullptr; } } @@ -589,7 +589,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const // for testing purpose when not using session authentication, store // the account feature Ids locally in memory, which will get cleared // (obviously) when the LoginServer is restarted - std::map > * nonSessionTestingAccountFeatureIds = NULL; + std::map > * nonSessionTestingAccountFeatureIds = nullptr; if (msg.getGameCode() == PlatformGameCode::SWG) nonSessionTestingAccountFeatureIds = &s_nonSessionTestingAccountSwgFeatureIds; else if (msg.getGameCode() == PlatformGameCode::SWGTCG) @@ -648,7 +648,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const // for testing purpose when not using session authentication, store // the account feature Ids locally in memory, which will get cleared // (obviously) when the LoginServer is restarted - std::map > * nonSessionTestingAccountFeatureIds = NULL; + std::map > * nonSessionTestingAccountFeatureIds = nullptr; if (msg.getGameCode() == PlatformGameCode::SWG) nonSessionTestingAccountFeatureIds = &s_nonSessionTestingAccountSwgFeatureIds; else if (msg.getGameCode() == PlatformGameCode::SWGTCG) @@ -826,7 +826,7 @@ void LoginServer::receiveMessage(const MessageDispatch::Emitter & source, const const CentralServerConnection *conn = dynamic_cast(&source); if (conn) - DatabaseConnection::getInstance().renameCharacter(conn->getClusterId(), msg.getCharacterId(), msg.getNewName(), NULL); + DatabaseConnection::getInstance().renameCharacter(conn->getClusterId(), msg.getCharacterId(), msg.getNewName(), nullptr); else WARNING_STRICT_FATAL(true,("Got RenameCharacterMessage from something other than CentralServerConnection.\n")); } @@ -1461,11 +1461,11 @@ LoginServer::ClusterListEntry *LoginServer::findClusterByName(const std::string ClusterListType::iterator i; for (i=m_clusterList.begin(); i!=m_clusterList.end(); ++i) { - NOT_NULL(*i); // not legal to push null pointers on the vector + NOT_NULL(*i); // not legal to push nullptr pointers on the vector if ((*i)->m_clusterName == clusterName) return *i; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1555,7 +1555,7 @@ void LoginServer::sendClusterStatus(ClientConnection &conn) const // 5) Cluster has told us its ready for players if (cle && cle->m_clusterId!=0 && cle->m_connected && !cle->m_connectionServers.empty() && (clientIsPrivate || !cle->m_secret)) { - DEBUG_FATAL(!cle->m_centralServerConnection,("Programmer bug: m_connected was true but m_centralServerConnection was NULL\n")); + DEBUG_FATAL(!cle->m_centralServerConnection,("Programmer bug: m_connected was true but m_centralServerConnection was nullptr\n")); LoginClusterStatus::ClusterData item; item.m_clusterId = cle->m_clusterId; item.m_timeZone = cle->m_timeZone; @@ -1840,12 +1840,12 @@ LoginServer::ClusterListEntry * LoginServer::findClusterById(uint32 clusterId) ClusterListType::const_iterator i; for (i=m_clusterList.begin(); i!=m_clusterList.end(); ++i) { - NOT_NULL(*i); // not legal to push null pointers on the vector + NOT_NULL(*i); // not legal to push nullptr pointers on the vector if ((*i)->m_clusterId == clusterId) return *i; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1859,12 +1859,12 @@ LoginServer::ClusterListEntry * LoginServer::findClusterByConnection(const Centr ClusterListType::const_iterator i; for (i=m_clusterList.begin(); i!=m_clusterList.end(); ++i) { - NOT_NULL(*i); // not legal to push null pointers on the vector + NOT_NULL(*i); // not legal to push nullptr pointers on the vector if ((*i)->m_centralServerConnection == connection) return *i; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1908,12 +1908,12 @@ void LoginServer::setDone(const bool isDone) // ---------------------------------------------------------------------- -void LoginServer::sendToAllClusters(GameNetworkMessage const & message, Connection const * excludeCentralConnection /*= NULL*/, uint32 excludeClusterId /*= 0*/, char const * excludeClusterName /*= NULL*/) +void LoginServer::sendToAllClusters(GameNetworkMessage const & message, Connection const * excludeCentralConnection /*= nullptr*/, uint32 excludeClusterId /*= 0*/, char const * excludeClusterName /*= nullptr*/) { ClusterListType::const_iterator i; for (i=m_clusterList.begin(); i!=m_clusterList.end(); ++i) { - if (NON_NULL(*i)->m_connected && (*i)->m_centralServerConnection && ((*i)->m_centralServerConnection != excludeCentralConnection) && ((*i)->m_clusterId != excludeClusterId) && ((excludeClusterName == NULL) || _stricmp(excludeClusterName, (*i)->m_centralServerConnection->getClusterName().c_str()))) + if (NON_NULL(*i)->m_connected && (*i)->m_centralServerConnection && ((*i)->m_centralServerConnection != excludeCentralConnection) && ((*i)->m_clusterId != excludeClusterId) && ((excludeClusterName == nullptr) || _stricmp(excludeClusterName, (*i)->m_centralServerConnection->getClusterName().c_str()))) (*i)->m_centralServerConnection->send(message,true); } } diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.h b/engine/server/application/LoginServer/src/shared/LoginServer.h index a284068e..f1d4de5b 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.h +++ b/engine/server/application/LoginServer/src/shared/LoginServer.h @@ -64,7 +64,7 @@ public: void validateAccount (const StationId& stationId, uint32 clusterId, uint32 subscriptionBits, bool canCreateRegular, bool canCreateJedi, bool canSkipTutorial, unsigned int track, std::vector > const & consumedRewardEvents, std::vector > const & claimedRewardItems); void validateAccountForTransfer(const TransferRequestMoveValidation & request, uint32 clusterId, uint32 sourceCharacterTemplateId, bool canCreateRegular, bool canCreateJedi); void sendToCluster (uint32 clusterId, const GameNetworkMessage &message); - void sendToAllClusters (GameNetworkMessage const & message, Connection const * excludeCentralConnection = NULL, uint32 excludeClusterId = 0, char const * excludeClusterName = NULL); + void sendToAllClusters (GameNetworkMessage const & message, Connection const * excludeCentralConnection = nullptr, uint32 excludeClusterId = 0, char const * excludeClusterName = nullptr); bool areAllClustersUp () const; void getClusterIds (stdvector::fwd result); void performAccountTransfer (const AvatarList &avatars, TransferAccountData * transferAccountData); diff --git a/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp b/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp index f130d691..73ff91ae 100755 --- a/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp +++ b/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp @@ -435,7 +435,7 @@ void SessionApiClient::NotifySessionKick(const char ** sessionList, void SessionApiClient::checkStatusForPurge(StationId account) { - GetAccountSubscription(account, PlatformGameCode::SWG, NULL); + GetAccountSubscription(account, PlatformGameCode::SWG, nullptr); } //------------------------------------------------------------------------------------------ diff --git a/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.cpp b/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.cpp index 6e8ed6d4..243f3c71 100755 --- a/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskCreateCharacter.cpp @@ -58,7 +58,7 @@ void TaskCreateCharacter::onComplete() // let all other galaxies know that a new character has been created for the station account GenericValueTypeMessage const ncc("NewCharacterCreated", m_stationId); - LoginServer::getInstance().sendToAllClusters(ncc, NULL, m_clusterId); + LoginServer::getInstance().sendToAllClusters(ncc, nullptr, m_clusterId); } // ====================================================================== diff --git a/engine/server/application/LoginServer/src/shared/TaskGetCharactersForDelete.cpp b/engine/server/application/LoginServer/src/shared/TaskGetCharactersForDelete.cpp index 5259daf4..3cc49cef 100755 --- a/engine/server/application/LoginServer/src/shared/TaskGetCharactersForDelete.cpp +++ b/engine/server/application/LoginServer/src/shared/TaskGetCharactersForDelete.cpp @@ -14,7 +14,7 @@ // ====================================================================== TaskGetCharactersForDelete::TaskGetCharactersForDelete (StationId stationId, int clusterGroupId) : - TaskGetAvatarList(stationId, clusterGroupId, NULL) + TaskGetAvatarList(stationId, clusterGroupId, nullptr) { } diff --git a/engine/server/application/MetricsServer/src/linux/main.cpp b/engine/server/application/MetricsServer/src/linux/main.cpp index 2287e9de..d4a429d8 100755 --- a/engine/server/application/MetricsServer/src/linux/main.cpp +++ b/engine/server/application/MetricsServer/src/linux/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char ** argv) SetupSharedNetwork::getDefaultServerSetupData(networkSetupData); SetupSharedNetwork::install(networkSetupData); - SetupSharedRandom::install(static_cast(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + SetupSharedRandom::install(static_cast(time(nullptr))); //lint !e1924 !e64 // nullptr is a C-Style cast? Os::setProgramName("MetricsServer"); //setup the server diff --git a/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp b/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp index 4cab5ae6..dd398ff2 100755 --- a/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp +++ b/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp @@ -169,19 +169,19 @@ void MetricsGatheringConnection::update(const std::vector & data) //note: we know that the "isSecret", and "isLocked" nodes will come after the "population" node in the list // we are iterating over, so they will override the population setting - if (strstr((*dataIter).m_label.c_str(), "population") != NULL) + if (strstr((*dataIter).m_label.c_str(), "population") != nullptr) { // there are nodes under the population node, so don't interpret them as the population - if (strstr((*dataIter).m_label.c_str(), "population.") == NULL) + if (strstr((*dataIter).m_label.c_str(), "population.") == nullptr) mon->set(MetricsServer::getWorldCountChannel(), std::max((*dataIter).m_value, 0)); } - else if (strstr((*dataIter).m_label.c_str(), "isSecret") != NULL - || strstr((*dataIter).m_label.c_str(), "isLocked") != NULL) + else if (strstr((*dataIter).m_label.c_str(), "isSecret") != nullptr + || strstr((*dataIter).m_label.c_str(), "isLocked") != nullptr) { if ((*dataIter).m_value == 1) mon->set(MetricsServer::getWorldCountChannel(), STATUS_LOCKED); } - else if (strstr((*dataIter).m_label.c_str(), "isLoading") != NULL) + else if (strstr((*dataIter).m_label.c_str(), "isLoading") != nullptr) { // include in the root node description how // long the cluster has been loading @@ -226,19 +226,19 @@ void MetricsGatheringConnection::update(const std::vector & data) //note: we know that the "isSecret", and "isLocked" nodes will come after the "population" node in the list // we are iterating over, so they will override the population setting - if (strstr((*dataIter).m_label.c_str(), "population") != NULL) + if (strstr((*dataIter).m_label.c_str(), "population") != nullptr) { // there are nodes under the population node, so don't interpret them as the population - if (strstr((*dataIter).m_label.c_str(), "population.") == NULL) + if (strstr((*dataIter).m_label.c_str(), "population.") == nullptr) mon->set(MetricsServer::getWorldCountChannel(), std::max((*dataIter).m_value, 0)); } - else if (strstr((*dataIter).m_label.c_str(), "isSecret") != NULL - || strstr((*dataIter).m_label.c_str(), "isLocked") != NULL) + else if (strstr((*dataIter).m_label.c_str(), "isSecret") != nullptr + || strstr((*dataIter).m_label.c_str(), "isLocked") != nullptr) { if ((*dataIter).m_value == 1) mon->set(MetricsServer::getWorldCountChannel(), STATUS_LOCKED); } - else if (strstr((*dataIter).m_label.c_str(), "isLoading") != NULL) + else if (strstr((*dataIter).m_label.c_str(), "isLoading") != nullptr) { // include in the root node description how // long the cluster has been loading diff --git a/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp b/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp index 9754caca..aab52220 100755 --- a/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp +++ b/engine/server/application/MetricsServer/src/shared/MetricsServer.cpp @@ -29,8 +29,8 @@ std::string MetricsServer::m_worldCountChannelDescription; bool MetricsServer::m_done = false; Service* MetricsServer::m_metricsService; CMonitorAPI * MetricsServer::m_soeMonitor; -Service * MetricsServer::ms_service = NULL; -TaskConnection * MetricsServer::ms_taskConnection = NULL; +Service * MetricsServer::ms_service = nullptr; +TaskConnection * MetricsServer::ms_taskConnection = nullptr; //---------------------------------------------------------------- diff --git a/engine/server/application/PlanetServer/src/linux/main.cpp b/engine/server/application/PlanetServer/src/linux/main.cpp index d77747cf..7d8b5908 100755 --- a/engine/server/application/PlanetServer/src/linux/main.cpp +++ b/engine/server/application/PlanetServer/src/linux/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char ** argv) SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(time(NULL)); //lint !e732 loss of sign (of 0!) + SetupSharedRandom::install(time(nullptr)); //lint !e732 loss of sign (of 0!) SetupSharedUtility::Data sharedUtilityData; SetupSharedUtility::setupGameData (sharedUtilityData); diff --git a/engine/server/application/PlanetServer/src/shared/ConsoleCommandParser.cpp b/engine/server/application/PlanetServer/src/shared/ConsoleCommandParser.cpp index b5839b87..4a3fec7d 100755 --- a/engine/server/application/PlanetServer/src/shared/ConsoleCommandParser.cpp +++ b/engine/server/application/PlanetServer/src/shared/ConsoleCommandParser.cpp @@ -31,7 +31,7 @@ const CommandParser::CmdInfo cmds[] = //----------------------------------------------------------------------- ConsoleCommandParser::ConsoleCommandParser() : -CommandParser ("", 0, "...", "console commands", NULL) +CommandParser ("", 0, "...", "console commands", nullptr) { createDelegateCommands(cmds); } diff --git a/engine/server/application/PlanetServer/src/shared/ConsoleManager.cpp b/engine/server/application/PlanetServer/src/shared/ConsoleManager.cpp index 2326cbf2..4a94be0c 100755 --- a/engine/server/application/PlanetServer/src/shared/ConsoleManager.cpp +++ b/engine/server/application/PlanetServer/src/shared/ConsoleManager.cpp @@ -14,7 +14,7 @@ namespace ConsoleManagerNamespace { - ConsoleCommandParser * s_consoleCommandParserRoot = NULL; + ConsoleCommandParser * s_consoleCommandParserRoot = nullptr; } using namespace ConsoleManagerNamespace; diff --git a/engine/server/application/PlanetServer/src/shared/GameServerData.cpp b/engine/server/application/PlanetServer/src/shared/GameServerData.cpp index 58a57f31..e7e91d59 100755 --- a/engine/server/application/PlanetServer/src/shared/GameServerData.cpp +++ b/engine/server/application/PlanetServer/src/shared/GameServerData.cpp @@ -27,7 +27,7 @@ GameServerData::GameServerData(GameServerConnection *connection) : // ---------------------------------------------------------------------- GameServerData::GameServerData(const GameServerData &rhs) : - m_connection(NULL), // connection pointer is not copied when we copy GameServerDatas + m_connection(nullptr), // connection pointer is not copied when we copy GameServerDatas m_objectCount(rhs.m_objectCount), m_interestObjectCount(rhs.m_interestObjectCount), m_interestCreatureObjectCount(rhs.m_interestCreatureObjectCount), @@ -38,7 +38,7 @@ GameServerData::GameServerData(const GameServerData &rhs) : // ---------------------------------------------------------------------- GameServerData::GameServerData() : - m_connection(NULL), + m_connection(nullptr), m_objectCount(0), m_interestObjectCount(0), m_interestCreatureObjectCount(0), @@ -53,7 +53,7 @@ GameServerData &GameServerData::operator=(const GameServerData &rhs) if (&rhs == this) return *this; - m_connection=NULL; // connection pointer is not copied when we copy GameServerDatas + m_connection=nullptr; // connection pointer is not copied when we copy GameServerDatas m_objectCount=rhs.m_objectCount; m_interestObjectCount=rhs.m_interestObjectCount; m_interestCreatureObjectCount=rhs.m_interestCreatureObjectCount; diff --git a/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.cpp b/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.cpp index 0fff2eb7..b2d9cf79 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.cpp +++ b/engine/server/application/PlanetServer/src/shared/PlanetProxyObject.cpp @@ -41,9 +41,9 @@ PlanetProxyObject::PlanetProxyObject (const NetworkId &objectId) : m_authoritativeServer(0), m_lastReportedServer(0), m_interestRadius(0), - m_quadtreeNode(NULL), + m_quadtreeNode(nullptr), m_authTransferTimeMs(Clock::timeMs()), - m_contents(NULL), + m_contents(nullptr), m_level(0), m_hibernating(false), m_templateCrc(0), @@ -137,9 +137,9 @@ void PlanetProxyObject::update(int x, int y, int z, NetworkId containedBy, uint3 if (ConfigPlanetServer::getEnableContentsChecking() && (m_containedBy!=containedBy)) updateContentsTracking(containedBy); - bool const firstUpdate = (m_quadtreeNode == NULL); + bool const firstUpdate = (m_quadtreeNode == nullptr); - if (m_quadtreeNode!=NULL) // if this is the first update for this object, m_quadtreeNode will be NULL because it hasn't been placed anywhere yet + if (m_quadtreeNode!=nullptr) // if this is the first update for this object, m_quadtreeNode will be nullptr because it hasn't been placed anywhere yet { removeServerStatistics(); diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp index d69a029c..a76929ce 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp @@ -102,12 +102,12 @@ using namespace PlanetServerNamespace; PlanetServer::PlanetServer() : Singleton(), MessageDispatch::Receiver(), - m_pendingCentralServerConnection(NULL), - m_centralServerConnection(NULL), - m_gameService(NULL), - m_watcherService(NULL), + m_pendingCentralServerConnection(nullptr), + m_centralServerConnection(nullptr), + m_gameService(nullptr), + m_watcherService(nullptr), m_gameServers(), - m_taskConnection(NULL), + m_taskConnection(nullptr), m_done(false), m_roundRobinGameServer(0), m_pendingServerStarts(new std::map()), @@ -117,7 +117,7 @@ PlanetServer::PlanetServer() : m_spaceMode(false), m_messagesWaitingForGameServer(), m_metricsData(0), - m_taskManagerConnection(NULL), + m_taskManagerConnection(nullptr), m_sceneTransferChunkLoads(new std::list), m_pendingCharacterSaves(new std::map), m_watchers(), @@ -433,7 +433,7 @@ void PlanetServer::receiveMessage(const MessageDispatch::Emitter & source, const GameServerConnection *gameServer=const_cast(dynamic_cast(&source)); std::set::iterator f = m_pendingGameServerDisconnects.find(gameServer); - WARNING_DEBUG_FATAL(gameServer==0,("Source was NULL or source was not a GameServerConnection.")); + WARNING_DEBUG_FATAL(gameServer==0,("Source was nullptr or source was not a GameServerConnection.")); DEBUG_REPORT_LOG(true, ("removing crashed gameserver\n")); uint32 id = gameServer->getProcessId(); GameServerMapType::iterator i=m_gameServers.find(id); @@ -688,7 +688,7 @@ void PlanetServer::receiveMessage(const MessageDispatch::Emitter & source, const UnloadedPlayerMessage msg(ri); GameServerConnection *gameServer=const_cast(dynamic_cast(&source)); - WARNING_DEBUG_FATAL(gameServer==0,("Source was NULL or source was not a GameServerConnection.")); + WARNING_DEBUG_FATAL(gameServer==0,("Source was nullptr or source was not a GameServerConnection.")); uint32 gameServerId = gameServer->getProcessId(); (*m_pendingCharacterSaves)[msg.getPlayerId()]=gameServerId; @@ -766,19 +766,19 @@ void PlanetServer::receiveMessage(const MessageDispatch::Emitter & source, const GameServerData * fromServer = PlanetServer::getGameServerData(msg.getFromProcess()); GameServerData * toServer = PlanetServer::getGameServerData(msg.getToProcess()); PlanetProxyObject * object = Scene::getInstance().findObjectByID(msg.getId()); - if (fromServer == NULL || toServer == NULL || object == NULL) + if (fromServer == nullptr || toServer == nullptr || object == nullptr) { - if (fromServer == NULL) + if (fromServer == nullptr) { WARNING(true, ("Message GameServerForceChangeAuthorityMessage: no " "from server %lu", msg.getFromProcess())); } - if (toServer == NULL) + if (toServer == nullptr) { WARNING(true, ("Message GameServerForceChangeAuthorityMessage: no " "to server %lu", msg.getToProcess())); } - if (object == NULL) + if (object == nullptr) { WARNING(true, ("Message GameServerForceChangeAuthorityMessage: no " "object for id %s", msg.getId().getValueString().c_str())); @@ -914,7 +914,7 @@ void PlanetServer::receiveMessage(const MessageDispatch::Emitter & source, const { // if it's been "awhile" since we requested to restart the GameServer, // then assume that something has gone wrong, and try the restart again - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); for (std::map >::iterator iter = m_startingGameServers->begin(); iter != m_startingGameServers->end(); ++iter) { @@ -1005,7 +1005,7 @@ GameServerConnection *PlanetServer::getGameServerConnection(uint32 serverId) if (i!=m_gameServers.end()) return (*i).second->getConnection(); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1290,7 +1290,7 @@ void PlanetServer::startGameServer(const std::set & preloadServ TaskSpawnProcess spawn("any", "SwgGameServer", options, i->second); if (m_centralServerConnection) { - (*m_startingGameServers)[cookie] = std::make_pair(options, ::time(NULL)); + (*m_startingGameServers)[cookie] = std::make_pair(options, ::time(nullptr)); ++cookie; m_centralServerConnection->send(spawn,true); DEBUG_REPORT_LOG(true, ("Sent start gameserver request for scene %s\n", ConfigPlanetServer::getSceneID())); @@ -1321,7 +1321,7 @@ GameServerData *PlanetServer::getGameServerData(uint32 serverId) const if (i!=m_gameServers.end()) return i->second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.h b/engine/server/application/PlanetServer/src/shared/PlanetServer.h index cf457544..7a75e4fc 100755 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.h +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.h @@ -146,7 +146,7 @@ inline int PlanetServer::getNumberOfGameServers() const inline void PlanetServer::onCentralConnected(CentralServerConnection *connection) { - m_pendingCentralServerConnection=NULL; + m_pendingCentralServerConnection=nullptr; m_centralServerConnection=connection; } diff --git a/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp b/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp index 37371536..15811eeb 100755 --- a/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp +++ b/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp @@ -119,7 +119,7 @@ void PreloadManager::handlePreloadList() if (PlanetServer::getInstance().getEnablePreload()) { DataTable * data = DataTableManager::getTable(ConfigPlanetServer::getPreloadDataTableName(),true); - FATAL(data==NULL,("Could not find data table %s, needed for preload",ConfigPlanetServer::getPreloadDataTableName())); + FATAL(data==nullptr,("Could not find data table %s, needed for preload",ConfigPlanetServer::getPreloadDataTableName())); int numRows = data->getNumRows(); for (int row=0; row(&source); - WARNING_DEBUG_FATAL(gameServer==0,("Source was NULL or source was not a GameServerConnection.")); + WARNING_DEBUG_FATAL(gameServer==0,("Source was nullptr or source was not a GameServerConnection.")); if (message.isType("GameConnectionClosed")) { @@ -216,7 +216,7 @@ Node *Scene::findNodeByPosition(int x, int z) /** * Given coordinates, return a const pointer to the node that encloses - * those coordinates. Will not create new nodes, so it may return NULL. + * those coordinates. Will not create new nodes, so it may return nullptr. */ const Node *Scene::findNodeByPositionConst(int x, int z) const { @@ -245,7 +245,7 @@ Node *Scene::findNodeByRoundedPosition(int x, int z) /** * Given coordinates that are known to be a node boundary, return a const pointer - * to the node. Does not create new nodes, so may return NULL. + * to the node. Does not create new nodes, so may return nullptr. */ const Node *Scene::findNodeByRoundedPositionConst(int x, int z) const { @@ -254,7 +254,7 @@ const Node *Scene::findNodeByRoundedPositionConst(int x, int z) const if (i!=m_nodeMap.end()) return (*i).second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/application/StationPlayersCollector/src/linux/main.cpp b/engine/server/application/StationPlayersCollector/src/linux/main.cpp index 7112ccde..d2abdabf 100755 --- a/engine/server/application/StationPlayersCollector/src/linux/main.cpp +++ b/engine/server/application/StationPlayersCollector/src/linux/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char ** argv) SetupSharedFile::install(false); SetupSharedNetworkMessages::install(); - SetupSharedRandom::install(static_cast(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + SetupSharedRandom::install(static_cast(time(nullptr))); //lint !e1924 !e64 // nullptr is a C-Style cast? Os::setProgramName("StationPlayersCollector"); diff --git a/engine/server/application/TaskManager/src/linux/ConsoleInput.cpp b/engine/server/application/TaskManager/src/linux/ConsoleInput.cpp index a0d4580c..756bd237 100755 --- a/engine/server/application/TaskManager/src/linux/ConsoleInput.cpp +++ b/engine/server/application/TaskManager/src/linux/ConsoleInput.cpp @@ -22,7 +22,7 @@ struct SetBufferMode SetBufferMode::SetBufferMode() { - setvbuf(stdin, NULL, _IONBF, 0); + setvbuf(stdin, nullptr, _IONBF, 0); } //----------------------------------------------------------------------- diff --git a/engine/server/application/TaskManager/src/linux/ProcessSpawner.cpp b/engine/server/application/TaskManager/src/linux/ProcessSpawner.cpp index 3996480b..e63ffd6b 100755 --- a/engine/server/application/TaskManager/src/linux/ProcessSpawner.cpp +++ b/engine/server/application/TaskManager/src/linux/ProcessSpawner.cpp @@ -92,7 +92,7 @@ void makeParameters(const std::vector & parameters, std::vector(time(NULL))); //lint !e1924 !e64 // NULL is a C-Style cast? + SetupSharedRandom::install(static_cast(time(nullptr))); //lint !e1924 !e64 // nullptr is a C-Style cast? Os::setProgramName("TaskManager"); //setup the server diff --git a/engine/server/application/TaskManager/src/shared/GameConnection.cpp b/engine/server/application/TaskManager/src/shared/GameConnection.cpp index d297a6dd..baa6adfb 100755 --- a/engine/server/application/TaskManager/src/shared/GameConnection.cpp +++ b/engine/server/application/TaskManager/src/shared/GameConnection.cpp @@ -89,7 +89,7 @@ void GameConnection::receive(const Archive::ByteStream & message) char filename[30]; snprintf(filename, sizeof(filename)-1, "/proc/%lu/cmdline", m_pid); - // format of the cmdline file is a NULL separates every + // format of the cmdline file is a nullptr separates every // parameter, so we'll have to replace the NULLs with spaces FILE *inFile = fopen(filename,"rb"); if (inFile) diff --git a/engine/server/application/TaskManager/src/shared/Locator.cpp b/engine/server/application/TaskManager/src/shared/Locator.cpp index 994d2184..2dac97f8 100755 --- a/engine/server/application/TaskManager/src/shared/Locator.cpp +++ b/engine/server/application/TaskManager/src/shared/Locator.cpp @@ -25,11 +25,11 @@ namespace LocatorNamespace float getConfigSetting(const char *section, const char *key, const float defaultValue) { const ConfigFile::Section * sec = ConfigFile::getSection(section); - if (sec == NULL) + if (sec == nullptr) return defaultValue; const ConfigFile::Key * ky = sec->findKey(key); - if (ky == NULL) + if (ky == nullptr) return defaultValue; return ky->getAsFloat(ky->getCount()-1, defaultValue); @@ -364,7 +364,7 @@ void Locator::opened(std::string const &label, ManagerConnection *newConnection) TaskManager::runSpawnRequestQueue(); } else - WARNING_STRICT_FATAL(true, ("Passed null connection to Locator::opened")); + WARNING_STRICT_FATAL(true, ("Passed nullptr connection to Locator::opened")); } // ---------------------------------------------------------------------- diff --git a/engine/server/application/TaskManager/src/shared/ManagerConnection.cpp b/engine/server/application/TaskManager/src/shared/ManagerConnection.cpp index 3720de92..08807765 100755 --- a/engine/server/application/TaskManager/src/shared/ManagerConnection.cpp +++ b/engine/server/application/TaskManager/src/shared/ManagerConnection.cpp @@ -98,7 +98,7 @@ void ManagerConnection::onReceive(const Archive::ByteStream & message) r = message.begin(); if (m.isType("SystemTimeCheck")) { - long const currentTime = static_cast(::time(NULL)); + long const currentTime = static_cast(::time(nullptr)); GenericValueTypeMessage > msg(r); if (TaskManager::getNodeLabel() == "node0") @@ -117,7 +117,7 @@ void ManagerConnection::onReceive(const Archive::ByteStream & message) else if (m.isType("TaskConnectionIdMessage")) { static long const clockDriftFatalTimePeriod = static_cast(TaskManager::getStartTime()) + ConfigTaskManager::getClockDriftFatalIntervalSeconds(); - long const currentTime = static_cast(::time(NULL)); + long const currentTime = static_cast(::time(nullptr)); TaskConnectionIdMessage t(r); WARNING_STRICT_FATAL(t.getServerType() != TaskConnectionIdMessage::TaskManager, ("ManagerConnection received wrong type identifier")); diff --git a/engine/server/application/TaskManager/src/shared/TaskManager.cpp b/engine/server/application/TaskManager/src/shared/TaskManager.cpp index 192ab1a3..04550a81 100755 --- a/engine/server/application/TaskManager/src/shared/TaskManager.cpp +++ b/engine/server/application/TaskManager/src/shared/TaskManager.cpp @@ -161,7 +161,7 @@ m_processEntries(), m_localServers(), m_remoteServers(), m_nodeLabel(), -m_startTime(::time(NULL)), +m_startTime(::time(nullptr)), m_nodeList(), m_nodeNumber(-1), m_nodeToConnectToList(), @@ -362,7 +362,7 @@ void TaskManager::processRcFile() void TaskManager::setupNodeList() { char buffer[64]; - const char* result = NULL; + const char* result = nullptr; int nodeIndex = 0; bool found = true; @@ -375,7 +375,7 @@ void TaskManager::setupNodeList() { found = false; sprintf(buffer, "node%d", nodeIndex); - result = ConfigFile::getKeyString("TaskManager", buffer, NULL); + result = ConfigFile::getKeyString("TaskManager", buffer, nullptr); if (result) { NodeEntry n(result, buffer, nodeIndex); @@ -967,8 +967,8 @@ void TaskManager::update() // of slave TaskManager that has disconnected but has not reconnected, // so that an alert can be made in SOEMon so ops can see it and restart // the disconnected TaskManager - static time_t timeSystemTimeCheck = ::time(NULL) + ConfigTaskManager::getSystemTimeCheckIntervalSeconds(); - time_t const timeNow = ::time(NULL); + static time_t timeSystemTimeCheck = ::time(nullptr) + ConfigTaskManager::getSystemTimeCheckIntervalSeconds(); + time_t const timeNow = ::time(nullptr); if (timeSystemTimeCheck <= timeNow) { if (getNodeLabel() != "node0") diff --git a/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp b/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp index 6d456516..ca5d0845 100755 --- a/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp +++ b/engine/server/application/TransferServer/src/shared/CTSAPIClient.cpp @@ -147,7 +147,7 @@ void CTSAPIClient::onRequestMove(const unsigned server_track, const char *langua { LOG("CTSAPI", ("Received a transfer request for station ID %d, but a transfer for that id is already in progress", uid)); const unsigned int result = static_cast(CTService::CT_GAMERESULT_SOFTERROR); - IGNORE_RETURN(replyMove(server_track, result, NULL, NULL)); + IGNORE_RETURN(replyMove(server_track, result, nullptr, nullptr)); } } @@ -165,7 +165,7 @@ void CTSAPIClient::onRequestTransferAccount(const unsigned server_track, const u { LOG("CTSAPI", ("Received a transfer request for station ID %d, but a transfer for that id is already in progress", uid)); const unsigned int result = static_cast(CTService::CT_GAMERESULT_SOFTERROR); - IGNORE_RETURN(replyTransferAccount(server_track, result, NULL, NULL)); + IGNORE_RETURN(replyTransferAccount(server_track, result, nullptr, nullptr)); } } @@ -197,12 +197,12 @@ void CTSAPIClient::onRequestServerList(const unsigned server_track, const char * if(! servers.empty()) { const unsigned int result = static_cast(CTService::CT_RESULT_SUCCESS); - IGNORE_RETURN(replyServerList(server_track, result, servers.size(), &servers[0], NULL)); + IGNORE_RETURN(replyServerList(server_track, result, servers.size(), &servers[0], nullptr)); } else { const unsigned int result = static_cast(CTService::CT_RESULT_FAILURE); - IGNORE_RETURN(replyServerList(server_track, result, servers.size(), NULL, NULL)); + IGNORE_RETURN(replyServerList(server_track, result, servers.size(), nullptr, nullptr)); } } @@ -226,12 +226,12 @@ void CTSAPIClient::onRequestDestinationServerList(const unsigned server_track, c if(! servers.empty()) { const unsigned int result = static_cast(CTService::CT_RESULT_SUCCESS); - IGNORE_RETURN(replyDestinationServerList(server_track, result, servers.size(), &servers[0], NULL)); + IGNORE_RETURN(replyDestinationServerList(server_track, result, servers.size(), &servers[0], nullptr)); } else { const unsigned int result = static_cast(CTService::CT_RESULT_FAILURE); - IGNORE_RETURN(replyDestinationServerList(server_track, result, servers.size(), NULL, NULL)); + IGNORE_RETURN(replyDestinationServerList(server_track, result, servers.size(), nullptr, nullptr)); } } @@ -260,7 +260,7 @@ void CTSAPIClient::moveStart(unsigned int stationId, unsigned int track, const C std::map::iterator f = s_completedTransfers.find(track); if(f != s_completedTransfers.end()) { - IGNORE_RETURN(replyMove(track, f->second, NULL, NULL)); + IGNORE_RETURN(replyMove(track, f->second, nullptr, nullptr)); } else { @@ -284,7 +284,7 @@ void CTSAPIClient::lostCentralServerConnection(const CentralServerConnection * c { if(i->second.m_sourceCentralServerConnection == centralServerConnection || i->second.m_destinationCentralServerConnection == centralServerConnection) { - IGNORE_RETURN(replyMove(i->second.m_track, result, NULL, NULL)); + IGNORE_RETURN(replyMove(i->second.m_track, result, nullptr, nullptr)); s_activeTransfers.erase(i++); } else diff --git a/engine/server/application/TransferServer/src/shared/ConsoleManager.cpp b/engine/server/application/TransferServer/src/shared/ConsoleManager.cpp index c0208e0d..1a04dc38 100755 --- a/engine/server/application/TransferServer/src/shared/ConsoleManager.cpp +++ b/engine/server/application/TransferServer/src/shared/ConsoleManager.cpp @@ -14,7 +14,7 @@ namespace ConsoleManagerNamespace { - ConsoleCommandParser * s_consoleCommandParserRoot = NULL; + ConsoleCommandParser * s_consoleCommandParserRoot = nullptr; } using namespace ConsoleManagerNamespace; diff --git a/engine/server/application/TransferServer/src/shared/TransferServer.cpp b/engine/server/application/TransferServer/src/shared/TransferServer.cpp index 07334ab4..6533fd3e 100755 --- a/engine/server/application/TransferServer/src/shared/TransferServer.cpp +++ b/engine/server/application/TransferServer/src/shared/TransferServer.cpp @@ -150,10 +150,10 @@ namespace TransferServerNamespace if(s_apiClient) { const std::string resultString = resultToString(resultCode); - LOG("CustomerService", ("CharacterTransfer: transactionId=%u replyMove(%u, %s, NULL, NULL)", reply.getTransactionId(), reply.getTrack(), resultString.c_str())); + LOG("CustomerService", ("CharacterTransfer: transactionId=%u replyMove(%u, %s, nullptr, nullptr)", reply.getTransactionId(), reply.getTrack(), resultString.c_str())); const unsigned int result = static_cast(resultCode); s_apiClient->moveComplete(reply.getSourceStationId(), reply.getTrack(), result); - IGNORE_RETURN(s_apiClient->replyMove(reply.getTrack(), result, Unicode::narrowToWide(resultString).c_str(), NULL)); + IGNORE_RETURN(s_apiClient->replyMove(reply.getTrack(), result, Unicode::narrowToWide(resultString).c_str(), nullptr)); } } @@ -282,7 +282,7 @@ void TransferServer::requestCharacterList(unsigned int track, unsigned int stati { const unsigned int result = static_cast(CTService::CT_RESULT_FAILURE); - IGNORE_RETURN(s_apiClient->replyCharacterList(track, result, 0, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyCharacterList(track, result, 0, nullptr, nullptr)); s_apiClient->moveComplete(stationId, track, result); } } @@ -410,7 +410,7 @@ void TransferServer::requestTransferAccount(unsigned int track, unsigned int sou if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); - IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, NULL, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, nullptr, nullptr, nullptr)); s_apiClient->moveComplete(sourceStationId, track, result); } @@ -430,7 +430,7 @@ void TransferServer::requestTransferAccount(unsigned int track, unsigned int sou if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_SERVER_IS_DOWN); - IGNORE_RETURN(s_apiClient->replyTransferAccount(track, result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(track, result, nullptr, nullptr)); s_apiClient->moveComplete(sourceStationId, track, result); } @@ -442,12 +442,12 @@ void TransferServer::requestTransferAccount(unsigned int track, unsigned int sou if(destinationStationId == 0 || sourceStationId == 0) { - LOG("CustomerService", ("CharacterTransfer: Account move request made with a null destination station id: or source station id: %lu\n", sourceStationId)); + LOG("CustomerService", ("CharacterTransfer: Account move request made with a nullptr destination station id: or source station id: %lu\n", sourceStationId)); if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); - IGNORE_RETURN(s_apiClient->replyTransferAccount(track, result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(track, result, nullptr, nullptr)); s_apiClient->moveComplete(sourceStationId, track, result); } @@ -488,7 +488,7 @@ void TransferServer::requestMoveValidation(unsigned int track, unsigned int sour if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); - IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, NULL, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, nullptr, nullptr, nullptr)); s_apiClient->moveComplete(sourceStationId, track, result); } } @@ -516,7 +516,7 @@ void TransferServer::requestMoveValidation(unsigned int track, unsigned int sour if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_SERVER_IS_DOWN); - IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, NULL, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyValidateMove(track, result, nullptr, nullptr, nullptr)); s_apiClient->moveComplete(sourceStationId, track, result); } } @@ -651,8 +651,8 @@ void TransferServer::replyCharacterList(const TransferReplyCharacterList & reply result = static_cast(CTService::CT_RESULT_FAILURE); s_apiClient->moveComplete(reply.getStationId(), reply.getTrack(), result); } - LOG("CTSAPI", ("invoking CTServiceAPI::replyCharacterList(%d, %d, %d, characters, NULL)", reply.getTrack(), result, chars.size())); - IGNORE_RETURN(s_apiClient->replyCharacterList(reply.getTrack(), result, reply.getAvatarList().size(), characters, NULL)); + LOG("CTSAPI", ("invoking CTServiceAPI::replyCharacterList(%d, %d, %d, characters, nullptr)", reply.getTrack(), result, chars.size())); + IGNORE_RETURN(s_apiClient->replyCharacterList(reply.getTrack(), result, reply.getAvatarList().size(), characters, nullptr)); } // else use another interface if available } @@ -675,7 +675,7 @@ void TransferServer::replyValidateMove(const TransferCharacterData & reply) { LOG("CustomerService", ("CharacterTransfer: replyValidateMove passed name validation for %s", reply.toString().c_str())); } - IGNORE_RETURN(s_apiClient->replyValidateMove(reply.getTrack(), result, NULL, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyValidateMove(reply.getTrack(), result, nullptr, nullptr, nullptr)); s_apiClient->moveComplete(reply.getSourceStationId(), reply.getTrack(), result); } } @@ -736,7 +736,7 @@ void TransferServer::replyTransferAccountSuccess(const TransferAccountData & rep LOG("CustomerService", ("CharacterTransfer: Could not transfer chat avatars for character %s on cluster %s from %lu to %lu: central connection does not exist in transferserver", i->second.c_str(), i->first.c_str(), reply.getSourceStationId(), reply.getDestinationStationId())); const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); s_apiClient->moveComplete(reply.getSourceStationId(), reply.getTrack(), result); - IGNORE_RETURN(s_apiClient->replyTransferAccount(reply.getTrack(), result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(reply.getTrack(), result, nullptr, nullptr)); } } } @@ -748,7 +748,7 @@ void TransferServer::replyTransferAccountSuccess(const TransferAccountData & rep if(s_apiClient) { const unsigned int result = static_cast(CTService::CT_GAMERESULT_SUCCESS); - IGNORE_RETURN(s_apiClient->replyTransferAccount(reply.getTrack(), result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(reply.getTrack(), result, nullptr, nullptr)); s_apiClient->moveComplete(reply.getSourceStationId(), reply.getTrack(), result); } } @@ -808,7 +808,7 @@ void TransferServer::failedToTransferAccountNoCentralConnection(const TransferAc LOG("CustomerService", ("CharacterTransfer: Transfer failed: Could not connect to central server to update game database. Sending HARD ERROR to CTS API. %s", failed.toString().c_str())); const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); s_apiClient->moveComplete(failed.getSourceStationId(), failed.getTrack(), result); - IGNORE_RETURN(s_apiClient->replyTransferAccount(failed.getTrack(), result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(failed.getTrack(), result, nullptr, nullptr)); } } @@ -821,7 +821,7 @@ void TransferServer::failedToTransferAccountDestinationNotEmpty (const TransferA LOG("CustomerService", ("CharacterTransfer: Transfer failed: Destination stationId has avatars. Sending HARD ERROR to CTS API. %s", failed.toString().c_str())); const unsigned int result = static_cast(CTService::CT_GAMERESULT_HARDERROR); s_apiClient->moveComplete(failed.getSourceStationId(), failed.getTrack(), result); - IGNORE_RETURN(s_apiClient->replyTransferAccount(failed.getTrack(), result, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyTransferAccount(failed.getTrack(), result, nullptr, nullptr)); } } @@ -860,7 +860,7 @@ void TransferServer::failedToValidateTransfer(const TransferReplyMoveValidation { const unsigned int result = ((reply.getResult() == TransferReplyMoveValidation::TRMVR_cannot_create_regular_character) ? static_cast(CTService::CT_GAMERESULT_MAX_CHAR_ON_DEST_SERVER) : static_cast(CTService::CT_GAMERESULT_SERVER_IS_DOWN)); - IGNORE_RETURN(s_apiClient->replyValidateMove(reply.getTrack(), result, NULL, NULL, NULL)); + IGNORE_RETURN(s_apiClient->replyValidateMove(reply.getTrack(), result, nullptr, nullptr, nullptr)); s_apiClient->moveComplete(reply.getSourceStationId(), reply.getTrack(), result); // close pseudoclientconnections diff --git a/engine/server/library/serverDatabase/src/shared/ConsoleManager.cpp b/engine/server/library/serverDatabase/src/shared/ConsoleManager.cpp index 4e24a67e..70f8342d 100755 --- a/engine/server/library/serverDatabase/src/shared/ConsoleManager.cpp +++ b/engine/server/library/serverDatabase/src/shared/ConsoleManager.cpp @@ -14,7 +14,7 @@ namespace ConsoleManagerNamespace { - ConsoleCommandParser * s_consoleCommandParserRoot = NULL; + ConsoleCommandParser * s_consoleCommandParserRoot = nullptr; } using namespace ConsoleManagerNamespace; diff --git a/engine/server/library/serverDatabase/src/shared/DataLookup.cpp b/engine/server/library/serverDatabase/src/shared/DataLookup.cpp index dd42952a..33fef53a 100755 --- a/engine/server/library/serverDatabase/src/shared/DataLookup.cpp +++ b/engine/server/library/serverDatabase/src/shared/DataLookup.cpp @@ -30,7 +30,7 @@ //----------------------------------------------------------------------- -DataLookup *DataLookup::ms_theInstance = NULL; +DataLookup *DataLookup::ms_theInstance = nullptr; //----------------------------------------------------------------------- @@ -524,7 +524,7 @@ void DataLookup::deleteReservationList(uint32 stationId) reservationList * rl = rlIter->second; if (!rl) { - WARNING_STRICT_FATAL(true, ("Reservation list for stationID %lu is NULL", stationId)); + WARNING_STRICT_FATAL(true, ("Reservation list for stationID %lu is nullptr", stationId)); return; } reservationList::iterator i; diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 1c0eca40..fb5a56fe 100755 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -46,7 +46,7 @@ // ---------------------------------------------------------------------- -DatabaseProcess *DatabaseProcess::ms_theInstance = NULL; +DatabaseProcess *DatabaseProcess::ms_theInstance = nullptr; // ---------------------------------------------------------------------- @@ -627,7 +627,7 @@ void DatabaseProcess::sendToCommoditiesServer(GameNetworkMessage const &message, commoditiesConnection->send(message,reliable); } else - DEBUG_REPORT_LOG(true, ("commoditiesConnection is NULL\n")); + DEBUG_REPORT_LOG(true, ("commoditiesConnection is nullptr\n")); } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.cpp b/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.cpp index e1c3d149..c205c79d 100755 --- a/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.cpp +++ b/engine/server/library/serverDatabase/src/shared/ImmediateDeleteCustomPersistStep.cpp @@ -23,7 +23,7 @@ ImmediateDeleteCustomPersistStep::ImmediateDeleteCustomPersistStep() : ImmediateDeleteCustomPersistStep::~ImmediateDeleteCustomPersistStep() { delete m_objects; - m_objects = NULL; + m_objects = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverDatabase/src/shared/LazyDeleter.cpp b/engine/server/library/serverDatabase/src/shared/LazyDeleter.cpp index 16baa713..ecdc4260 100755 --- a/engine/server/library/serverDatabase/src/shared/LazyDeleter.cpp +++ b/engine/server/library/serverDatabase/src/shared/LazyDeleter.cpp @@ -27,7 +27,7 @@ // ====================================================================== -LazyDeleter * LazyDeleter::ms_instance=NULL; +LazyDeleter * LazyDeleter::ms_instance=nullptr; // ====================================================================== @@ -80,13 +80,13 @@ void LazyDeleter::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- LazyDeleter::LazyDeleter() : - m_workerThread(NULL), // Avoid starting the worker thread until the other member variables are initialized + m_workerThread(nullptr), // Avoid starting the worker thread until the other member variables are initialized m_incomingObjects(new std::vector), m_objectsToDelete(new std::deque), m_objectListLock(new Mutex), @@ -113,11 +113,11 @@ LazyDeleter::~LazyDeleter() delete m_objectsToDelete; delete m_objectListLock; - m_workerThread = NULL; - m_incomingObjects = NULL; - m_objectsToDelete = NULL; - m_objectListLock = NULL; - m_session = NULL; + m_workerThread = nullptr; + m_incomingObjects = nullptr; + m_objectsToDelete = nullptr; + m_objectListLock = nullptr; + m_session = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverDatabase/src/shared/Loader.cpp b/engine/server/library/serverDatabase/src/shared/Loader.cpp index fb4b5a6c..3f863d80 100755 --- a/engine/server/library/serverDatabase/src/shared/Loader.cpp +++ b/engine/server/library/serverDatabase/src/shared/Loader.cpp @@ -55,7 +55,7 @@ // ====================================================================== -Loader *Loader::ms_instance = NULL; +Loader *Loader::ms_instance = nullptr; // ====================================================================== @@ -72,7 +72,7 @@ void Loader::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- @@ -442,7 +442,7 @@ void Loader::receiveMessage(const MessageDispatch::Emitter & source, const Messa { Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); ValidateCharacterForLoginMessage msg(ri); - verifyCharacter(msg.getSuid(), msg.getCharacterId(), NULL); + verifyCharacter(msg.getSuid(), msg.getCharacterId(), nullptr); } else if(message.isType("TransferGetLoginLocationData")) { @@ -647,7 +647,7 @@ void Loader::checkVersionNumber(int expectedVersion, bool fatalOnMismatch) void Loader::requestChunk(uint32 processId,int nodeX, int nodeZ, const std::string &sceneId) { ObjectLocator * const regularLocator=new ChunkLocator(nodeX, nodeZ, sceneId, processId, true); - ObjectLocator * goldLocator=NULL; + ObjectLocator * goldLocator=nullptr; if (ConfigServerDatabase::getEnableGoldDatabase()) goldLocator = new ChunkLocator(nodeX, nodeZ, sceneId, processId, false); addLocatorsForServer(processId, regularLocator, goldLocator); @@ -671,7 +671,7 @@ void Loader::requestCharacter(const NetworkId &characterId, uint32 gameServerId) i=m_multipleLoginLock.find(characterId); if (i==m_multipleLoginLock.end()) { - addLocatorsForServer(gameServerId, new CharacterLocator(characterId), NULL); + addLocatorsForServer(gameServerId, new CharacterLocator(characterId), nullptr); DEBUG_REPORT_LOG(true,("Adding multipleLoginLock for %s\n",characterId.getValueString().c_str())); m_multipleLoginLock[characterId] = gameServerId; @@ -684,7 +684,7 @@ void Loader::requestCharacter(const NetworkId &characterId, uint32 gameServerId) } } else - addLocatorsForServer(gameServerId, new CharacterLocator(characterId), NULL); + addLocatorsForServer(gameServerId, new CharacterLocator(characterId), nullptr); } // ---------------------------------------------------------------------- @@ -692,7 +692,7 @@ void Loader::requestCharacter(const NetworkId &characterId, uint32 gameServerId) void Loader::loadContainedObject(const NetworkId &containerId, const NetworkId &objectId, uint32 gameServerId) { LOG("AuctionRetrieval", ("Loader::received loadContainedObject for loading object %s for retrieval", objectId.getValueString().c_str())); - addLocatorsForServer(gameServerId, new ContainedObjectLocator(containerId,objectId), NULL); + addLocatorsForServer(gameServerId, new ContainedObjectLocator(containerId,objectId), nullptr); } @@ -700,7 +700,7 @@ void Loader::loadContainedObject(const NetworkId &containerId, const NetworkId & void Loader::loadContents(const NetworkId &containerId, uint32 gameServerId) { - addLocatorsForServer(gameServerId, new ContentsLocator(containerId), NULL); + addLocatorsForServer(gameServerId, new ContentsLocator(containerId), nullptr); } // ---------------------------------------------------------------------- @@ -820,7 +820,7 @@ void Loader::removeLoadLock(const NetworkId &characterId) if (i->second!=0) { DEBUG_REPORT_LOG(true,("Now handling delayed login request for character %s\n",characterId.getValueString().c_str())); - addLocatorsForServer(i->second, new CharacterLocator(characterId), NULL); + addLocatorsForServer(i->second, new CharacterLocator(characterId), nullptr); } m_loadLock.erase(i); diff --git a/engine/server/library/serverDatabase/src/shared/MessageToManager.cpp b/engine/server/library/serverDatabase/src/shared/MessageToManager.cpp index 6773ccca..d47dc773 100755 --- a/engine/server/library/serverDatabase/src/shared/MessageToManager.cpp +++ b/engine/server/library/serverDatabase/src/shared/MessageToManager.cpp @@ -16,7 +16,7 @@ // ====================================================================== -MessageToManager *MessageToManager::ms_instance=NULL; +MessageToManager *MessageToManager::ms_instance=nullptr; // ====================================================================== @@ -34,7 +34,7 @@ void MessageToManager::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- @@ -51,7 +51,7 @@ MessageToManager::~MessageToManager() for (MessagesByObjectType::iterator i=m_messagesByObject.begin(); i!=m_messagesByObject.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -71,7 +71,7 @@ void MessageToManager::handleMessageTo(const MessageToPayload &data) { DEBUG_WARNING(true,("Received message %s twice.",data.getMessageId().getValueString().c_str())); delete i->second; - i->second = NULL; + i->second = nullptr; } m_messagesByObject[theKey]=new MessageToPayload(data); @@ -127,7 +127,7 @@ void MessageToManager::removeMessage(const MessageToId &messageId) if (j!=m_messagesByObject.end()) { delete j->second; - j->second=NULL; + j->second=nullptr; m_messagesByObject.erase(j); } m_messageToObjectMap.erase(i); diff --git a/engine/server/library/serverDatabase/src/shared/Persister.cpp b/engine/server/library/serverDatabase/src/shared/Persister.cpp index 89c299ff..bf178daa 100755 --- a/engine/server/library/serverDatabase/src/shared/Persister.cpp +++ b/engine/server/library/serverDatabase/src/shared/Persister.cpp @@ -70,7 +70,7 @@ // ====================================================================== -Persister *Persister::ms_instance=NULL; +Persister *Persister::ms_instance=nullptr; // ====================================================================== @@ -88,7 +88,7 @@ void Persister::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } //----------------------------------------------------------------------- @@ -108,9 +108,9 @@ Persister::Persister() : m_charactersToDeleteThisSaveCycle(new CharactersToDeleteType), m_charactersToDeleteNextSaveCycle(new CharactersToDeleteType), m_timeSinceLastSave(0), - m_messageSnapshot(NULL), - m_commoditiesSnapshot(NULL), - m_arbitraryGameDataSnapshot(NULL), + m_messageSnapshot(nullptr), + m_commoditiesSnapshot(nullptr), + m_arbitraryGameDataSnapshot(nullptr), m_saveStartTime(0), m_totalSaveTime(0), m_maxSaveTime(0), @@ -181,15 +181,15 @@ Persister::~Persister() m_currentSnapshots.clear(); m_newObjectSnapshots.clear(); m_objectSnapshotMap.clear(); - m_messageSnapshot = NULL; - m_commoditiesSnapshot = NULL; - m_arbitraryGameDataSnapshot = NULL; + m_messageSnapshot = nullptr; + m_commoditiesSnapshot = nullptr; + m_arbitraryGameDataSnapshot = nullptr; delete m_charactersToDeleteThisSaveCycle; - m_charactersToDeleteThisSaveCycle = NULL; + m_charactersToDeleteThisSaveCycle = nullptr; delete m_charactersToDeleteNextSaveCycle; - m_charactersToDeleteNextSaveCycle = NULL; + m_charactersToDeleteNextSaveCycle = nullptr; } // ---------------------------------------------------------------------- @@ -283,7 +283,7 @@ void Persister::onFrameBarrierReached() /** * Moves the current & new object snapshots onto the queue to be saved. * - * Does nothing if these snapshots are null. + * Does nothing if these snapshots are nullptr. */ void Persister::startSave(void) @@ -351,9 +351,9 @@ void Persister::startSave(void) m_currentSnapshots.clear(); m_newObjectSnapshots.clear(); m_objectSnapshotMap.clear(); - m_messageSnapshot = NULL; - m_commoditiesSnapshot = NULL; - m_arbitraryGameDataSnapshot = NULL; + m_messageSnapshot = nullptr; + m_commoditiesSnapshot = nullptr; + m_arbitraryGameDataSnapshot = nullptr; // prepare the list of characters to delete during the next save cycle if (m_charactersToDeleteNextSaveCycle && m_charactersToDeleteThisSaveCycle) @@ -515,7 +515,7 @@ void Persister::newObject(uint32 serverId, const NetworkId &objectId, int templa return; } - Snapshot *snap=NULL; + Snapshot *snap=nullptr; PendingCharactersType::iterator chardata=m_pendingCharacters.find(objectId); if (chardata!=m_pendingCharacters.end()) @@ -543,7 +543,7 @@ void Persister::newObject(uint32 serverId, const NetworkId &objectId, int templa else { // Add the object to the appropriate snapshot - snap=NULL; + snap=nullptr; { ObjectSnapshotMap::const_iterator j=m_objectSnapshotMap.find(container); if (j!=m_objectSnapshotMap.end() && j->second->getMode() == DB::ModeQuery::mode_INSERT) @@ -728,7 +728,7 @@ void Persister::receiveMessage(const MessageDispatch::Emitter & source, const Me Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); RenameCharacterMessageEx msg(ri); - renameCharacter(sourceGameServer, static_cast(msg.getRenameCharacterMessageSource()), msg.getStationId(), msg.getCharacterId(), msg.getNewName(), msg.getOldName(), msg.getLastNameChangeOnly(), msg.getRequestedBy(), NULL); + renameCharacter(sourceGameServer, static_cast(msg.getRenameCharacterMessageSource()), msg.getStationId(), msg.getCharacterId(), msg.getNewName(), msg.getOldName(), msg.getLastNameChangeOnly(), msg.getRequestedBy(), nullptr); } else if (message.isType("UnloadedPlayerMessage")) { diff --git a/engine/server/library/serverDatabase/src/shared/TaskGetBiography.cpp b/engine/server/library/serverDatabase/src/shared/TaskGetBiography.cpp index 9c6cb243..96b976fb 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskGetBiography.cpp +++ b/engine/server/library/serverDatabase/src/shared/TaskGetBiography.cpp @@ -19,7 +19,7 @@ TaskGetBiography::TaskGetBiography(const NetworkId &owner, uint32 requestingProcess) : m_owner(owner), m_requestingProcess(requestingProcess), - m_bio(NULL) + m_bio(nullptr) { } @@ -28,7 +28,7 @@ TaskGetBiography::TaskGetBiography(const NetworkId &owner, uint32 requestingProc TaskGetBiography::~TaskGetBiography() { delete m_bio; - m_bio=NULL; + m_bio=nullptr; } // ---------------------------------------------------------------------- @@ -53,7 +53,7 @@ bool TaskGetBiography::process(DB::Session *session) void TaskGetBiography::onComplete() { - WARNING_STRICT_FATAL(!m_bio,("In TaskGetBiography::onComplete, but m_bio is NULL\n")); + WARNING_STRICT_FATAL(!m_bio,("In TaskGetBiography::onComplete, but m_bio is nullptr\n")); if (m_bio) { BiographyMessage msg(m_owner, *m_bio); diff --git a/engine/server/library/serverDatabase/src/shared/TaskSetBiography.cpp b/engine/server/library/serverDatabase/src/shared/TaskSetBiography.cpp index d8a98958..501cfe48 100755 --- a/engine/server/library/serverDatabase/src/shared/TaskSetBiography.cpp +++ b/engine/server/library/serverDatabase/src/shared/TaskSetBiography.cpp @@ -24,7 +24,7 @@ TaskSetBiography::TaskSetBiography(const NetworkId &owner, const Unicode::String TaskSetBiography::~TaskSetBiography() { delete m_bio; - m_bio=NULL; + m_bio=nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp index 0b0a552d..e06b0d40 100755 --- a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp @@ -106,7 +106,7 @@ bool AggroListPropertyNamespace::isIncapacitated(TangibleObject const & target) { CreatureObject const * const targetCreatureObject = target.asCreatureObject(); - return (targetCreatureObject != NULL) ? targetCreatureObject->isIncapacitated() : false; + return (targetCreatureObject != nullptr) ? targetCreatureObject->isIncapacitated() : false; } // ---------------------------------------------------------------------- @@ -114,7 +114,7 @@ bool AggroListPropertyNamespace::isDead(TangibleObject const & target) { CreatureObject const * const targetCreatureObject = target.asCreatureObject(); - return (targetCreatureObject != NULL) ? targetCreatureObject->isDead() : false; + return (targetCreatureObject != nullptr) ? targetCreatureObject->isDead() : false; } // ---------------------------------------------------------------------- @@ -122,7 +122,7 @@ bool AggroListPropertyNamespace::isInvulnerable(TangibleObject const & target) { CreatureObject const * const targetCreatureObject = target.asCreatureObject(); - return (targetCreatureObject != NULL) ? targetCreatureObject->isInvulnerable() : false; + return (targetCreatureObject != nullptr) ? targetCreatureObject->isInvulnerable() : false; } // ---------------------------------------------------------------------- @@ -138,7 +138,7 @@ bool AggroListPropertyNamespace::isFeigningDeath(TangibleObject const & target) { CreatureObject const * const targetCreatureObject = target.asCreatureObject(); - return (targetCreatureObject != NULL) ? targetCreatureObject->getState(States::FeignDeath) : false; + return (targetCreatureObject != nullptr) ? targetCreatureObject->getState(States::FeignDeath) : false; } // ---------------------------------------------------------------------- @@ -146,7 +146,7 @@ bool AggroListPropertyNamespace::isInPlayerBuilding(TangibleObject const & targe { ServerObject const * const topMostServerObject = ServerObject::asServerObject(ContainerInterface::getTopmostContainer(target)); - return (topMostServerObject != NULL) ? (topMostServerObject->getGameObjectType() == SharedObjectTemplate::GOT_building_player) : false; + return (topMostServerObject != nullptr) ? (topMostServerObject->getGameObjectType() == SharedObjectTemplate::GOT_building_player) : false; } // ---------------------------------------------------------------------- @@ -154,7 +154,7 @@ bool AggroListPropertyNamespace::isAggroImmune(TangibleObject const & target) { PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(target.asCreatureObject()); - return (playerObject != NULL) ? playerObject->isAggroImmune() : false; + return (playerObject != nullptr) ? playerObject->isAggroImmune() : false; } // ====================================================================== @@ -212,7 +212,7 @@ void AggroListProperty::alter() // First, list things that invalidate this target in the aggro list // Second, list the things that promote the target to the hate list - if (target.getObject() == NULL) + if (target.getObject() == nullptr) { purgeList.push_back(iterTargetList); } @@ -315,7 +315,7 @@ TangibleObject & AggroListProperty::getTangibleOwner() AggroListProperty * AggroListProperty::getAggroListProperty(Object & object) { Property * const property = object.getProperty(getClassPropertyId()); - AggroListProperty * const aggroProperty = (property != NULL) ? static_cast(property) : NULL; + AggroListProperty * const aggroProperty = (property != nullptr) ? static_cast(property) : nullptr; return aggroProperty; } diff --git a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp index c3e95004..328d9540 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp @@ -45,7 +45,7 @@ void AiCombatPulseQueue::remove() void AiCombatPulseQueue::schedule(TangibleObject * const object, int waitTimeMs, unsigned long currentFrameTimeMs) { - if (object == NULL) + if (object == nullptr) return; unsigned long desiredTime = Clock::getFrameStartTimeMs() + currentFrameTimeMs + waitTimeMs; @@ -97,7 +97,7 @@ void AiCombatPulseQueue::alter(real time) TangibleObject * const object = (j->second)->first; - if (object != NULL && object->isInCombat()) + if (object != nullptr && object->isInCombat()) { NetworkId const & id = object->getNetworkId(); @@ -107,7 +107,7 @@ void AiCombatPulseQueue::alter(real time) GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(object); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams scriptParams; IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_AI_COMBAT_FRAME, scriptParams)); diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp index cf2cb505..c27828d6 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp @@ -136,9 +136,9 @@ void AiCreatureCombatProfileNamespace::loadCombatProfileTable(DataTable const & for (int i = 0; i < serverObjectCount; ++i) { ServerObject * const serverObject = ServerWorld::getObject(i); - CreatureObject * const creatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL; + CreatureObject * const creatureObject = (serverObject != nullptr) ? serverObject->asCreatureObject() : nullptr; - if ( (creatureObject != NULL) + if ( (creatureObject != nullptr) && !creatureObject->isPlayerControlled()) { creatureObject->makeDead(NetworkId::cms_invalid, NetworkId::cms_invalid); @@ -228,7 +228,7 @@ void AiCreatureCombatProfileNamespace::grantActions(CreatureObject & owner, AiCr // ---------------------------------------------------------------------- AiCreatureCombatProfile::AiCreatureCombatProfile() - : m_profileId(NULL) + : m_profileId(nullptr) , m_singleUseActionList() , m_delayRepeatActionList() , m_instantRepeatActionList() @@ -247,7 +247,7 @@ void AiCreatureCombatProfile::install() bool const openIfNotFound = true; DataTable * const dataTable = DataTableManager::getTable(s_combatProfileTable, openIfNotFound); - if (dataTable != NULL) + if (dataTable != nullptr) { #ifdef _DEBUG DataTableManager::addReloadCallback(s_combatProfileTable, &loadCombatProfileTable); @@ -267,7 +267,7 @@ void AiCreatureCombatProfile::install() // ---------------------------------------------------------------------- AiCreatureCombatProfile const * AiCreatureCombatProfile::getCombatProfile(CrcString const & profileName) { - AiCreatureCombatProfile const * result = NULL; + AiCreatureCombatProfile const * result = nullptr; CombatProfileMap::const_iterator iterCombatProfileMap = s_combatProfileMap.find(PersistentCrcString(profileName)); if (iterCombatProfileMap != s_combatProfileMap.end()) diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp index 034f9980..3d90a5f7 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp @@ -46,7 +46,7 @@ namespace AiCreatureDataNamespace CreatureDataMap s_creatureDataMap; WeaponDataMap s_weaponDataMap; - AiCreatureData const * s_defaultCreatureData = NULL; + AiCreatureData const * s_defaultCreatureData = nullptr; int s_creatureErrorCount = 0; int s_weaponErrorCount = 0; @@ -154,7 +154,7 @@ void AiCreatureDataNamespace::verifySecondaryWeapon(CrcString const & creatureNa void AiCreatureDataNamespace::verifyPrimarySpecials(CrcString const & creatureName, CrcString & primarySpecials) { if ( !primarySpecials.isEmpty() - && (AiCreatureCombatProfile::getCombatProfile(primarySpecials) == NULL)) + && (AiCreatureCombatProfile::getCombatProfile(primarySpecials) == nullptr)) { ++s_creatureErrorCount; WARNING(true, ("AiCreatureData::verifyPrimarySpecials() Creature(%s) has invalid primary_weapon_specials(%s)", creatureName.getString(), primarySpecials.getString())); @@ -165,7 +165,7 @@ void AiCreatureDataNamespace::verifyPrimarySpecials(CrcString const & creatureNa void AiCreatureDataNamespace::verifySecondarySpecials(CrcString const & creatureName, CrcString & secondarySpecials) { if ( !secondarySpecials.isEmpty() - && (AiCreatureCombatProfile::getCombatProfile(secondarySpecials) == NULL)) + && (AiCreatureCombatProfile::getCombatProfile(secondarySpecials) == nullptr)) { ++s_creatureErrorCount; WARNING(true, ("AiCreatureData::verifySecondarySpecials() Creature(%s) has invalid secondary_weapon_specials(%s)", creatureName.getString(), secondarySpecials.getString())); @@ -320,7 +320,7 @@ void AiCreatureDataNamespace::loadWeaponColumn(WeaponList & weaponList, std::str // ---------------------------------------------------------------------- AiCreatureData::AiCreatureData() - : m_name(NULL) + : m_name(nullptr) , m_movementSpeedPercent(1.0f) , m_primaryWeapon() , m_secondaryWeapon() @@ -348,7 +348,7 @@ void AiCreatureData::install() bool const openIfNotFound = true; DataTable * const dataTable = DataTableManager::getTable(s_weaponDataTable, openIfNotFound); - if (dataTable != NULL) + if (dataTable != nullptr) { DataTableManager::addReloadCallback(s_weaponDataTable, &loadWeaponData); loadWeaponData(*dataTable); @@ -366,7 +366,7 @@ void AiCreatureData::install() bool const openIfNotFound = true; DataTable * const dataTable = DataTableManager::getTable(s_creaureDataTable, openIfNotFound); - if (dataTable != NULL) + if (dataTable != nullptr) { DataTableManager::addReloadCallback(s_creaureDataTable, &loadCreatureData); loadCreatureData(*dataTable); diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp index 781bc2f1..4d5498f8 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp @@ -58,7 +58,7 @@ AiCreatureWeaponActions::AiCreatureWeaponActions() : m_singleUseActionList() , m_delayRepeatActionList() , m_instantRepeatActionList() - , m_combatProfile(NULL) + , m_combatProfile(nullptr) { } @@ -81,7 +81,7 @@ void AiCreatureWeaponActions::setCombatProfile(CreatureObject & owner, AiCreatur // ---------------------------------------------------------------------- void AiCreatureWeaponActions::reset() { - if (m_combatProfile != NULL) + if (m_combatProfile != nullptr) { resetActionTimers(m_singleUseActionList, m_combatProfile->m_singleUseActionList); resetActionTimers(m_delayRepeatActionList, m_combatProfile->m_delayRepeatActionList); @@ -92,9 +92,9 @@ void AiCreatureWeaponActions::reset() // ---------------------------------------------------------------------- PersistentCrcString const & AiCreatureWeaponActions::getCombatAction() { - // If the combat profile is NULL, then the AI has no special actions assigned + // If the combat profile is nullptr, then the AI has no special actions assigned - if (m_combatProfile != NULL) + if (m_combatProfile != nullptr) { time_t const osTime = Os::getRealSystemTime(); diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp index 723b8c7e..e1508bf4 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp @@ -34,12 +34,12 @@ namespace Archive get(source, target.m_objectId); get(source, movementType); - AICreatureController * controller = NULL; + AICreatureController * controller = nullptr; Object * object = NetworkIdManager::getObjectById(target.getObjectId()); - if (object != NULL) + if (object != nullptr) controller = dynamic_cast(object->getController()); - if (controller == NULL) + if (controller == nullptr) { WARNING(true, ("AiMovementMessage Archive::get, got message to object %s that doesn't have an AICreatureController", target.getObjectId().getValueString().c_str())); target.m_movement = AiMovementBaseNullPtr; diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp index dde28a05..79f1e119 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp @@ -30,9 +30,9 @@ AiMovementBase::AiMovementBase( AICreatureController * controller ) : m_controller( controller ), - m_stateFunction( NULL ), + m_stateFunction( nullptr ), m_stateName(), - m_pendingFunction( NULL ), + m_pendingFunction( nullptr ), m_pendingName() { } @@ -41,9 +41,9 @@ AiMovementBase::AiMovementBase( AICreatureController * controller ) AiMovementBase::AiMovementBase( AICreatureController * controller, Archive::ReadIterator & source ) : m_controller( controller ), - m_stateFunction( NULL ), + m_stateFunction( nullptr ), m_stateName(), - m_pendingFunction( NULL ), + m_pendingFunction( nullptr ), m_pendingName() { // !!! @@ -177,7 +177,7 @@ void AiMovementBase::applyStateChange ( void ) m_stateFunction = m_pendingFunction; m_stateName = m_pendingName; - m_pendingFunction = NULL; + m_pendingFunction = nullptr; m_pendingName.clear(); } } @@ -249,49 +249,49 @@ char const * AiMovementBase::getMovementString(AiMovementType const aiMovementTy // ---------------------------------------------------------------------- AiMovementSwarm * AiMovementBase::asAiMovementSwarm() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementFace * AiMovementBase::asAiMovementFace() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementFlee * AiMovementBase::asAiMovementFlee() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementFollow * AiMovementBase::asAiMovementFollow() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementLoiter * AiMovementBase::asAiMovementLoiter() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementMove * AiMovementBase::asAiMovementMove() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementPatrol * AiMovementBase::asAiMovementPatrol() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiMovementWander * AiMovementBase::asAiMovementWander() { - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp index 8e4e5a2d..e8e0f5c4 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp @@ -67,9 +67,9 @@ Vector AiMovementLoiterNamespace::getRandomLoiterPosition_p(Vector const anchorP bool AiMovementLoiterNamespace::isPositionOnFloor(Floor const * const floor, Vector const & position_p, float const radius, Vector & floorPosition_p) { bool result = false; - FloorMesh const * const floorMesh = (floor != NULL) ? floor->getFloorMesh() : NULL; + FloorMesh const * const floorMesh = (floor != nullptr) ? floor->getFloorMesh() : nullptr; - if (floorMesh != NULL) + if (floorMesh != nullptr) { // See if the circle fits entirely on the floor { @@ -199,7 +199,7 @@ AiMovementLoiter::AiMovementLoiter( AICreatureController * controller, Archive:: AiMovementLoiter::~AiMovementLoiter() { delete m_cachedAiLocations; - m_cachedAiLocations = NULL; + m_cachedAiLocations = nullptr; } // ---------------------------------------------------------------------- @@ -420,7 +420,7 @@ bool AiMovementLoiter::generateWaypoint() Floor const * const ownerFloor = CollisionWorld::getFloorStandingOn(*creatureOwner); - if (ownerFloor != NULL) + if (ownerFloor != nullptr) { // The owner is standing on a floor @@ -476,7 +476,7 @@ bool AiMovementLoiter::generateWaypoint() TerrainObject const * const terrainObject = TerrainObject::getConstInstance(); - if ( (terrainObject != NULL) + if ( (terrainObject != nullptr) && terrainObject->isPassable(randomPosition_p)) { // Snap the random position to the terrain @@ -518,7 +518,7 @@ bool AiMovementLoiter::generateWaypoint() { BaseExtent const * const extent = collisionProperty->getExtent_l(); - if (extent != NULL) + if (extent != nullptr) { Vector const begin_o(object.rotateTranslate_w2o(m_anchor.getPosition_p())); Vector const end_o(object.rotateTranslate_w2o(randomPosition_p)); @@ -580,7 +580,7 @@ void AiMovementLoiter::addDebug(AiDebugString & aiDebugString) AiMovementWaypoint::addDebug(aiDebugString); FormattedString<512> fs; - aiDebugString.addText(fs.sprintf("LOITER %s\n%s\ndist[%.0f...%.0f]\ndelay[%.1f...%.1f]\n", (m_anchor.getObject() != NULL) ? "TARGET" : "POSITION", m_stateName.c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay), PackedRgb::solidCyan); + aiDebugString.addText(fs.sprintf("LOITER %s\n%s\ndist[%.0f...%.0f]\ndelay[%.1f...%.1f]\n", (m_anchor.getObject() != nullptr) ? "TARGET" : "POSITION", m_stateName.c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay), PackedRgb::solidCyan); //if (m_bubbleCheckResult == BCR_invalid) //{ @@ -599,7 +599,7 @@ void AiMovementLoiter::addDebug(AiDebugString & aiDebugString) { Object const * const anchorObject = m_anchor.getObject(); - if (anchorObject != NULL) + if (anchorObject != nullptr) { // We are anchored to a moving target @@ -659,7 +659,7 @@ bool AiMovementLoiter::isAnchorValid() const { TangibleObject const * const tangibleObject = TangibleObject::asTangibleObject(m_anchor.getObject()); - if (tangibleObject != NULL) + if (tangibleObject != nullptr) { if (tangibleObject->isInCombat()) { diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp index 9641e7e3..71b6b193 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp @@ -85,7 +85,7 @@ AiMovementMove::AiMovementMove( AICreatureController * controller, Archive::Read AiMovementMove::~AiMovementMove() { delete m_pathBuilder; - m_pathBuilder = NULL; + m_pathBuilder = nullptr; } // ---------------------------------------------------------------------- @@ -151,7 +151,7 @@ void AiMovementMove::refresh( void ) m_target = target; m_targetName = targetName; - if (m_controller != NULL) + if (m_controller != nullptr) m_start = AiLocation(m_controller->getCreatureCell(), m_controller->getCreaturePosition_p()); CHANGE_STATE( AiMovementMove::stateWaiting ); } diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp index 2105c898..34ab1e1f 100644 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp @@ -73,7 +73,7 @@ AiMovementPathFollow::AiMovementPathFollow( AICreatureController * controller, A : AiMovementWaypoint( controller, source ), m_path( new AiPath() ) { - if (m_path != NULL) + if (m_path != nullptr) Archive::get(source, *m_path); } @@ -84,7 +84,7 @@ AiMovementPathFollow::~AiMovementPathFollow() clearPath(); delete m_path; - m_path = NULL; + m_path = nullptr; } // ---------------------------------------------------------------------- @@ -92,7 +92,7 @@ AiMovementPathFollow::~AiMovementPathFollow() void AiMovementPathFollow::pack( Archive::ByteStream & target ) const { AiMovementWaypoint::pack(target); - if (m_path != NULL) + if (m_path != nullptr) Archive::put(target, *m_path); else Archive::put(target, static_cast(0)); @@ -288,7 +288,7 @@ AiPath const * AiMovementPathFollow::getPath ( void ) const void AiMovementPathFollow::swapPath ( AiPath * newPath ) { - if(newPath == NULL) return; + if(newPath == nullptr) return; AiPath::iterator it; diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp index 4ea6a593..c4c73b88 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp @@ -60,7 +60,7 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect m_patrolPointIndex(startPoint) { ServerObject * owner = safe_cast(controller->getOwner()); - if (owner != NULL) + if (owner != nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol creating named path for %s\n", owner->getNetworkId().getValueString().c_str())); @@ -98,7 +98,7 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect { const Unicode::String & pointName = *i; const CityPathNode * node = CityPathGraphManager::getNamedNodeFor(*owner, pointName); - if (node != NULL) + if (node != nullptr) { m_patrolPath.push_back(AiLocation(node->getSourceId())); } @@ -118,16 +118,16 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect // try an find a node on the path that is a previous root node, or isn't // being used in any other path std::vector::iterator i; - const ServerObject * node = NULL; - const ServerObject * root = NULL; + const ServerObject * node = nullptr; + const ServerObject * root = nullptr; for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i) { node = safe_cast(i->getObject()); - if (node != NULL) + if (node != nullptr) { if (node->isPatrolPathRoot()) { - if (root == NULL || !root->isPatrolPathRoot()) + if (root == nullptr || !root->isPatrolPathRoot()) { // if we already have a set up root node, use that root = node; @@ -135,18 +135,18 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect else { // we've got two previous root nodes, we can't connect them - root = NULL; + root = nullptr; break; } } - else if (!node->isPatrolPathNode() && root == NULL) + else if (!node->isPatrolPathNode() && root == nullptr) { // found a free node root = node; } } } - if (root != NULL) + if (root != nullptr) { // set up the root node if (!root->isPatrolPathRoot()) @@ -156,7 +156,7 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i) { node = safe_cast(i->getObject()); - if (node != NULL && node != root) + if (node != nullptr && node != root) const_cast(node)->setPatrolPathRoot(*root); } const_cast(root)->addPatrolPathingObject(*owner); @@ -167,7 +167,7 @@ AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vect for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i) { node = safe_cast(i->getObject()); - if (node != NULL) + if (node != nullptr) nodes += node->getNetworkId().getValueString() + " "; } WARNING(true, ("AiMovementPatrol unable to find root node for path: %s", nodes.c_str())); @@ -266,15 +266,15 @@ void AiMovementPatrol::getDebugInfo ( std::string & outString ) const void AiMovementPatrol::endBehavior() { - if (!m_patrolPath.empty() && m_controller != NULL) + if (!m_patrolPath.empty() && m_controller != nullptr) { const ServerObject * owner = safe_cast(m_controller->getOwner()); - if (owner != NULL) + if (owner != nullptr) { for (std::vector::iterator i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i) { const ServerObject * node = safe_cast(i->getObject()); - if (node != NULL && node->isPatrolPathRoot()) + if (node != nullptr && node->isPatrolPathRoot()) { const_cast(node)->removePatrolPathingObject(*owner); break; @@ -304,7 +304,7 @@ bool AiMovementPatrol::getHibernateOk() const if (!m_patrolPath.empty()) { const ServerObject * node = safe_cast(m_patrolPath.front().getObject()); - if (node != NULL) + if (node != nullptr) { return node->getPatrolPathObservers() == 0; } diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp index 52a3e701..f9593a06 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp @@ -104,10 +104,10 @@ void AiMovementSwarm::alter ( float time ) } // update the offset from our target we want to go to - if (m_target.getObject() != NULL) + if (m_target.getObject() != nullptr) { const CreatureObject * owner = m_controller->getCreature(); - if (owner != NULL) + if (owner != nullptr) { offsetMap::const_iterator found = s_offsetMap.find(CachedNetworkId(*owner)); if (found != s_offsetMap.end()) @@ -179,7 +179,7 @@ AiStateResult AiMovementSwarm::triggerWaiting() { // note: don't use the m_target position function, because it includes the offset position const Object * target = m_target.getObject(); - if (target != NULL) + if (target != nullptr) m_controller->turnToward(target->getParentCell(), target->getPosition_p()); return AiMovementFollow::triggerWaiting(); } @@ -196,7 +196,7 @@ void AiMovementSwarm::init() const CreatureObject * creatureOwner = m_controller->getCreature(); const CreatureObject * creatureTarget = CreatureObject::asCreatureObject(m_target.getObject()); - if (creatureOwner != NULL && creatureTarget != NULL) + if (creatureOwner != nullptr && creatureTarget != nullptr) { CreatureWatcher watchedCreature(creatureOwner); targetMap::iterator found = s_swarmMap.find(CachedNetworkId(*creatureTarget)); @@ -226,7 +226,7 @@ void AiMovementSwarm::cleanup() // note: using static_cast instead of safe_cast because the owner may be in the process of being destructed const CreatureObject * owner = static_cast(m_controller->getOwner()); const CreatureObject * target = static_cast(m_target.getObject()); - if (owner != NULL && target != NULL) + if (owner != nullptr && target != nullptr) { targetMap::iterator found = s_swarmMap.find(CachedNetworkId(*target)); if (found != s_swarmMap.end()) @@ -258,7 +258,7 @@ void AiMovementSwarm::computeGoals() for (targetMap::iterator i = s_swarmMap.begin(); i != s_swarmMap.end();) { const CreatureObject * target = CreatureObject::asCreatureObject((*i).first.getObject()); - if (target != NULL && !target->isDead()) + if (target != nullptr && !target->isDead()) { computeGoals(*target, (*i).second); if ((*i).second.empty()) @@ -294,16 +294,16 @@ void AiMovementSwarm::computeGoals(const CreatureObject & target, std::vectorgetController()); - if (controller != NULL) + if (controller != nullptr) swarmMovement = dynamic_cast(controller->getCurrentMovement()); } - if (mover == NULL || mover->isDead()) + if (mover == nullptr || mover->isDead()) { // dump the mover from our list --count; @@ -314,7 +314,7 @@ void AiMovementSwarm::computeGoals(const CreatureObject & target, std::vectorisDead()) + if (blocker == nullptr || blocker->isDead()) { continue; } @@ -361,7 +361,7 @@ void AiMovementSwarm::computeGoals(const CreatureObject & target, std::vectorasServerObject() != NULL) + if (o != nullptr && o->asServerObject() != nullptr) { // if the target is a player, don't hibernate if (o->asServerObject()->isPlayerControlled()) hibernate = false; // hibernate if who we're following is hibernating - else if (o->asServerObject()->asCreatureObject() != NULL) + else if (o->asServerObject()->asCreatureObject() != nullptr) hibernate = (safe_cast(o->getController()))->getHibernate(); } else @@ -114,7 +114,7 @@ static const AiMovementTarget * preventRecurse = NULL; // clean up recusion checkers if (preventRecurse == this) - preventRecurse = NULL; + preventRecurse = nullptr; --recursionCount; return hibernate; } diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp index 24a4c66a..a5fe327d 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp @@ -82,23 +82,23 @@ bool AiMovementWanderInterior::updateWaypoint ( void ) { CreatureObject const * creature = m_controller->getCreature(); - if(creature == NULL) return false; + if(creature == nullptr) return false; CellProperty const * cell = creature->getParentCell(); - if(cell == NULL) return false; + if(cell == nullptr) return false; Floor const * floor = cell->getFloor(); - if(floor == NULL) return false; + if(floor == nullptr) return false; FloorMesh const * floorMesh = floor->getFloorMesh(); - if(floorMesh == NULL) return false; + if(floorMesh == nullptr) return false; PathGraph const * graph = safe_cast(floorMesh->getPathGraph()); - if(graph == NULL) return false; + if(graph == nullptr) return false; // ---------- @@ -107,11 +107,11 @@ bool AiMovementWanderInterior::updateWaypoint ( void ) if(closestIndex == -2) { const CellObject *cellObject = dynamic_cast(&cell->getOwner()); - const BuildingObject *building = (cellObject ? cellObject->getOwnerBuilding() : NULL); + const BuildingObject *building = (cellObject ? cellObject->getOwnerBuilding() : nullptr); Vector creaturePosition = creature->getPosition_w(); LOG("building-data-error",("Building id=%s has no path data but creature id=%s at (x=%.2f,y=%.2f,z=%.2f) requires it for wandering, stopping behavior.", - (building ? building->getNetworkId().getValueString().c_str() : ""), + (building ? building->getNetworkId().getValueString().c_str() : ""), creature->getNetworkId().getValueString().c_str(), creaturePosition.x, creaturePosition.y, @@ -132,7 +132,7 @@ bool AiMovementWanderInterior::updateWaypoint ( void ) { PathNode const * closestNode = graph->getNode(closestIndex); - if(closestNode != NULL) + if(closestNode != nullptr) { m_target = AiLocation(m_controller->getCreatureCell(),closestNode->getPosition_p()); diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp index 3b2b123e..c92d3100 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp @@ -34,7 +34,7 @@ float computeMovementModifier (CreatureObject * const object) { if (!object) { - DEBUG_FATAL(true, ("object is NULL.")); + DEBUG_FATAL(true, ("object is nullptr.")); return 0.0f; } @@ -81,7 +81,7 @@ float computeMovementModifier (CreatureObject * const object) // if the creature has a slope effect property, see if it has a greater // (more negative) effect on the creature than the terrain const Property * property = object->getProperty(SlopeEffectProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) { // note we use the creature's base speed modifier, not the one modified by skills // (although for ai they're probably the same) diff --git a/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp index 2afac7bc..050263d3 100755 --- a/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp @@ -94,7 +94,7 @@ bool AiTargetingSystem::canAttackTarget(TangibleObject const * target) { bool result = false; - if (target != NULL) + if (target != nullptr) { if ( (m_owner.getDistanceBetweenCollisionSpheres_w(*target) <= ConfigServerGame::getMaxCombatRange()) && m_owner.checkLOSTo(*target)) diff --git a/engine/server/library/serverGame/src/shared/ai/Formation.cpp b/engine/server/library/serverGame/src/shared/ai/Formation.cpp index 713d9b00..415989a2 100755 --- a/engine/server/library/serverGame/src/shared/ai/Formation.cpp +++ b/engine/server/library/serverGame/src/shared/ai/Formation.cpp @@ -128,8 +128,8 @@ void Formation::build(Squad & squad) DEBUG_FATAL(squad.isEmpty(), ("Building a formation on an empty squad.")); Object const * const leaderObject = squad.getLeader().getObject(); - CollisionProperty const * const leaderCollisionProperty = (leaderObject != NULL) ? leaderObject->getCollisionProperty() : NULL; - float const leaderRadius = (leaderCollisionProperty != NULL) ? (leaderCollisionProperty->getBoundingSphere_l().getRadius() * 2.0f) : 1.0f; + CollisionProperty const * const leaderCollisionProperty = (leaderObject != nullptr) ? leaderObject->getCollisionProperty() : nullptr; + float const leaderRadius = (leaderCollisionProperty != nullptr) ? (leaderCollisionProperty->getBoundingSphere_l().getRadius() * 2.0f) : 1.0f; int slotIndex = 0; Squad::UnitMap const & unitSet = squad.getUnitMap(); diff --git a/engine/server/library/serverGame/src/shared/ai/HateList.cpp b/engine/server/library/serverGame/src/shared/ai/HateList.cpp index d57fc5cb..496fb2b9 100755 --- a/engine/server/library/serverGame/src/shared/ai/HateList.cpp +++ b/engine/server/library/serverGame/src/shared/ai/HateList.cpp @@ -41,8 +41,8 @@ // ---------------------------------------------------------------------- HateList::HateList() - : m_owner(NULL) - , m_playerObject(NULL) + : m_owner(nullptr) + , m_playerObject(nullptr) , m_hateList() , m_target(CachedNetworkId::cms_cachedInvalid) , m_maxHate(0.0f) @@ -56,8 +56,8 @@ HateList::HateList() HateList::~HateList() { clear(); - m_owner = NULL; - m_playerObject = NULL; + m_owner = nullptr; + m_playerObject = nullptr; } // ---------------------------------------------------------------------- @@ -119,7 +119,7 @@ bool HateList::addHate(NetworkId const & target, float const hate) // If a target AI has a master, the target and the master needs to be added to the hate list (ie. pets should cause their master to gain hate) { CreatureObject const * const targetCreatureObject = CreatureObject::asCreatureObject(targetObject); - NetworkId const & masterId = (targetCreatureObject != NULL) ? targetCreatureObject->getMasterId() : NetworkId::cms_invalid; + NetworkId const & masterId = (targetCreatureObject != nullptr) ? targetCreatureObject->getMasterId() : NetworkId::cms_invalid; if (masterId != NetworkId::cms_invalid) { @@ -274,7 +274,7 @@ bool HateList::removeTarget(NetworkId const & target) { AggroListProperty * const aggroList = AggroListProperty::getAggroListProperty(*m_owner); - if (aggroList != NULL) + if (aggroList != nullptr) { aggroList->addTarget(target); } @@ -301,7 +301,7 @@ bool HateList::isValidTarget(Object * const target) bool valid = true; TangibleObject * const targetTangibleObject = TangibleObject::asTangibleObject(target); - if (targetTangibleObject == NULL) + if (targetTangibleObject == nullptr) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS NOT A TANGIBLEOBJECT", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str())); valid = false; @@ -334,7 +334,7 @@ bool HateList::isValidTarget(Object * const target) { CreatureObject const * const targetCreatureObject = targetTangibleObject->asCreatureObject(); - if (targetCreatureObject != NULL) + if (targetCreatureObject != nullptr) { if (targetTangibleObject->isDisabled()) { @@ -355,7 +355,7 @@ bool HateList::isValidTarget(Object * const target) { AICreatureController const * const targetAiCreatureController = AICreatureController::asAiCreatureController(targetCreatureObject->getController()); - if ( (targetAiCreatureController != NULL) + if ( (targetAiCreatureController != nullptr) && targetAiCreatureController->isRetreating()) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS RETREATING", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str())); @@ -370,7 +370,7 @@ bool HateList::isValidTarget(Object * const target) // themselves towards the player so that they and the player // enter combat correctly. { - if ( (m_owner->asCreatureObject() != NULL) + if ( (m_owner->asCreatureObject() != nullptr) && !Pvp::canAttack(*m_owner, *targetTangibleObject)) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) PVP CAN'T ATTACK", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str())); @@ -393,7 +393,7 @@ CachedNetworkId const & HateList::getTarget() const if ( (m_target.get() == CachedNetworkId::cms_cachedInvalid) && !isEmpty()) { - WARNING(true, ("HateList::getTarget() owner(%s) m_hateList.size(%u) m_target is NULL but the HateList is not empty.", m_owner->getDebugInformation().c_str(), m_hateList.size())); + WARNING(true, ("HateList::getTarget() owner(%s) m_hateList.size(%u) m_target is nullptr but the HateList is not empty.", m_owner->getDebugInformation().c_str(), m_hateList.size())); } #endif // _DEBUG @@ -458,7 +458,7 @@ void HateList::findNewTarget() for (; iterHateList != m_hateList.end(); ++iterHateList) { - if (iterHateList->first.getObject() == NULL) + if (iterHateList->first.getObject() == nullptr) { // This target will be removed in the next alter call continue; @@ -510,11 +510,11 @@ void HateList::setTarget(CachedNetworkId const & target, float const hate) #ifdef _DEBUG // We should only have tangible objects in our target list - if (m_target.get().getObject() != NULL) + if (m_target.get().getObject() != nullptr) { TangibleObject const * const targetTangibleObject = TangibleObject::asTangibleObject(m_target.get().getObject()->asServerObject()); - if (targetTangibleObject == NULL) + if (targetTangibleObject == nullptr) { WARNING(true, ("HateList::setTarget() owner(%s) How did we get a target(%s) that is not a TangibleObject", m_owner->getDebugInformation().c_str(), m_target.get().getObject()->getDebugInformation().c_str())); } @@ -559,7 +559,7 @@ void HateList::triggerTargetChanged(NetworkId const & target) { GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetChanged() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str())); @@ -578,7 +578,7 @@ void HateList::triggerTargetAdded(NetworkId const & target) { GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetAdded() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str())); @@ -597,7 +597,7 @@ void HateList::triggerTargetRemoved(NetworkId const & target) { GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetRemoved() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str())); @@ -628,7 +628,7 @@ int HateList::getAutoExpireTargetDuration() const bool HateList::isOwnerValid() const { CreatureObject const * const ownerCreature = CreatureObject::asCreatureObject(m_owner); - bool const ownerIncapacitated = (ownerCreature != NULL) ? ownerCreature->isIncapacitated() : false; + bool const ownerIncapacitated = (ownerCreature != nullptr) ? ownerCreature->isIncapacitated() : false; if (ownerIncapacitated) { @@ -636,7 +636,7 @@ bool HateList::isOwnerValid() const return false; } - bool const ownerDead = (ownerCreature != NULL) ? ownerCreature->isDead() : false; + bool const ownerDead = (ownerCreature != nullptr) ? ownerCreature->isDead() : false; if (ownerDead) { @@ -644,7 +644,7 @@ bool HateList::isOwnerValid() const return false; } - bool const ownerDisabled = (ownerCreature != NULL) ? ownerCreature->isDisabled() : false; + bool const ownerDisabled = (ownerCreature != nullptr) ? ownerCreature->isDisabled() : false; if (ownerDisabled) { @@ -653,7 +653,7 @@ bool HateList::isOwnerValid() const } AICreatureController const * const ownerAiCreatureController = AICreatureController::asAiCreatureController(m_owner->getController()); - const bool ownerRetreating = (ownerAiCreatureController != NULL) ? ownerAiCreatureController->isRetreating() : false; + const bool ownerRetreating = (ownerAiCreatureController != nullptr) ? ownerAiCreatureController->isRetreating() : false; if (ownerRetreating) { @@ -752,11 +752,11 @@ void HateList::forceHateTarget(const NetworkId &target) #ifdef _DEBUG // We should only have tangible objects in our target list - if (m_target.get().getObject() != NULL) + if (m_target.get().getObject() != nullptr) { TangibleObject const * const targetTangibleObject = TangibleObject::asTangibleObject(m_target.get().getObject()->asServerObject()); - if (targetTangibleObject == NULL) + if (targetTangibleObject == nullptr) { WARNING(true, ("HateList::setTarget() owner(%s) How did we get a target(%s) that is not a TangibleObject", m_owner->getDebugInformation().c_str(), m_target.get().getObject()->getDebugInformation().c_str())); } diff --git a/engine/server/library/serverGame/src/shared/ai/HateList.h b/engine/server/library/serverGame/src/shared/ai/HateList.h index c4f1b761..38a3a685 100755 --- a/engine/server/library/serverGame/src/shared/ai/HateList.h +++ b/engine/server/library/serverGame/src/shared/ai/HateList.h @@ -99,7 +99,7 @@ private: inline bool HateList::isOwnerPlayer() const { - return (m_playerObject != NULL); + return (m_playerObject != nullptr); } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/ai/Squad.cpp b/engine/server/library/serverGame/src/shared/ai/Squad.cpp index caced74f..b4a23b20 100755 --- a/engine/server/library/serverGame/src/shared/ai/Squad.cpp +++ b/engine/server/library/serverGame/src/shared/ai/Squad.cpp @@ -380,7 +380,7 @@ void Squad::buildFormation() { NetworkId const & unit = iterUnitMap->first; PersistentCrcString const * unitName = iterUnitMap->second; - DEBUG_FATAL((unitName == NULL), ("The unit should have a non-null name.")); + DEBUG_FATAL((unitName == nullptr), ("The unit should have a non-nullptr name.")); if (unit == m_leader) { @@ -401,7 +401,7 @@ void Squad::buildFormation() #ifdef DEBUG Object * const unitObject = NetworkIdManager::getObjectById(unit); DEBUG_WARNING(true, ("className(%s) Unable to find the ship(%s) [%s] in the formation priority list.", - getClassName(), unitName->getString(), unitObject ? unitObject->getDebugInformation().c_str() : "NULL")); + getClassName(), unitName->getString(), unitObject ? unitObject->getDebugInformation().c_str() : "nullptr")); #endif } @@ -463,7 +463,7 @@ void Squad::calculateSquadPosition_w() Object * const object = NetworkIdManager::getObjectById(unit); - if (object != NULL) + if (object != nullptr) { m_squadPosition_w += object->getPosition_w(); } diff --git a/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp index 08bba97e..b6c5690b 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp @@ -28,15 +28,15 @@ namespace Archive #ifdef _DEBUG Object * const object = NetworkIdManager::getObjectById(target.m_networkId); - if (object == NULL) + if (object == nullptr) { WARNING(true, ("AiCreatureStateArchive::get() Unable to resolve networkId(%s) to an Object", target.m_networkId.getValueString().c_str())); return; } - AICreatureController * const controller = (object != NULL) ? AICreatureController::asAiCreatureController(object->getController()) : NULL; + AICreatureController * const controller = (object != nullptr) ? AICreatureController::asAiCreatureController(object->getController()) : nullptr; - if (controller == NULL) + if (controller == nullptr) { WARNING(true, ("AiCreatureStateArchive::get() Message to object(%s) that does not have an AICreatureController", object->getDebugInformation().c_str())); return; diff --git a/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp b/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp index 885657b9..d73f1f43 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp @@ -43,9 +43,9 @@ namespace AiLocationArchive AiLocation::AiLocation ( void ) : m_valid(false), m_attached(false), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(0.0f), @@ -60,9 +60,9 @@ AiLocation::AiLocation ( void ) AiLocation::AiLocation ( CellProperty const * cell, Vector const & position, float radius ) : m_valid(true), m_attached(false), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(cell ? &cell->getOwner() : NULL), + m_cellObject(cell ? &cell->getOwner() : nullptr), m_position_p(position), m_position_w(CollisionUtils::transformToWorld(cell,position)), m_radius(radius), @@ -78,9 +78,9 @@ AiLocation::AiLocation ( CellProperty const * cell, Vector const & position, flo AiLocation::AiLocation ( NetworkId const & cellId, Vector const & position, float radius ) : m_valid(true), m_attached(false), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(position), m_position_w(position), m_radius(radius), @@ -110,9 +110,9 @@ AiLocation::AiLocation ( NetworkId const & cellId, Vector const & position, floa AiLocation::AiLocation ( Object const * object ) : m_valid(true), m_attached(true), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(0.0f), @@ -129,9 +129,9 @@ AiLocation::AiLocation ( Object const * object ) AiLocation::AiLocation ( NetworkId const & objectId ) : m_valid(true), m_attached(true), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(0.0f), @@ -148,9 +148,9 @@ AiLocation::AiLocation ( NetworkId const & objectId ) AiLocation::AiLocation ( Object const * object, Vector const & offset, bool relativeOffset ) : m_valid(true), m_attached(true), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(0.0f), @@ -167,9 +167,9 @@ AiLocation::AiLocation ( Object const * object, Vector const & offset, bool rela AiLocation::AiLocation ( NetworkId const & objectId, Vector const & offset, bool relativeOffset ) : m_valid(true), m_attached(true), - m_object(NULL), + m_object(nullptr), m_objectId(), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(0.0f), @@ -365,7 +365,7 @@ void AiLocation::setObject ( Object const * object ) { if(m_attached) { - if (object == NULL) + if (object == nullptr) { clear(); return; @@ -385,7 +385,7 @@ void AiLocation::setObject ( Object const * object ) void AiLocation::detach ( void ) { - m_object = NULL; + m_object = nullptr; m_objectId = NetworkId::cms_invalid; m_attached = false; } @@ -394,7 +394,7 @@ void AiLocation::detach ( void ) CellProperty const * AiLocation::getCell ( void ) const { - return m_cellObject ? m_cellObject->getCellProperty() : NULL; + return m_cellObject ? m_cellObject->getCellProperty() : nullptr; } // ---------- @@ -424,7 +424,7 @@ bool AiLocation::hasChanged ( void ) const Vector AiLocation::getPosition_p ( void ) const { - if(m_cellObject.getPointer() == NULL) + if(m_cellObject.getPointer() == nullptr) { WARNING(ConfigServerGame::getReportAiWarnings(),("AiLocation::getPosition_p - Locations's parent cell has disappeared\n")); @@ -572,8 +572,8 @@ void AiLocation::clear ( void ) m_valid = false; m_attached = false; - m_object = NULL; - m_cellObject = NULL; + m_object = nullptr; + m_cellObject = nullptr; m_position_p = Vector::zero; m_radius = 0.0f; m_offset_p = Vector::zero; @@ -585,7 +585,7 @@ void AiLocation::clear ( void ) bool AiLocation::isInWorldCell ( void ) const { - return isValid() && ( (getCell() == NULL) || (getCell() == CellProperty::getWorldCellProperty()) ); + return isValid() && ( (getCell() == nullptr) || (getCell() == CellProperty::getWorldCellProperty()) ); } @@ -599,7 +599,7 @@ bool AiLocation::validate ( void ) const TerrainObject * terrain = TerrainObject::getInstance(); - if(terrain == NULL) return true; + if(terrain == nullptr) return true; float w = terrain->getMapWidthInMeters() / 2.0f; diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp index 08958488..9af5e0c8 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp @@ -159,7 +159,7 @@ void AiShipAttackTargetList::add(ShipObject & unit, float const damage) AiShipController * const ownerAiShipController = AiShipController::asAiShipController(m_owner->getController()); - if (ownerAiShipController != NULL) + if (ownerAiShipController != nullptr) { if (!ownerAiShipController->isValidTarget(unit)) { @@ -204,7 +204,7 @@ void AiShipAttackTargetList::add(ShipObject & unit, float const damage) ShipController * const attackingUnitShipController = unit.getController()->asShipController(); - if (attackingUnitShipController != NULL) + if (attackingUnitShipController != nullptr) { attackingUnitShipController->addAiTargetingMe(m_owner->getNetworkId()); } @@ -217,7 +217,7 @@ void AiShipAttackTargetList::add(ShipObject & unit, float const damage) // ---------------------------------------------------------------------- bool AiShipAttackTargetList::remove(NetworkId const & unit, bool const inDestructorHack) { - DEBUG_FATAL((unit == NetworkId::cms_invalid), ("Removing a NULL unit")); + DEBUG_FATAL((unit == NetworkId::cms_invalid), ("Removing a nullptr unit")); bool result = false; @@ -238,11 +238,11 @@ bool AiShipAttackTargetList::remove(NetworkId const & unit, bool const inDestruc // Tell this unit that we are no longer targeting it - if (object != NULL) + if (object != nullptr) { ShipController * const shipController = object->getController()->asShipController(); - if (shipController != NULL) + if (shipController != nullptr) { shipController->removeAiTargetingMe(m_owner->getNetworkId()); } @@ -398,12 +398,12 @@ void AiShipAttackTargetList::findNewPrimaryTarget() // We should only have ship objects in our target list - if (m_primaryTarget.getObject() != NULL) + if (m_primaryTarget.getObject() != nullptr) { ServerObject * const targetServerObject = m_primaryTarget.getObject()->asServerObject(); - ShipObject * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL; + ShipObject * const targetShipObject = (targetServerObject != nullptr) ? targetServerObject->asShipObject() : nullptr; - if (targetShipObject == NULL) + if (targetShipObject == nullptr) { DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::findNewPrimaryTarget() ERROR: How did we get a target that is not a ShipObject (%s)", m_primaryTarget.getObject()->getDebugInformation().c_str())); } @@ -444,7 +444,7 @@ void AiShipAttackTargetList::verify() AiShipController * const ownerAiShipController = AiShipController::asAiShipController(m_owner->getController()); - if (ownerAiShipController != NULL) + if (ownerAiShipController != nullptr) { if (ownerAiShipController->hasExclusiveAggros()) { @@ -457,9 +457,9 @@ void AiShipAttackTargetList::verify() for (; iterTargetList != m_targetList->end(); ++iterTargetList) { ShipObject * const unitShipObject = ShipObject::asShipObject(iterTargetList->first.getObject()); - CreatureObject const * const unitPilot = (unitShipObject != NULL) ? unitShipObject->getPilot() : NULL; + CreatureObject const * const unitPilot = (unitShipObject != nullptr) ? unitShipObject->getPilot() : nullptr; - if ( (unitPilot == NULL) + if ( (unitPilot == nullptr) || !ownerAiShipController->isExclusiveAggro(*unitPilot)) { s_purgeList.push_back(unitShipObject->getNetworkId()); diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp index 239342d3..58e90c58 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp @@ -56,7 +56,7 @@ AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipController & aiShip m_evadeChangeDirectionTimer(0.5f), m_missilesFired(0) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber() unit(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber() unit(%s)", (aiShipController.getOwner() != nullptr) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); } // ---------------------------------------------------------------------- @@ -73,7 +73,7 @@ AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipBehaviorAttack cons m_evadeChangeDirectionTimer(0.5f), m_missilesFired(0) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipBehaviorAttack &) unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipBehaviorAttack &) unit(%s)", (m_aiShipController.getOwner() != nullptr) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); } // ---------------------------------------------------------------------- @@ -293,7 +293,7 @@ ShipObject const * AiShipBehaviorAttackBomber::getTargetCapitalShip() const return targetShipObject; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp index d771b837..a1fe30da 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp @@ -19,7 +19,7 @@ AiShipBehaviorAttackCapitalShip::AiShipBehaviorAttackCapitalShip(AiShipController & aiShipController) : AiShipBehaviorAttack(aiShipController) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackCapitalShip::AiShipBehaviorAttackCapitalShip() unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackCapitalShip::AiShipBehaviorAttackCapitalShip() unit(%s)", (m_aiShipController.getOwner() != nullptr) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp index 166eda11..d43510a4 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp @@ -145,7 +145,7 @@ Vector const AiShipBehaviorAttackFighter::calculateEvadePositionWithinLeashDista AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipController & aiShipController) : AiShipBehaviorAttack(aiShipController) - , m_currentManeuver(NULL) + , m_currentManeuver(nullptr) , m_timeDelta(0.0f) , m_projectileTimer() , m_missileLockOnTimer() @@ -165,7 +165,7 @@ AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipController & aiSh , m_shotErrorPosition_l() , m_nextShotPosition_w() { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (aiShipController.getOwner() != nullptr) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); initializeTimers(); calculateEvadeHealthPercent(); calculateNextProjectileShotPerfect(); @@ -178,7 +178,7 @@ AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipController & aiSh AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipBehaviorAttack const & sourceBehavior) : AiShipBehaviorAttack(sourceBehavior) - , m_currentManeuver(NULL) + , m_currentManeuver(nullptr) , m_timeDelta(0.0f) , m_projectileTimer() , m_missileLockOnTimer() @@ -198,7 +198,7 @@ AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipBehaviorAttack co , m_shotErrorPosition_l() , m_nextShotPosition_w() { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (getAiShipController().getOwner() != NULL) ? getAiShipController().getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (getAiShipController().getOwner() != nullptr) ? getAiShipController().getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); initializeTimers(); calculateEvadeHealthPercent(); calculateNextProjectileShotPerfect(); @@ -214,7 +214,7 @@ AiShipBehaviorAttackFighter::~AiShipBehaviorAttackFighter() delete m_targetInfo; delete m_currentManeuver; - m_currentManeuver = NULL; + m_currentManeuver = nullptr; } // ---------------------------------------------------------------------- @@ -265,7 +265,7 @@ void AiShipBehaviorAttackFighter::alterManeuver() } else { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::alterManeuver() owner(%s) Why does this ship in the attack state with a NULL attack target?", getAiShipController().getOwner()->getNetworkId().getValueString().c_str())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::alterManeuver() owner(%s) Why does this ship in the attack state with a nullptr attack target?", getAiShipController().getOwner()->getNetworkId().getValueString().c_str())); } if (overallHealthPercent > m_lastEvadeHealthPercent) @@ -347,7 +347,7 @@ void AiShipBehaviorAttackFighter::alterWeapons() if (!targetShipObject) { - DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target NULL?", getAiShipController().getShipOwner()->getDebugInformation().c_str())); + DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target nullptr?", getAiShipController().getShipOwner()->getDebugInformation().c_str())); return; } @@ -584,7 +584,7 @@ void AiShipBehaviorAttackFighter::alterTargetInformation() ShipObject & ownerShipObject = *NON_NULL(getAiShipController().getShipOwner()); ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject(); - if (targetShipObject != NULL) + if (targetShipObject != nullptr) { //-- Set pilot data here. AiShipPilotData const * pilotData = NON_NULL(getAiShipController().getPilotData()); @@ -600,7 +600,7 @@ void AiShipBehaviorAttackFighter::alterTargetInformation() CreatureObject const * const targetPilot = targetShipObject->getPilot(); - m_targetInfo->m_playerControlled = (targetPilot != NULL) ? targetPilot->isPlayerControlled() : false; + m_targetInfo->m_playerControlled = (targetPilot != nullptr) ? targetPilot->isPlayerControlled() : false; // Cached target info. bool const includeMissiles = true; @@ -707,7 +707,7 @@ void AiShipBehaviorAttackFighter::alterTargetInformation() } else { - DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: The primary attack target is NULL.", ownerShipObject.getDebugInformation().c_str())); + DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: The primary attack target is nullptr.", ownerShipObject.getDebugInformation().c_str())); } } @@ -956,7 +956,7 @@ void AiShipBehaviorAttackFighter::calculateNextShotPosition_w() if (!targetShipObject) { - DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target NULL?", getAiShipController().getShipOwner()->getDebugInformation().c_str())); + DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target nullptr?", getAiShipController().getShipOwner()->getDebugInformation().c_str())); return; } @@ -1014,7 +1014,7 @@ void AiShipBehaviorAttackFighter::addDebug(AiDebugString & aiDebugString) AiShipBehaviorAttackFighter::Maneuver::Path const * path = m_currentManeuver->getCurrentPath(); char pathSizeText[256]; - if (path != NULL) + if (path != nullptr) { snprintf(pathSizeText, sizeof(pathSizeText) - 1, "PATH(%d)", path->getLength()); } @@ -1027,7 +1027,7 @@ void AiShipBehaviorAttackFighter::addDebug(AiDebugString & aiDebugString) // Show the current maneuver { - char const * const text = FormattedString<512>().sprintf("attack[%s%s%s] %d %s\n", AiDebugString::getColorCode(PackedRgb::solidWhite).c_str(), (m_currentManeuver != NULL) ? m_currentManeuver->getFighterManeuverString() : "NULL", AiDebugString::getResetColorCode(), (m_currentManeuver != NULL) ? m_currentManeuver->getSequenceId() : -1, pathSizeText); + char const * const text = FormattedString<512>().sprintf("attack[%s%s%s] %d %s\n", AiDebugString::getColorCode(PackedRgb::solidWhite).c_str(), (m_currentManeuver != nullptr) ? m_currentManeuver->getFighterManeuverString() : "nullptr", AiDebugString::getResetColorCode(), (m_currentManeuver != nullptr) ? m_currentManeuver->getSequenceId() : -1, pathSizeText); aiDebugString.addText(text, PackedRgb::solidCyan); } @@ -1060,7 +1060,7 @@ void AiShipBehaviorAttackFighter::addDebug(AiDebugString & aiDebugString) // Show the maneuver path - if ( (path != NULL) + if ( (path != nullptr) && !path->isEmpty()) { AiDebugString::TransformList transformList; diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp index 17fa39ea..c3b9d975 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp @@ -72,7 +72,7 @@ AiShipBehaviorAttackFighter::Maneuver::~Maneuver() delete m_pathList; - //m_currentPath = NULL; + //m_currentPath = nullptr; } // ---------------------------------------------------------------------- @@ -128,7 +128,7 @@ void AiShipBehaviorAttackFighter::Maneuver::addPath(Path * const path) AiShipBehaviorAttackFighter::Maneuver::Path * AiShipBehaviorAttackFighter::Maneuver::getCurrentPath() { - Path * currentPath = NULL; + Path * currentPath = nullptr; if (!m_pathList->empty() && m_currentPath != m_pathList->end()) { @@ -230,7 +230,7 @@ void AiShipBehaviorAttackFighter::Maneuver::alterThrottle(float const /*timeDelt AiShipBehaviorAttackFighter::Maneuver * AiShipBehaviorAttackFighter::Maneuver::createManeuver(FighterManeuver const manueverType, AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo) { - Maneuver * aiManeuver = NULL; + Maneuver * aiManeuver = nullptr; switch(manueverType) { @@ -298,7 +298,7 @@ public: ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject(); - if (primaryTargetShipObject != NULL) + if (primaryTargetShipObject != nullptr) { float const ownerShipRadius = getAiShipController().getShipOwner()->getRadius(); float const ownerTurnRadius = getAiShipController().getLargestTurnRadius(); @@ -337,7 +337,7 @@ protected: ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject(); - if (primaryTargetShipObject != NULL) + if (primaryTargetShipObject != nullptr) { bool const facingTarget = m_aiShipBehaviorAttack.isFacingTarget(); @@ -450,7 +450,7 @@ private: { ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject(); - if (primaryTargetShipObject != NULL) + if (primaryTargetShipObject != nullptr) { AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData()); float const currentSpeed = getAiShipController().getShipOwner()->getCurrentSpeed(); @@ -665,11 +665,11 @@ private: { ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject(); - if (primaryTargetShipObject!= NULL) + if (primaryTargetShipObject!= nullptr) { ShipController const * const targetShipController = primaryTargetShipObject->getController()->asShipController(); - if (targetShipController != NULL) + if (targetShipController != nullptr) { Transform transform; Vector velocity; diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp index e8c1aede..f023331c 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp @@ -66,7 +66,7 @@ AiShipBehaviorDock::AiShipBehaviorDock(ShipController & shipController, ShipObje , m_goalPosition_w() , m_wingsOpenedBeforeDock(m_shipController.getShipOwner()->hasWings() && m_shipController.getShipOwner()->wingsOpened()) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [1/6] unit(%s) dockTarget(%s) secondsAtDock(%.2f) landingHardPoint(%s)", (shipController.getOwner() != NULL) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", dockTarget.getNetworkId().getValueString().c_str(), secondsAtDock, m_hasLandingHardPoint ? "yes" : "no")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [1/6] unit(%s) dockTarget(%s) secondsAtDock(%.2f) landingHardPoint(%s)", (shipController.getOwner() != nullptr) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner", dockTarget.getNetworkId().getValueString().c_str(), secondsAtDock, m_hasLandingHardPoint ? "yes" : "no")); if (m_shipController.isBeingDocked()) { @@ -119,7 +119,7 @@ AiShipBehaviorDock::AiShipBehaviorDock(ShipController & shipController, ShipObje ShipController * const dockTargetShipController = dockTarget.getController()->asShipController(); - if (dockTargetShipController != NULL) + if (dockTargetShipController != nullptr) { dockTargetShipController->addDockedBy(*shipController.getOwner()); } @@ -146,7 +146,7 @@ AiShipBehaviorDock::AiShipBehaviorDock(ShipController & shipController, ShipObje m_initialApproachHardPointCount = static_cast(m_approachHardPointList->size()); - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock() unit(%s) dockTarget(%s) approachHardPointCount(%u) exitHardPointCount(%u)", (shipController.getOwner() != NULL) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", dockTarget.getNetworkId().getValueString().c_str(), m_approachHardPointList->size(), m_exitHardPointList->size())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock() unit(%s) dockTarget(%s) approachHardPointCount(%u) exitHardPointCount(%u)", (shipController.getOwner() != nullptr) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner", dockTarget.getNetworkId().getValueString().c_str(), m_approachHardPointList->size(), m_exitHardPointList->size())); } // ---------------------------------------------------------------------- @@ -156,7 +156,7 @@ AiShipBehaviorDock::~AiShipBehaviorDock() // Open the wings - if ( (ownerShipObject != NULL) + if ( (ownerShipObject != nullptr) && m_wingsOpenedBeforeDock) { m_shipController.getShipOwner()->openWings(); @@ -168,7 +168,7 @@ AiShipBehaviorDock::~AiShipBehaviorDock() { CollisionCallbackManager::removeIgnoreIntersect(m_shipController.getOwner()->getNetworkId(), m_dockTarget); - if ( (ownerShipObject != NULL) + if ( (ownerShipObject != nullptr) && ownerShipObject->isPlayerShip()) { m_shipController.appendMessage(CM_removeIgnoreIntersect, 0.0f, new MessageQueueGenericValueType(m_dockTarget), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT); @@ -179,11 +179,11 @@ AiShipBehaviorDock::~AiShipBehaviorDock() Object * const dockTarget = m_dockTarget.getObject(); - if (dockTarget != NULL) + if (dockTarget != nullptr) { ShipController * const dockTargetShipController = dockTarget->getController()->asShipController(); - if (dockTargetShipController != NULL) + if (dockTargetShipController != nullptr) { dockTargetShipController->removeDockedBy(*m_shipController.getOwner()); } @@ -200,7 +200,7 @@ void AiShipBehaviorDock::alter(float deltaSeconds) bool abortDocking = false; - if (m_dockTarget.getObject() == NULL) + if (m_dockTarget.getObject() == nullptr) { // If we lose the dock target, fail the docking procedure. @@ -213,7 +213,7 @@ void AiShipBehaviorDock::alter(float deltaSeconds) AiShipController * const dockTargetAiShipController = AiShipController::asAiShipController(m_dockTarget.getObject()->getController()); - if ( (dockTargetAiShipController != NULL) + if ( (dockTargetAiShipController != nullptr) && dockTargetAiShipController->isAttacking()) { LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::alter() unit(%s) dockTarget(%s) DOCK TARGET IS ATTACKING...UNDOCKING", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str())); @@ -478,7 +478,7 @@ void AiShipBehaviorDock::triggerDocked() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner()); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(m_dockTarget); @@ -499,7 +499,7 @@ void AiShipBehaviorDock::triggerStartUnDock() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner()); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(m_dockTarget); @@ -520,7 +520,7 @@ void AiShipBehaviorDock::triggerUnDockWithSuccess() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner()); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(m_dockTarget); @@ -542,7 +542,7 @@ void AiShipBehaviorDock::triggerUnDockWithFailure() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner()); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(m_dockTarget); @@ -622,7 +622,7 @@ float AiShipBehaviorDock::getMaxTractorBeamSpeed() const float const shipActualSpeedMaximum = m_shipController.getShipOwner()->getShipActualSpeedMaximum(); AiShipController * const aiShipController = m_shipController.asAiShipController(); - return (aiShipController != NULL) ? (shipActualSpeedMaximum * aiShipController->getPilotData()->m_nonCombatMaxSpeedPercent) : shipActualSpeedMaximum; + return (aiShipController != nullptr) ? (shipActualSpeedMaximum * aiShipController->getPilotData()->m_nonCombatMaxSpeedPercent) : shipActualSpeedMaximum; } // ---------------------------------------------------------------------- @@ -676,7 +676,7 @@ void AiShipBehaviorDock::addDebug(AiDebugString & aiDebugString) aiDebugString.addLineToPosition(m_goalPosition_w, PackedRgb::solidCyan); - if (m_dockTarget.getObject() != NULL) + if (m_dockTarget.getObject() != nullptr) { Transform transform; transform.multiply(m_dockTarget.getObject()->getTransform_o2w(), m_dockHardPoint); diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp index dedc3fda..e8ca1bd5 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp @@ -45,9 +45,9 @@ AiShipBehaviorFollow::AiShipBehaviorFollow(AiShipController & aiShipController, , m_followedUnit(followedUnit) , m_followedUnitLost(false) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorFollow::AiShipBehaviorFollow() unit(%s) followedUnit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", followedUnit.getValueString().c_str())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorFollow::AiShipBehaviorFollow() unit(%s) followedUnit(%s)", (m_aiShipController.getOwner() != nullptr) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner", followedUnit.getValueString().c_str())); - DEBUG_WARNING((m_followedUnit.getObject() == NULL), ("Trying to follow a NULL object.")); + DEBUG_WARNING((m_followedUnit.getObject() == nullptr), ("Trying to follow a nullptr object.")); } // ---------------------------------------------------------------------- @@ -60,7 +60,7 @@ void AiShipBehaviorFollow::alter(float const deltaSeconds) Object * const followedUnitObject = m_followedUnit.getObject(); Vector goalPosition_w; - if (followedUnitObject != NULL) + if (followedUnitObject != nullptr) { goalPosition_w = Formation::getPosition_w(followedUnitObject->getTransform_o2w(), m_aiShipController.getFormationPosition_l()); @@ -69,9 +69,9 @@ void AiShipBehaviorFollow::alter(float const deltaSeconds) if (m_aiShipController.getOwner()->getPosition_w().magnitudeBetweenSquared(goalPosition_w) > sqr(m_aiShipController.getLargestTurnRadius() * slowDownRequestRadiusGain)) { ShipController * const shipController = followedUnitObject->getController()->asShipController(); - AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; - if (aiShipController != NULL) + if (aiShipController != nullptr) { aiShipController->requestSlowDown(); } @@ -90,7 +90,7 @@ void AiShipBehaviorFollow::alter(float const deltaSeconds) Object const * const object = m_aiShipController.getOwner(); - if (object != NULL) + if (object != nullptr) { goalPosition_w = object->getPosition_w(); } @@ -109,10 +109,10 @@ void AiShipBehaviorFollow::alter(float const deltaSeconds) void AiShipBehaviorFollow::triggerFollowedUnitLost() { Object * object = m_aiShipController.getOwner(); - ServerObject *serverObject = (object != NULL) ? object->asServerObject() : NULL; - GameScriptObject * gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL; + ServerObject *serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + GameScriptObject * gameScriptObject = (serverObject != nullptr) ? serverObject->getScriptObject() : nullptr; - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(m_followedUnit); diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp index 14d8253c..1654e5c8 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp @@ -25,7 +25,7 @@ AiShipBehaviorIdle::AiShipBehaviorIdle(AiShipController & aiShipController) : AiShipBehaviorBase(aiShipController) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorIdle() unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorIdle() unit(%s)", (m_aiShipController.getOwner() != nullptr) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner")); } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp index 68a47863..c1aa8506 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp @@ -27,7 +27,7 @@ AiShipBehaviorTrack::AiShipBehaviorTrack(AiShipController & aiShipController, Ob : AiShipBehaviorBase(aiShipController) , m_target(&target) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorTrack() unit(%s) target(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", target.getNetworkId().getValueString().c_str())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorTrack() unit(%s) target(%s)", (m_aiShipController.getOwner() != nullptr) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner", target.getNetworkId().getValueString().c_str())); } // ---------------------------------------------------------------------- @@ -36,7 +36,7 @@ void AiShipBehaviorTrack::alter(float deltaSeconds) { PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorTrack::alter"); - if (m_target != NULL) + if (m_target != nullptr) { IGNORE_RETURN(m_aiShipController.face(m_target->getPosition_w(), deltaSeconds)); } diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp index f68335b9..6302a8f9 100755 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp @@ -35,7 +35,7 @@ AiShipBehaviorWaypoint::AiShipBehaviorWaypoint(AiShipController & aiShipControll , m_cyclic(cyclic) , m_moveToCompleteTriggerSent(false) { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorWaypoint::AiShipBehaviorWaypoint() unit(%s) cyclic(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", cyclic ? "yes" : "no")); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorWaypoint::AiShipBehaviorWaypoint() unit(%s) cyclic(%s)", (aiShipController.getOwner() != nullptr) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "nullptr owner", cyclic ? "yes" : "no")); } // ---------------------------------------------------------------------- @@ -61,7 +61,7 @@ void AiShipBehaviorWaypoint::alter(float deltaSeconds) { SpacePath const * const path = m_aiShipController.getPath(); - if ( (path != NULL) + if ( (path != nullptr) && !m_cyclic && (m_aiShipController.getCurrentPathIndex() == (path->getTransformList().size() - 1))) { @@ -76,7 +76,7 @@ void AiShipBehaviorWaypoint::alter(float deltaSeconds) GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_aiShipController.getOwner()); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_MOVE_TO_COMPLETE, scriptParams)); @@ -104,13 +104,13 @@ bool AiShipBehaviorWaypoint::getNextPosition_w(Vector & position_w) SpacePath * const path = m_aiShipController.getPath(); - if ( (path != NULL) + if ( (path != nullptr) && !path->isEmpty() && (m_aiShipController.getCurrentPathIndex() < path->getTransformList().size())) { ShipObject const * const shipObject = m_aiShipController.getShipOwner(); - if (shipObject != NULL) + if (shipObject != nullptr) { SpacePath::TransformList const & transformList = path->getTransformList(); Vector const & nextPosition = getGoalPosition_w(); @@ -166,7 +166,7 @@ Vector AiShipBehaviorWaypoint::getGoalPosition_w() const SpacePath * const path = m_aiShipController.getPath(); - if ( (path != NULL) + if ( (path != nullptr) && !path->isEmpty()) { SpacePath::TransformList const & transformList = path->getTransformList(); @@ -245,7 +245,7 @@ void AiShipBehaviorWaypoint::addDebug(AiDebugString & aiDebugString) { SpacePath const * const path = m_aiShipController.getPath(); - if (path != NULL) + if (path != nullptr) { aiDebugString.addLineToPosition(m_aiShipController.getMoveToGoalPosition_w(), PackedRgb::solidGreen); aiDebugString.addCircle(m_aiShipController.getMoveToGoalPosition_w(), m_aiShipController.getLargestTurnRadius(), PackedRgb::solidGreen); diff --git a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp index 23cbc81f..cf1af6f8 100755 --- a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp @@ -124,7 +124,7 @@ void ShipTurretTargetingSystem::onTargetLost(NetworkId const & target) ShipObject * const shipObject = NON_NULL(NON_NULL(NON_NULL(m_shipController.getOwner())->asServerObject())->asShipObject()); if (!shipObject) // for release builds { - WARNING(true,("Programmer bug: got a NULL ShipObject in ShipTurretTargetingSystem::onTargetLost(). May indicate that the ShipObject has already been partially deconstructed.")); + WARNING(true,("Programmer bug: got a nullptr ShipObject in ShipTurretTargetingSystem::onTargetLost(). May indicate that the ShipObject has already been partially deconstructed.")); return; } @@ -168,7 +168,7 @@ bool ShipTurretTargetingSystem::buildTargetList() bool result = false; m_targetList->clear(); - if (ownerShipController != NULL) + if (ownerShipController != nullptr) { if (!ownerShipController->getAttackTargetList().isEmpty()) { diff --git a/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp index 99c4f3cb..9bce1404 100755 --- a/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp +++ b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp @@ -86,7 +86,7 @@ void CollisionCallbacksNamespace::remove() int CollisionCallbacksNamespace::convertObjectToIndex(Object * const object) { - FATAL(!object, ("CollisionCallbacksNamespace::convertObjectToIndex: object == NULL.")); + FATAL(!object, ("CollisionCallbacksNamespace::convertObjectToIndex: object == nullptr.")); ServerObject const * serverObject = object->asServerObject(); if (serverObject) @@ -99,11 +99,11 @@ int CollisionCallbacksNamespace::convertObjectToIndex(Object * const object) bool CollisionCallbacksNamespace::onHitDoCollisionWith(Object * const object, Object * const wasHitByThisObject) { - DEBUG_WARNING(!object, ("CollisionCallbacksNamespace::onHitDoCollisionWith: Object == NULL")); - DEBUG_WARNING(!wasHitByThisObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: wasHitByThisObject == NULL")); + DEBUG_WARNING(!object, ("CollisionCallbacksNamespace::onHitDoCollisionWith: Object == nullptr")); + DEBUG_WARNING(!wasHitByThisObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: wasHitByThisObject == nullptr")); ShipObject * shipObject = safe_cast(object); - DEBUG_WARNING(!shipObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: shipObject == NULL")); + DEBUG_WARNING(!shipObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: shipObject == nullptr")); CollisionCallbackManager::Result result; if (CollisionCallbackManager::intersectAndReflect(object, wasHitByThisObject, result)) @@ -123,10 +123,10 @@ bool CollisionCallbacksNamespace::onHitDoCollisionWith(Object * const object, Ob bool CollisionCallbacksNamespace::onDoCollisionWithTerrain(Object * const object) { - DEBUG_FATAL (!object, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: Object == NULL")); + DEBUG_FATAL (!object, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: Object == nullptr")); ShipObject * shipObject = safe_cast(object); - DEBUG_FATAL (!shipObject, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: shipObject == NULL")); + DEBUG_FATAL (!shipObject, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: shipObject == nullptr")); CollisionCallbackManager::Result result; if (CollisionCallbackManager::intersectAndReflectWithTerrain(object, result)) diff --git a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp index ff3f058c..f39fcae2 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp +++ b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp @@ -145,13 +145,13 @@ namespace CommandCppFuncsNamespace void internalSetBoosterOnOff(NetworkId const & actor, bool onOff) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; - if (actorCreature == NULL) + if (actorCreature == nullptr) return; ShipObject * const shipObject = actorCreature->getPilotedShip(); - if (shipObject == NULL) + if (shipObject == nullptr) return; if (!shipObject->isSlotInstalled(ShipChassisSlotType::SCST_booster)) @@ -212,22 +212,22 @@ namespace CommandCppFuncsNamespace CreatureObject * findAndResolveCreatureByNetworkId(NetworkId const & targetId) { - CreatureObject * targetCreatureObject = NULL; + CreatureObject * targetCreatureObject = nullptr; { // find the target. the target could be either a creature or ship ServerObject * const serverObject = ServerWorld::findObjectByNetworkId(targetId); - targetCreatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL; + targetCreatureObject = (serverObject != nullptr) ? serverObject->asCreatureObject() : nullptr; - if (targetCreatureObject == NULL) + if (targetCreatureObject == nullptr) { - ShipObject * const shipObject = (serverObject != NULL) ? serverObject->asShipObject() : NULL; + ShipObject * const shipObject = (serverObject != nullptr) ? serverObject->asShipObject() : nullptr; - if (shipObject != NULL) + if (shipObject != nullptr) { targetCreatureObject = shipObject->getPilot(); - if (targetCreatureObject == NULL) + if (targetCreatureObject == nullptr) { // this means that it is a POB ship that doesn't have a pilot // in this case we find the owner @@ -237,7 +237,7 @@ namespace CommandCppFuncsNamespace std::vector::const_iterator ii = passengers.begin(); std::vector::const_iterator iiEnd = passengers.end(); - for (; ii != iiEnd && targetCreatureObject == NULL; ++ii) + for (; ii != iiEnd && targetCreatureObject == nullptr; ++ii) { if ((*ii)->getNetworkId() == shipObject->getOwnerId()) { @@ -290,7 +290,7 @@ namespace CommandCppFuncsNamespace Container::ContainerErrorCode errorCode = Container::CEC_Success; for (std::vector >::const_iterator i = oldItems.begin(); i != oldItems.end(); ++i) { - IGNORE_RETURN(ContainerInterface::transferItemToSlottedContainer(destination, *((*i).first), (*i).second, NULL, errorCode)); + IGNORE_RETURN(ContainerInterface::transferItemToSlottedContainer(destination, *((*i).first), (*i).second, nullptr, errorCode)); } } @@ -411,7 +411,7 @@ void CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip(CreatureObject * { if (creatureObject == 0) { - WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: NULL CreatureObject.")); + WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: nullptr CreatureObject.")); return; } @@ -424,7 +424,7 @@ void CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip(CreatureObject * } else { - WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: NULL ScriptObject.")); + WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: nullptr ScriptObject.")); } } @@ -432,7 +432,7 @@ void CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip(CreatureObject * TravelPoint const * CommandCppFuncsNamespace::GroupHelpers::getNearestTravelPoint(std::string const & planetName, Vector const & location, std::vector const & cityBanList, uint32 faction, bool starPortAndShuttleportOnly) { - TravelPoint const * nearestTravelPoint = NULL; + TravelPoint const * nearestTravelPoint = nullptr; PlanetObject const * const planetObject = ServerUniverse::getInstance().getPlanetByName(planetName); if (planetObject) { @@ -537,7 +537,7 @@ static NetworkId nextOidParm(Unicode::String const &str, size_t &curpos) static float nextFloatParm(Unicode::String const &str, size_t &curpos) { - return static_cast(strtod(nextStringParm(str, curpos).c_str(), NULL)); + return static_cast(strtod(nextStringParm(str, curpos).c_str(), nullptr)); } @@ -821,7 +821,7 @@ static void commandFuncLocateStructure(Command const &, NetworkId const &actor, ownerId = actor; } - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!isGod && actorObj->getObjVars().hasItem("timeNextLocateStructureCommandAllowed") && (actorObj->getObjVars().getType("timeNextLocateStructureCommandAllowed") == DynamicVariable::INT)) { int timeNextLocateStructureCommandAllowed = 0; @@ -889,7 +889,7 @@ static void commandFuncLocateVendor(Command const &, NetworkId const &actor, Net ownerId = actor; } - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!isGod && actorObj->getObjVars().hasItem("timeNextLocateVendorCommandAllowed") && (actorObj->getObjVars().getType("timeNextLocateVendorCommandAllowed") == DynamicVariable::INT)) { int timeNextLocateVendorCommandAllowed = 0; @@ -956,7 +956,7 @@ static void commandFuncShowCtsHistory(Command const &, NetworkId const &actor, N if (target != actor) { targetObj = dynamic_cast(ServerWorld::findObjectByNetworkId(target)); - targetPlayerObj = (targetObj ? PlayerCreatureController::getPlayerObject(targetObj) : NULL); + targetPlayerObj = (targetObj ? PlayerCreatureController::getPlayerObject(targetObj) : nullptr); if (!targetPlayerObj) { ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("%s is not a valid or nearby player character.", target.getValueString().c_str()), clientObj); @@ -980,7 +980,7 @@ static void commandFuncShowCtsHistory(Command const &, NetworkId const &actor, N if (i.getValue(ctsTransactionDetail)) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4)) + if (Unicode::tokenize(ctsTransactionDetail, tokens, nullptr, nullptr) && (tokens.size() >= 4)) { Unicode::String characterName; for (size_t i = 3, j = tokens.size(); i < j; ++i) @@ -1196,7 +1196,7 @@ static void commandFuncAdminEditBank(Command const &cmd, NetworkId const &actor, CreatureObject * targetCreature = safe_cast(ServerWorld::findObjectByNetworkId(target)); if (!targetCreature || !actorCreature) { - DEBUG_REPORT_LOG(true, ("Received open command for null player or target.\n")); + DEBUG_REPORT_LOG(true, ("Received open command for nullptr player or target.\n")); return; } @@ -1241,14 +1241,14 @@ static void commandFuncAdminEditStats(Command const &, NetworkId const &actor, N CreatureObject* const creatureActor = dynamic_cast(NetworkIdManager::getObjectById (actor)); if (!creatureActor) { - WARNING (true, ("commandFuncAdminEditStats: null actor")); + WARNING (true, ("commandFuncAdminEditStats: nullptr actor")); return; } CreatureObject* const creatureTarget = dynamic_cast(NetworkIdManager::getObjectById (target)); if (!creatureTarget) { - WARNING (true, ("commandFuncAdminEditStats: null target")); + WARNING (true, ("commandFuncAdminEditStats: nullptr target")); return; } @@ -1265,14 +1265,14 @@ static void commandFuncAdminEditAppearance(Command const &, NetworkId const &act CreatureObject* const creatureActor = dynamic_cast(NetworkIdManager::getObjectById (actor)); if (!creatureActor) { - WARNING (true, ("commandFuncAdminEditAppearance: null actor")); + WARNING (true, ("commandFuncAdminEditAppearance: nullptr actor")); return; } CreatureObject* const creatureTarget = dynamic_cast(NetworkIdManager::getObjectById (target)); if (!creatureTarget) { - WARNING (true, ("commandFuncAdminEditAppearance: null target")); + WARNING (true, ("commandFuncAdminEditAppearance: nullptr target")); return; } @@ -1819,7 +1819,7 @@ static void commandFuncSpatialChatInternal(Command const &, NetworkId const &act else if (!squelched && (ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds() > 0) && obj->getClient()) { // send message telling character he can no longer talk - const int timeNow = static_cast(::time(NULL)); + const int timeNow = static_cast(::time(nullptr)); const int chatSpamTimeEndInterval = playerObject->getChatSpamTimeEndInterval(); if ((chatSpamTimeEndInterval > timeNow) && (timeNow >= playerObject->getChatSpamNextTimeToNotifyPlayerWhenLimited())) { @@ -1837,7 +1837,7 @@ static void commandFuncSpatialChatInternal(Command const &, NetworkId const &act // ---------------------------------------------------------------------- /** -* Parameters: [null terminator + oob] +* Parameters: [nullptr terminator + oob] * All parameters are strings */ @@ -1957,7 +1957,7 @@ static void commandFuncSpatialChat(Command const &, NetworkId const &actor, Netw else if (!squelched && (ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds() > 0) && obj->getClient()) { // send message telling character he can no longer talk - const int timeNow = static_cast(::time(NULL)); + const int timeNow = static_cast(::time(nullptr)); const int chatSpamTimeEndInterval = playerObject->getChatSpamTimeEndInterval(); if ((chatSpamTimeEndInterval > timeNow) && (timeNow >= playerObject->getChatSpamNextTimeToNotifyPlayerWhenLimited())) { @@ -1992,7 +1992,7 @@ static void commandFuncCombatSpam (Command const &, NetworkId const &actor, Netw ServerObject * const obj = safe_cast(actorId.getObject ()); if (!obj) { - WARNING (true, ("null actor in commandFuncCombatSpam")); + WARNING (true, ("nullptr actor in commandFuncCombatSpam")); return; } @@ -2213,10 +2213,10 @@ static void commandFuncSetWaypointName(Command const &, NetworkId const & actor, static void commandSetPosture(Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const &) { CachedNetworkId actorId(actor); - if (actorId.getObject() != NULL) + if (actorId.getObject() != nullptr) { CreatureController * const controller = dynamic_cast(actorId.getObject()->getController()); - if (controller != NULL) + if (controller != nullptr) { CreatureObject * const creature = safe_cast(actorId.getObject()); NOT_NULL (creature); @@ -2247,15 +2247,15 @@ static void commandSetPosture(Command const &command, NetworkId const &actor, Ne static void commandFuncJumpServer(Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const &) { CachedNetworkId actorId(actor); - if (actorId.getObject() != NULL) + if (actorId.getObject() != nullptr) { CreatureController * const controller = dynamic_cast(actorId.getObject()->getController()); - if (controller != NULL) + if (controller != nullptr) { controller->appendMessage( CM_jump, 0.0f, - NULL, + nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT @@ -2621,7 +2621,7 @@ static void commandFuncEndDuel(Command const &, NetworkId const &actor, NetworkI params.addParam(targetObj->getNetworkId(), "target"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(actorFlagObj->getNetworkId(), @@ -2634,7 +2634,7 @@ static void commandFuncEndDuel(Command const &, NetworkId const &actor, NetworkI params.addParam(actorFlagObj->getNetworkId(), "target"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(targetObj->getNetworkId(), @@ -2867,7 +2867,7 @@ static void commandFuncFactoryCrateSplit(Command const &, NetworkId const &actor const int amount = nextIntParm(params,pos); const CachedNetworkId destContainerId (nextOidParm(params,pos)); ServerObject * destContainer = safe_cast(destContainerId.getObject()); - if (destContainer == NULL || ContainerInterface::getVolumeContainer(*destContainer) == NULL) + if (destContainer == nullptr || ContainerInterface::getVolumeContainer(*destContainer) == nullptr) { ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_NotFound); return; @@ -2878,7 +2878,7 @@ static void commandFuncFactoryCrateSplit(Command const &, NetworkId const &actor { ContainerInterface::sendContainerMessageToClient(*player, error, sourceObj); } - else if (sourceObj->makeCopy(*destContainer, amount) == NULL) + else if (sourceObj->makeCopy(*destContainer, amount) == nullptr) { ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_Full, destContainer); @@ -2952,7 +2952,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net if (!playerSo || !item) { - DEBUG_REPORT_LOG(true, ("Received transfer item command for null player or target.\n")); + DEBUG_REPORT_LOG(true, ("Received transfer item command for nullptr player or target.\n")); return; } @@ -3185,7 +3185,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net retval = false; } - else if (destination == player->getAppearanceInventory() && ContainerInterface::getContainer(*item) != NULL) + else if (destination == player->getAppearanceInventory() && ContainerInterface::getContainer(*item) != nullptr) { const Container * itemContainer = ContainerInterface::getContainer(*item); if(itemContainer && itemContainer->getNumberOfItems() == 0) @@ -3215,7 +3215,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net const SlottedContainer * equipment = ContainerInterface::getSlottedContainer(*player); const SlottedContainmentProperty * itemContainmentProperty = ContainerInterface::getSlottedContainmentProperty(*item); - if (inventory != NULL && equipment != NULL && itemContainmentProperty != NULL) + if (inventory != nullptr && equipment != nullptr && itemContainmentProperty != nullptr) { std::vector > oldItems; retval = true; @@ -3225,7 +3225,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net SlotId slot = itemContainmentProperty->getSlotId(arrangement, i); const Container::ContainedItem & currentWeaponId = equipment->getObjectInSlot(slot, errorCode); ServerObject * oldItem = safe_cast(currentWeaponId.getObject()); - if (oldItem != NULL) + if (oldItem != nullptr) { if (ContainerInterface::transferItemToVolumeContainer(*inventory, *oldItem, player, errorCode, true)) { @@ -3280,7 +3280,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net SlotId slot = itemContainmentProperty->getSlotId(arrangement, i); const Container::ContainedItem & currentWeaponId = equipment->getObjectInSlot(slot, errorCode); ServerObject * oldItem = safe_cast(currentWeaponId.getObject()); - if (oldItem != NULL) + if (oldItem != nullptr) { if( std::find(objectsToSend.begin(), objectsToSend.end(), oldItem) == objectsToSend.end() ) objectsToSend.push_back(oldItem); @@ -3291,7 +3291,7 @@ static void commandFuncTransferItem(Command const &, NetworkId const &actor, Net for(; iter != objectsToSend.end(); ++iter) { // No idea how this could happen, but just incase. - if((*iter) == NULL) + if((*iter) == nullptr) continue; StringId const code("container_error_message", "container32_prose"); @@ -3411,7 +3411,7 @@ static void commandFuncOpenContainer(Command const & cmd, NetworkId const &actor CreatureObject * player = safe_cast(ServerWorld::findObjectByNetworkId(actor)); if (!container || !player) { - DEBUG_REPORT_LOG(true, ("Received open command for null player or target.\n")); + DEBUG_REPORT_LOG(true, ("Received open command for nullptr player or target.\n")); return; } //@todo check permissions @@ -3428,14 +3428,14 @@ static void commandFuncOpenContainer(Command const & cmd, NetworkId const &actor //-- if they are opening a crafting station, what they really want is the hopper //-- but only if the object is not a volume container if (container->getGameObjectType () == SharedObjectTemplate::GOT_misc_crafting_station - && (NULL == ContainerInterface::getVolumeContainer (*container))) + && (nullptr == ContainerInterface::getVolumeContainer (*container))) { static const SlotId inputHopperId(SlotIdManager::findSlotId(CrcLowerString("ingredient_hopper"))); ServerObject const * const station = container; - ServerObject * hopper = NULL; + ServerObject * hopper = nullptr; const SlottedContainer * stationContainer = ContainerInterface::getSlottedContainer (*station); - if (stationContainer != NULL) + if (stationContainer != nullptr) { Container::ContainerErrorCode tmp = Container::CEC_Success; Object* tmpHopperObj = (stationContainer->getObjectInSlot (inputHopperId, tmp)).getObject(); @@ -3526,7 +3526,7 @@ static void commandFuncCloseContainer(Command const &, NetworkId const &actor, N ServerObject * const player = ServerWorld::findObjectByNetworkId(actor); if (!container || !player) { - DEBUG_REPORT_LOG(true, ("Received close command for null player or target.\n")); + DEBUG_REPORT_LOG(true, ("Received close command for nullptr player or target.\n")); return; } @@ -3615,7 +3615,7 @@ static void commandFuncGiveItem(Command const &, NetworkId const &actor, Network ServerObject * const player = ServerWorld::findObjectByNetworkId(actor); if (!player || !item) { - DEBUG_REPORT_LOG(true, ("Received give item command for null player or target.\n")); + DEBUG_REPORT_LOG(true, ("Received give item command for nullptr player or target.\n")); return; } size_t curpos = 0; @@ -3669,10 +3669,10 @@ static void commandFuncGiveItem(Command const &, NetworkId const &actor, Network // check and see if this is a gem->socket operation, which is handled by our code TangibleObject * const socket = dynamic_cast(destination); - if (socket != NULL) + if (socket != nullptr) { TangibleObject * const gem = dynamic_cast(item); - if (gem != NULL) + if (gem != nullptr) { const int destGot = socket->getGameObjectType(); const SharedTangibleObjectTemplate * const gemTemplate = safe_cast(gem->getSharedTemplate()); @@ -3692,13 +3692,13 @@ static void commandFuncGiveItem(Command const &, NetworkId const &actor, Network } // if the socketed item is equipped, unequip it temporarily - CreatureObject * owner = NULL; + CreatureObject * owner = nullptr; Object * container = ContainerInterface::getContainedByObject(*socket); - if (container != NULL && container->asServerObject()->asCreatureObject() != NULL) + if (container != nullptr && container->asServerObject()->asCreatureObject() != nullptr) { owner = container->asServerObject()->asCreatureObject(); // fake unequipping the item - owner->onContainerLostItem(NULL, *socket, NULL); + owner->onContainerLostItem(nullptr, *socket, nullptr); } std::vector > skillModBonuses; @@ -3713,10 +3713,10 @@ static void commandFuncGiveItem(Command const &, NetworkId const &actor, Network // tell the player they can't use the gem Chat::sendSystemMessage(*player, SharedStringIds::gem_not_inserted, Unicode::emptyString); } - if (owner != NULL) + if (owner != nullptr) { // "re-equip" the item - owner->onContainerGainItem(*socket, NULL, NULL); + owner->onContainerGainItem(*socket, nullptr, nullptr); } return; } @@ -4138,7 +4138,7 @@ static void commandFuncGroupDisband(Command const &, NetworkId const &actor, Net { GroupMemberParam const & leader = *ii; - // create the new POB groups. notice NULL is passed in for the + // create the new POB groups. notice nullptr is passed in for the // groupToRemoveFrom because the original group has already had // all of the members removed @@ -4389,7 +4389,7 @@ static void commandFuncCreateGroupPickup(Command const &, NetworkId const &actor } // create the group pickup point - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); groupObj->setGroupPickupTimer(timeNow, timeNow + static_cast(ConfigServerGame::getGroupPickupPointTimeLimitSeconds())); groupObj->setGroupPickupLocation(currentScene, currentWorldLocation); @@ -4682,7 +4682,7 @@ static void commandFuncGroupPickRandomGroupMember(Command const &, NetworkId con if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGroupPickRandomGroupMemberCommandAllowed") && (targetObj->getObjVars().getType("timeNextGroupPickRandomGroupMemberCommandAllowed") == DynamicVariable::INT)) { int timeNextGroupPickRandomGroupMemberCommandAllowed = 0; @@ -4703,7 +4703,7 @@ static void commandFuncGroupPickRandomGroupMember(Command const &, NetworkId con if (!params.empty()) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::toLower(params), tokens, nullptr, nullptr) && !tokens.empty()) { static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point"); static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point"); @@ -4805,7 +4805,7 @@ static void commandFuncGroupTextChatRoomRejoin(Command const &, NetworkId const if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGroupTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextGroupTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT)) { int timeNextGroupTextChatRoomRejoinCommandAllowed = 0; @@ -4868,7 +4868,7 @@ static void commandFuncGuildTextChatRoomRejoin(Command const &, NetworkId const if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGuildTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextGuildTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT)) { int timeNextGuildTextChatRoomRejoinCommandAllowed = 0; @@ -4913,7 +4913,7 @@ static void commandFuncGuildPickRandomGuildMember(Command const &, NetworkId con if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGuildPickRandomGuildMemberCommandAllowed") && (targetObj->getObjVars().getType("timeNextGuildPickRandomGuildMemberCommandAllowed") == DynamicVariable::INT)) { int timeNextGuildPickRandomGuildMemberCommandAllowed = 0; @@ -4935,7 +4935,7 @@ static void commandFuncGuildPickRandomGuildMember(Command const &, NetworkId con if (!params.empty()) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::toLower(params), tokens, nullptr, nullptr) && !tokens.empty()) { static Unicode::String const paramsOnline1 = Unicode::narrowToWide("-online"); static Unicode::String const paramsOnline2 = Unicode::narrowToWide("online"); @@ -5074,7 +5074,7 @@ static void commandFuncCityTextChatRoomRejoin(Command const &, NetworkId const & if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextCityTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextCityTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT)) { int timeNextCityTextChatRoomRejoinCommandAllowed = 0; @@ -5120,7 +5120,7 @@ static void commandFuncCityPickRandomCitizen(Command const &, NetworkId const &a if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextCityPickRandomCitizenCommandAllowed") && (targetObj->getObjVars().getType("timeNextCityPickRandomCitizenCommandAllowed") == DynamicVariable::INT)) { int timeNextCityPickRandomCitizenCommandAllowed = 0; @@ -5142,7 +5142,7 @@ static void commandFuncCityPickRandomCitizen(Command const &, NetworkId const &a if (!params.empty()) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::toLower(params), tokens, nullptr, nullptr) && !tokens.empty()) { static Unicode::String const paramsOnline1 = Unicode::narrowToWide("-online"); static Unicode::String const paramsOnline2 = Unicode::narrowToWide("online"); @@ -5272,7 +5272,7 @@ static void commandFuncPlaceStructure (const Command& /*command*/, const Network Object* const object = NetworkIdManager::getObjectById (actor); if (!object) { - DEBUG_WARNING (true, ("commandFuncPlaceStructure: PB null actor\n")); + DEBUG_WARNING (true, ("commandFuncPlaceStructure: PB nullptr actor\n")); return; } @@ -5478,9 +5478,9 @@ static void commandFuncPurchaseTicket (const Command& /*command*/, const Network static void commandFuncRequestResourceWeights(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestResourceWeights: PB null actor")); + WARNING (true, ("commandFuncRequestResourceWeights: PB nullptr actor")); return; } @@ -5494,9 +5494,9 @@ static void commandFuncRequestResourceWeights(const Command& , const NetworkId& static void commandFuncRequestResourceWeightsBatch(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = dynamic_cast(NetworkIdManager::getObjectById (actor)); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestResourceWeightsBatch: PB null actor")); + WARNING (true, ("commandFuncRequestResourceWeightsBatch: PB nullptr actor")); return; } @@ -5516,14 +5516,14 @@ static void commandFuncRequestResourceWeightsBatch(const Command& , const Networ static void commandFuncRequestDraftSlots (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestDraftSlots: PB null actor")); + WARNING (true, ("commandFuncRequestDraftSlots: PB nullptr actor")); return; } PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncRequestDraftSlots: no player object for actor ""%s", actor.getValueString().c_str())); return; @@ -5533,7 +5533,7 @@ static void commandFuncRequestDraftSlots (const Command& , const NetworkId& acto sscanf(Unicode::wideToNarrow(params).c_str(), "%lu %lu", &serverCrc, &sharedCrc); MessageQueueDraftSlotsQueryResponse * const message = new MessageQueueDraftSlotsQueryResponse(std::make_pair(serverCrc, sharedCrc)); - if (!player->requestDraftSlots(serverCrc, NULL, message)) + if (!player->requestDraftSlots(serverCrc, nullptr, message)) { WARNING (true, ("commandFuncRequestDraftSlots failed to request draft slots for %u", serverCrc)); delete message; @@ -5545,14 +5545,14 @@ static void commandFuncRequestDraftSlots (const Command& , const NetworkId& acto static void commandFuncRequestDraftSlotsBatch (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestDraftSlotsBatch: PB null actor")); + WARNING (true, ("commandFuncRequestDraftSlotsBatch: PB nullptr actor")); return; } PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncRequestDraftSlotsBatch: no player object for actor ""%s", actor.getValueString().c_str())); return; @@ -5575,7 +5575,7 @@ static void commandFuncRequestDraftSlotsBatch (const Command& , const NetworkId& while(uServerCrc != 0 && uSharedCrc != 0 && !done) { MessageQueueDraftSlotsQueryResponse * const message = new MessageQueueDraftSlotsQueryResponse(std::make_pair(uServerCrc, uSharedCrc)); - if (!player->requestDraftSlots(uServerCrc, NULL, message)) + if (!player->requestDraftSlots(uServerCrc, nullptr, message)) { WARNING (true, ("commandFuncRequestDraftSlotsBatch failed to request draft slots for %lu", uServerCrc)); delete message; @@ -5596,15 +5596,15 @@ static void commandFuncRequestDraftSlotsBatch (const Command& , const NetworkId& static void commandFuncRequestManfSchematicSlots (const Command& , const NetworkId& actor, const NetworkId& target, const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestDraftSlots: PB null actor")); + WARNING (true, ("commandFuncRequestDraftSlots: PB nullptr actor")); return; } const ManufactureSchematicObject * schematic = dynamic_cast< const ManufactureSchematicObject *>(NetworkIdManager::getObjectById(target)); - if (schematic != NULL) + if (schematic != nullptr) { schematic->requestSlots(*creature); } @@ -5615,14 +5615,14 @@ static void commandFuncRequestManfSchematicSlots (const Command& , const Network static void commandFuncRequestCraftingSession (const Command& , const NetworkId& actor, const NetworkId& target, const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRequestCraftingSession: PB null actor")); + WARNING (true, ("commandFuncRequestCraftingSession: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncRequestCraftingSession: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5668,14 +5668,14 @@ static void commandFuncRequestCraftingSessionFail(Command const &, NetworkId con static void commandFuncSelectDraftSchematic (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncSelectDraftSchematic: PB null actor")); + WARNING (true, ("commandFuncSelectDraftSchematic: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncSelectDraftSchematic: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5692,14 +5692,14 @@ static void commandFuncSelectDraftSchematic (const Command& , const NetworkId& a static void commandFuncNextCraftingStage(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncNextCraftingStage: PB null actor")); + WARNING (true, ("commandFuncNextCraftingStage: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncNextCraftingStage: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5722,14 +5722,14 @@ static void commandFuncNextCraftingStage(const Command& , const NetworkId& actor static void commandFuncCreatePrototype(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncCreatePrototype: PB null actor")); + WARNING (true, ("commandFuncCreatePrototype: PB nullptr actor")); return; } PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncCreatePrototype: no player object for actor %s", actor.getValueString().c_str())); return; @@ -5756,14 +5756,14 @@ static void commandFuncCreatePrototype(const Command& , const NetworkId& actor, static void commandFuncCreateManfSchematic(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncCreateManfSchematic: PB null actor")); + WARNING (true, ("commandFuncCreateManfSchematic: PB nullptr actor")); return; } PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncCreateManfSchematic: no player object for actor %s", actor.getValueString().c_str())); return; @@ -5788,14 +5788,14 @@ static void commandFuncCreateManfSchematic(const Command& , const NetworkId& act static void commandFuncCancelCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncCancelCraftingSession: PB null actor")); + WARNING (true, ("commandFuncCancelCraftingSession: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncCancelCraftingSession: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5810,14 +5810,14 @@ static void commandFuncCancelCraftingSession(const Command& , const NetworkId& a static void commandFuncStopCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncStopCraftingSession: PB null actor")); + WARNING (true, ("commandFuncStopCraftingSession: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncStopCraftingSession: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5832,14 +5832,14 @@ static void commandFuncStopCraftingSession(const Command& , const NetworkId& act static void commandFuncRestartCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRestartCraftingSession: PB null actor")); + WARNING (true, ("commandFuncRestartCraftingSession: PB nullptr actor")); return; } PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) { WARNING (true, ("commandFuncRestartCraftingSession: no player object for actor " "%s", actor.getValueString().c_str())); @@ -5866,7 +5866,7 @@ static void commandFuncSetMatchMakingPersonalId(Command const &, NetworkId const PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { MatchMakingId matchMakingId; matchMakingId.unPackIntString(Unicode::wideToNarrow(params)); @@ -5885,7 +5885,7 @@ static void commandFuncSetMatchMakingCharacterId(Command const &, NetworkId cons PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { MatchMakingId matchMakingId; matchMakingId.unPackIntString(Unicode::wideToNarrow(params)); @@ -5902,7 +5902,7 @@ static void commandFuncAddFriend(Command const &, NetworkId const &actor, Networ { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { size_t pos = 0; std::string name(nextStringParm(params, pos)); @@ -5924,7 +5924,7 @@ static void commandFuncRemoveFriend(Command const &, NetworkId const &actor, Net { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { size_t pos = 0; std::string name(nextStringParm(params, pos)); @@ -5946,7 +5946,7 @@ static void commandFuncGetFriendList(Command const &, NetworkId const &actor, Ne { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { std::string player(Chat::constructChatAvatarId(*serverObject).getFullName()); @@ -5962,7 +5962,7 @@ static void commandFuncAddIgnore(Command const &, NetworkId const &actor, Networ { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { size_t pos = 0; std::string name(nextStringParm(params, pos)); @@ -5984,7 +5984,7 @@ static void commandFuncRemoveIgnore(Command const &, NetworkId const &actor, Net { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { size_t pos = 0; std::string name(nextStringParm(params, pos)); @@ -6006,7 +6006,7 @@ static void commandFuncGetIgnoreList(Command const &, NetworkId const &actor, Ne { ServerObject * const serverObject = ServerObject::getServerObject(actor); - if (serverObject != NULL) + if (serverObject != nullptr) { std::string player(Chat::constructChatAvatarId(*serverObject).getFullName()); @@ -6022,7 +6022,7 @@ static void commandFuncRequestBiography(Command const &, NetworkId const &actor, { CreatureObject * const creatureObject = CreatureObject::getCreatureObject(actor); - if (creatureObject != NULL) + if (creatureObject != nullptr) { BiographyManager::requestBiography(target, creatureObject); } @@ -6069,9 +6069,9 @@ static void commandFuncSetBiography(Command const &, NetworkId const & actor, Ne static void commandFuncRequestCharacterSheetInfo(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &) { const CreatureObject* const creatureActor = CreatureObject::getCreatureObject(actor); - if (creatureActor == NULL) + if (creatureActor == nullptr) { - WARNING (true, ("commandFuncRequestCharacterSheetInfo: null actor")); + WARNING (true, ("commandFuncRequestCharacterSheetInfo: nullptr actor")); return; } @@ -6090,7 +6090,7 @@ static void commandFuncRequestCharacterSheetInfo(Command const &, NetworkId cons if(bindId != NetworkId::cms_invalid) { const ServerObject* const bindObject = ServerObject::getServerObject(bindId); - if (bindObject != NULL) + if (bindObject != nullptr) { bindLoc = bindObject->getPosition_w(); bindPlanet = bindObject->getSceneId(); @@ -6142,7 +6142,7 @@ static void commandFuncRequestCharacterSheetInfo(Command const &, NetworkId cons houseNetworkId = cityHallOfMayorCity; const ServerObject* const resObject = ServerObject::getServerObject(houseNetworkId); - if (resObject != NULL) + if (resObject != nullptr) { resLoc = resObject->getPosition_w(); resPlanet = ServerWorld::getSceneId(); @@ -6201,13 +6201,13 @@ static void commandFuncRequestCharacterMatch(Command const &, NetworkId const &a static void commandFuncExtractObject(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const ¶ms) { CreatureObject* const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncExtractObject: PB null actor")); + WARNING (true, ("commandFuncExtractObject: PB nullptr actor")); return; } - if (creature->getInventory() == NULL) + if (creature->getInventory() == nullptr) { WARNING (true, ("commandFuncExtractObject: actor %s has no inventory", actor.getValueString().c_str())); @@ -6215,9 +6215,9 @@ static void commandFuncExtractObject(Command const &, NetworkId const &actor, Ne } FactoryObject* const factory = dynamic_cast(NetworkIdManager::getObjectById (target)); - if (factory == NULL) + if (factory == nullptr) { - WARNING (true, ("commandFuncExtractObject: PB null target")); + WARNING (true, ("commandFuncExtractObject: PB nullptr target")); return; } @@ -6233,16 +6233,16 @@ static void commandFuncExtractObject(Command const &, NetworkId const &actor, Ne static void commandFuncRevokeSkill(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const ¶ms) { CreatureObject * const creature = CreatureObject::getCreatureObject(actor); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRevokeSkill: PB null actor")); + WARNING (true, ("commandFuncRevokeSkill: PB nullptr actor")); return; } size_t pos = 0; std::string skillName = nextStringParm(params, pos); const SkillObject * skill = SkillManager::getInstance ().getSkill (skillName); - if (skill == NULL) + if (skill == nullptr) { WARNING (true, ("commandFuncRevokeSkill: can't revoke bad skill")); } @@ -6261,7 +6261,7 @@ static void commandFuncSetCurrentSkillTitle(Command const &, NetworkId const &ac CreatureObject * const creatureObject = CreatureObject::getCreatureObject(actor); PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject != NULL) + if (playerObject != nullptr) { size_t pos = 0; std::string const &title = nextStringParm(params, pos); @@ -6378,7 +6378,7 @@ static void commandFuncSetCurrentSkillTitle(Command const &, NetworkId const &ac { SkillObject const *skillObject = (*iterSkillList); - if ( (skillObject != NULL) + if ( (skillObject != nullptr) && skillObject->isTitle() && (skillObject->getSkillName() == title)) { @@ -6402,16 +6402,16 @@ static void commandFuncSetCurrentSkillTitle(Command const &, NetworkId const &ac static void commandFuncRepair(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const ¶ms) { CreatureObject* const creature = dynamic_cast(NetworkIdManager::getObjectById (actor)); - if (creature == NULL) + if (creature == nullptr) { - WARNING (true, ("commandFuncRepair: PB null actor")); + WARNING (true, ("commandFuncRepair: PB nullptr actor")); return; } TangibleObject* const object = dynamic_cast(NetworkIdManager::getObjectById (target)); - if (object == NULL) + if (object == nullptr) { - WARNING (true, ("commandFuncRepair: PB null target")); + WARNING (true, ("commandFuncRepair: PB nullptr target")); return; } } @@ -6424,7 +6424,7 @@ static void commandFuncToggleSearchableByCtsSourceGalaxy(Command const &, Networ PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleSearchableByCtsSourceGalaxy(); } @@ -6438,7 +6438,7 @@ static void commandFuncToggleDisplayLocationInSearchResults(Command const &, Net PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleDisplayLocationInSearchResults(); } @@ -6452,7 +6452,7 @@ static void commandFuncToggleAnonymous(Command const &, NetworkId const &actor, PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleAnonymous(); } @@ -6466,7 +6466,7 @@ static void commandFuncToggleHelper(Command const &, NetworkId const &actor, Net PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleHelper(); } @@ -6480,7 +6480,7 @@ static void commandFuncToggleRolePlay(Command const &, NetworkId const &actor, N PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleRolePlay(); } @@ -6493,7 +6493,7 @@ static void commandFuncToggleOutOfCharacter(Command const &, NetworkId const &ac { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleOutOfCharacter(); } @@ -6505,7 +6505,7 @@ static void commandFuncToggleLookingForWork(Command const &, NetworkId const &ac { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleLookingForWork(); } @@ -6520,7 +6520,7 @@ static void commandFuncToggleLookingForGroup(Command const &, NetworkId const &a PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleLookingForGroup(); } @@ -6534,7 +6534,7 @@ static void commandFuncToggleAwayFromKeyBoard(Command const &, NetworkId const & PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleAwayFromKeyBoard(); } @@ -6546,7 +6546,7 @@ static void commandFuncToggleDisplayingFactionRank(Command const &, NetworkId co { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor)); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->toggleDisplayingFactionRank(); } @@ -6558,7 +6558,7 @@ static void commandFuncReport(Command const &, NetworkId const &actor, NetworkId { CreatureObject const * const reportingCreatureObject = CreatureObject::getCreatureObject(actor); - if (reportingCreatureObject != NULL) + if (reportingCreatureObject != nullptr) { if (ReportManager::isThrottled(actor)) { @@ -6635,16 +6635,16 @@ static void commandFuncReport(Command const &, NetworkId const &actor, NetworkId static void commandFuncNpcConversationStart(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const ¶ms) { ServerObject * const actorObject = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const player = actorObject != NULL ? actorObject->asCreatureObject() : NULL; - if (player == NULL) + CreatureObject * const player = actorObject != nullptr ? actorObject->asCreatureObject() : nullptr; + if (player == nullptr) { DEBUG_WARNING(true, ("commandFuncNpcConversationStart: couldn't find actor")); return; } ServerObject * const npcObject = safe_cast(NetworkIdManager::getObjectById(target)); - TangibleObject * const npc = npcObject != NULL ? npcObject->asTangibleObject() : NULL; - if (npc == NULL) + TangibleObject * const npc = npcObject != nullptr ? npcObject->asTangibleObject() : nullptr; + if (npc == nullptr) { DEBUG_WARNING(true, ("commandFuncNpcConversationStart: Couldn't find npc to converse with")); return; @@ -6678,8 +6678,8 @@ static void commandFuncNpcConversationStart(Command const &, NetworkId const &ac static void commandFuncNpcConversationStop(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const ¶ms) { ServerObject * const actorObject = safe_cast(NetworkIdManager::getObjectById(actor)); - TangibleObject * const player = actorObject != NULL ? actorObject->asTangibleObject(): NULL; - if (player == NULL) + TangibleObject * const player = actorObject != nullptr ? actorObject->asTangibleObject(): nullptr; + if (player == nullptr) { DEBUG_WARNING(true, ("commandFuncNpcConversationStop: couldn't find actor")); return; @@ -6693,7 +6693,7 @@ static void commandFuncNpcConversationSelect(Command const &, NetworkId const &a { Object * const actorObject = NetworkIdManager::getObjectById(actor); CreatureObject * const player = dynamic_cast(actorObject); - if (player == NULL) + if (player == nullptr) { DEBUG_WARNING(true, ("commandFuncNpcConversationStop: couldn't find actor")); return; @@ -6709,7 +6709,7 @@ static void commandFuncNpcConversationSelect(Command const &, NetworkId const &a static void commandFuncServerDestroyObject (Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params) { CreatureObject * const player = dynamic_cast (NetworkIdManager::getObjectById (actor)); - if (player == NULL) + if (player == nullptr) { DEBUG_WARNING (true, ("commandFuncServerDestroyObject: couldn't find actor")); return; @@ -6792,11 +6792,11 @@ static void commandFuncSetSpokenLanguage(Command const &, NetworkId const &actor Object * const object = NetworkIdManager::getObjectById(actor); CreatureObject * const creatureObject = dynamic_cast(object); - if (creatureObject != NULL) + if (creatureObject != nullptr) { PlayerObject *playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject != NULL) + if (playerObject != nullptr) { size_t pos = 0; int const languageId = nextIntParm(params, pos); @@ -6831,14 +6831,14 @@ static void commandFuncUnstick(Command const &, NetworkId const &actor, NetworkI { Object * const object = NetworkIdManager::getObjectById(actor); CreatureObject * const creatureObject = dynamic_cast(object); - if (creatureObject != NULL) + if (creatureObject != nullptr) { if (!ShipObject::getContainingShipObject(creatureObject)) // no unsticking in ships { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject); if (playerObject) { - Chat::sendSystemMessageSimple(*creatureObject, SharedStringIds::unstick_in_progress, NULL); + Chat::sendSystemMessageSimple(*creatureObject, SharedStringIds::unstick_in_progress, nullptr); if (!playerObject->getIsUnsticking()) { Vector position = creatureObject->getPosition_p(); @@ -7324,8 +7324,8 @@ static void commandFuncInstallShipComponents(Command const &, NetworkId const & //params for installShipComponent are " " Object const * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) { return; @@ -7338,7 +7338,7 @@ static void commandFuncInstallShipComponents(Command const &, NetworkId const & if(!client->isGod()) { Object * const targetObj = NetworkIdManager::getObjectById(target); - ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL; + ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : nullptr; if( !targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) && (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) ) return; @@ -7351,16 +7351,16 @@ static void commandFuncInstallShipComponents(Command const &, NetworkId const & size_t pos = 0; NetworkId const & shipId = nextOidParm(params, pos); Object * const shipObj = NetworkIdManager::getObjectById(shipId); - ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL; - ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL; + ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : nullptr; + ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : nullptr; if(!ship) return; ShipChassisSlotType::Type const slotType = static_cast(nextIntParm(params, pos)); NetworkId const & componentId = nextOidParm(params, pos); Object * const componentObj = NetworkIdManager::getObjectById(componentId); - ServerObject * const componentServerObj = componentObj ? componentObj->asServerObject() : NULL; - TangibleObject * const component = componentServerObj ? componentServerObj->asTangibleObject() : NULL; + ServerObject * const componentServerObj = componentObj ? componentObj->asServerObject() : nullptr; + TangibleObject * const component = componentServerObj ? componentServerObj->asTangibleObject() : nullptr; if(!component) { return; @@ -7409,8 +7409,8 @@ static void commandFuncUninstallShipComponents(Command const &, NetworkId const //params for uninstallShipComponent are " " Object * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) return; ServerObject * const actorInv = actorCreature->getInventory(); @@ -7424,7 +7424,7 @@ static void commandFuncUninstallShipComponents(Command const &, NetworkId const if(!client->isGod()) { Object * const targetObj = NetworkIdManager::getObjectById(target); - ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL; + ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : nullptr; if(!targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) && (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) ) @@ -7456,8 +7456,8 @@ static void commandFuncUninstallShipComponents(Command const &, NetworkId const size_t pos = 0; NetworkId const & shipId = nextOidParm(params, pos); Object * const shipObj = NetworkIdManager::getObjectById(shipId); - ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL; - ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL; + ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : nullptr; + ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : nullptr; if(!ship) return; @@ -7474,8 +7474,8 @@ static void commandFuncInsertItemIntoShipComponentSlot(Command const &, NetworkI //params for insertItemIntoShipComponentSlot are " " Object * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) return; @@ -7486,7 +7486,7 @@ static void commandFuncInsertItemIntoShipComponentSlot(Command const &, NetworkI if(!client->isGod()) { Object * const targetObj = NetworkIdManager::getObjectById(target); - ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL; + ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : nullptr; if(!targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) && (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) ) return; @@ -7499,8 +7499,8 @@ static void commandFuncInsertItemIntoShipComponentSlot(Command const &, NetworkI size_t pos = 0; NetworkId const & shipId = nextOidParm(params, pos); Object * const shipObj = NetworkIdManager::getObjectById(shipId); - ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL; - ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL; + ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : nullptr; + ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : nullptr; if(!ship) return; @@ -7527,8 +7527,8 @@ static void commandFuncAssociateDroidControlDeviceWithShip(Command const &, Netw //params for associateDroidControlDeviceWithShip are " " Object const * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if (!actorCreature) return; @@ -7539,7 +7539,7 @@ static void commandFuncAssociateDroidControlDeviceWithShip(Command const &, Netw if(!client->isGod()) { Object * const targetObj = NetworkIdManager::getObjectById(target); - ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL; + ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : nullptr; if(!targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) && (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) ) return; @@ -7552,8 +7552,8 @@ static void commandFuncAssociateDroidControlDeviceWithShip(Command const &, Netw size_t pos = 0; NetworkId const & shipId = nextOidParm(params, pos); Object * const shipObj = NetworkIdManager::getObjectById(shipId); - ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL; - ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL; + ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : nullptr; + ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : nullptr; if(!ship) return; @@ -7581,8 +7581,8 @@ static void commandFuncAssociateDroidControlDeviceWithShip(Command const &, Netw static void commandFuncServerAsteroidDataListen(Command const &, NetworkId const & actor, NetworkId const & , Unicode::String const & ) { Object const * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) return; @@ -7594,8 +7594,8 @@ static void commandFuncServerAsteroidDataListen(Command const &, NetworkId const static void commandFuncServerAsteroidDataStopListening(Command const &, NetworkId const & actor, NetworkId const & , Unicode::String const & ) { Object const * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; - CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL; + ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; + CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) return; @@ -7621,8 +7621,8 @@ static void commandFuncBoosterOff(Command const &, NetworkId const & actor, Netw static void commandFuncSetFormation(Command const &, NetworkId const & actor, NetworkId const &, Unicode::String const & params) { Object * const o = NetworkIdManager::getObjectById(actor); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const actorCreature = so ? so->asCreatureObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const actorCreature = so ? so->asCreatureObject() : nullptr; if(actorCreature) { GroupObject * const group = actorCreature->getGroup(); @@ -7676,15 +7676,15 @@ static void commandFuncUnDock(Command const &, NetworkId const & actor, NetworkI { Object * const object = NetworkIdManager::getObjectById(actor); - if (object != NULL) + if (object != nullptr) { ShipObject * const shipObject = ShipObject::getContainingShipObject(object->asServerObject()); - if (shipObject != NULL) + if (shipObject != nullptr) { ShipController * const shipController = dynamic_cast(shipObject->getController()); - if (shipController != NULL) + if (shipController != nullptr) { shipController->unDock(); } @@ -7695,12 +7695,12 @@ static void commandFuncUnDock(Command const &, NetworkId const & actor, NetworkI } else { - WARNING(true, ("commandFuncUnDock() Undock requested on an object(%s) contained by a NULL ShipObject.", object->getDebugInformation().c_str())); + WARNING(true, ("commandFuncUnDock() Undock requested on an object(%s) contained by a nullptr ShipObject.", object->getDebugInformation().c_str())); } } else { - WARNING(true, ("commandFuncUnDock() Undock requested on a NULL object(%s).", actor.getValueString().c_str())); + WARNING(true, ("commandFuncUnDock() Undock requested on a nullptr object(%s).", actor.getValueString().c_str())); } } @@ -7709,7 +7709,7 @@ static void commandFuncUnDock(Command const &, NetworkId const & actor, NetworkI static void commandFuncLaunchIntoSpace(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) { WARNING(true, ("No actorCreature in commandFuncLaunchIntoSpace")); @@ -7725,7 +7725,7 @@ static void commandFuncLaunchIntoSpace(Command const &, NetworkId const & actor, //target must be a space terminal Object const * const o = NetworkIdManager::getObjectById(target); - ServerObject const * const so = o ? o->asServerObject() : NULL; + ServerObject const * const so = o ? o->asServerObject() : nullptr; if(!so) { StringId invalidTargetId("player_utility", "target_not_server_object"); @@ -7759,7 +7759,7 @@ static void commandFuncLaunchIntoSpace(Command const &, NetworkId const & actor, return; } Object * const terminalO = NetworkIdManager::getObjectById(target); - ServerObject * const terminalSO = terminalO ? terminalO->asServerObject() : NULL; + ServerObject * const terminalSO = terminalO ? terminalO->asServerObject() : nullptr; if(terminalSO) { std::vector networkIds; @@ -7824,7 +7824,7 @@ static void commandFuncLaunchIntoSpace(Command const &, NetworkId const & actor, static void commandFuncAcceptQuest(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) { WARNING(true, ("No actorCreature in commandFuncAcceptQuest")); @@ -7851,7 +7851,7 @@ static void commandFuncAcceptQuest(Command const &, NetworkId const & actor, Net static void commandFuncReceiveReward(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) { WARNING(true, ("No actorCreature in commandFuncReceiveReward")); @@ -7895,7 +7895,7 @@ static void commandFuncAbandonQuest(Command const &, NetworkId const & actor, Ne if(QuestManager::isQuestAbandonable(questName)) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; if(actorCreature) { PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(actorCreature); @@ -7922,7 +7922,7 @@ static void commandFuncAbandonQuest(Command const &, NetworkId const & actor, Ne static void commandFuncExchangeListCredits(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const ¶ms) { ServerObject * const actorServerObj = safe_cast(NetworkIdManager::getObjectById(actor)); - CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL; + CreatureObject * const actorCreature = actorServerObj != nullptr ? actorServerObj->asCreatureObject() : nullptr; if(!actorCreature) { WARNING(true, ("No actorCreature in commandFuncReceiveReward")); @@ -8680,7 +8680,7 @@ static void commandFuncOccupyUnlockedSlot(Command const &, NetworkId const &acto } // check to see if there is a cooldown is in effect for the command - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT)) { int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0; @@ -8746,7 +8746,7 @@ static void commandFuncVacateUnlockedSlot(Command const &, NetworkId const &acto } // check to see if there is a cooldown is in effect for the command - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT)) { int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0; @@ -8834,7 +8834,7 @@ static void commandFuncSwapUnlockedSlot(Command const &, NetworkId const &actor, } // check to see if there is a cooldown is in effect for the command - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT)) { int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0; @@ -8902,7 +8902,7 @@ static void commandFuncPickupAllRoomItemsIntoInventory(Command const &, NetworkI return; // don't allow multiple /pickupAllRoomItemsIntoInventory and/or /dropAllInventoryItemsIntoRoom - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int pickupDropAllItemsOperationTimeout = 0; if (targetObj->getObjVars().getItem("pickupDropAllItemsOperation.timeout", pickupDropAllItemsOperationTimeout) && (pickupDropAllItemsOperationTimeout > timeNow)) { @@ -9051,7 +9051,7 @@ static void commandFuncDropAllInventoryItemsIntoRoom(Command const &, NetworkId return; // don't allow multiple /pickupAllRoomItemsIntoInventory and/or /dropAllInventoryItemsIntoRoom - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int pickupDropAllItemsOperationTimeout = 0; if (targetObj->getObjVars().getItem("pickupDropAllItemsOperation.timeout", pickupDropAllItemsOperationTimeout) && (pickupDropAllItemsOperationTimeout > timeNow)) { @@ -9255,7 +9255,7 @@ static void commandFuncRestoreDecorationLayout(Command const &, NetworkId const } // don't allow another restore on the pob while one is still in progress - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int restoreDecorationOperationTimeout = 0; if (targetObj->getObjVars().getItem("restoreDecorationOperation.timeout", restoreDecorationOperationTimeout) && (restoreDecorationOperationTimeout > timeNow)) { @@ -9330,7 +9330,7 @@ static void commandFuncAreaPickRandomPlayer(Command const &, NetworkId const &ac if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextAreaPickRandomPlayerCommandAllowed") && (targetObj->getObjVars().getType("timeNextAreaPickRandomPlayerCommandAllowed") == DynamicVariable::INT)) { int timeNextAreaPickRandomPlayerCommandAllowed = 0; @@ -9352,7 +9352,7 @@ static void commandFuncAreaPickRandomPlayer(Command const &, NetworkId const &ac if (!params.empty()) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::toLower(params), tokens, nullptr, nullptr) && !tokens.empty()) { static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point"); static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point"); @@ -9477,7 +9477,7 @@ static void commandFuncRoomPickRandomPlayer(Command const &, NetworkId const &ac if (!client) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextRoomPickRandomPlayerCommandAllowed") && (targetObj->getObjVars().getType("timeNextRoomPickRandomPlayerCommandAllowed") == DynamicVariable::INT)) { int timeNextRoomPickRandomPlayerCommandAllowed = 0; @@ -9498,7 +9498,7 @@ static void commandFuncRoomPickRandomPlayer(Command const &, NetworkId const &ac if (!params.empty()) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::toLower(params), tokens, nullptr, nullptr) && !tokens.empty()) { static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point"); static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point"); diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp index d581b8ae..913fa7e0 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp +++ b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp @@ -309,11 +309,11 @@ void CommandQueue::executeCommandQueue() { CommandQueueEntry &entry = *(m_queue.begin()); - // try to recover from having a null command + // try to recover from having a nullptr command // maybe this should result in a fatal error? if ( entry.m_command == 0 ) { - WARNING( true, ( "executeCommandQueue: entry.m_command was NULL! WTF?\n" ) ); + WARNING( true, ( "executeCommandQueue: entry.m_command was nullptr! WTF?\n" ) ); m_queue.pop(); m_state = State_Waiting; m_nextEventTime = 0.f; @@ -387,7 +387,7 @@ void CommandQueue::executeCommandQueue() // switch state might have removed elements from the queue and invalidated entry // so we can't assume that we're still safe - if(!m_queue.empty() && (&(*(m_queue.begin())) == &entry) && m_queue.begin()->m_command != NULL) + if(!m_queue.empty() && (&(*(m_queue.begin())) == &entry) && m_queue.begin()->m_command != nullptr) { handleEntryRemoved(*(m_queue.begin()), true); m_queue.pop(); @@ -458,7 +458,7 @@ void CommandQueue::updateClient(TimerClass timerClass ) { CreatureObject * const creatureOwner = getServerOwner().asCreatureObject(); - if ( (creatureOwner == NULL) + if ( (creatureOwner == nullptr) || !creatureOwner->getClient()) { return; @@ -475,7 +475,7 @@ void CommandQueue::updateClient(TimerClass timerClass ) if ( entry.m_command == 0 ) // woah that's bad news! { - WARNING( true, ( "CommandQueue::updateClient(): command was NULL!\n" ) ); + WARNING( true, ( "CommandQueue::updateClient(): command was nullptr!\n" ) ); return; } @@ -539,7 +539,7 @@ void CommandQueue::notifyClient() { CreatureObject * const creatureOwner = getServerOwner().asCreatureObject(); - if ( (creatureOwner == NULL) + if ( (creatureOwner == nullptr) || !creatureOwner->getClient()) { return; @@ -555,7 +555,7 @@ void CommandQueue::notifyClient() if ( entry.m_command == 0 ) { - WARNING( true, ( "CommandQueue::notifyClient(): command was NULL!\n" ) ); + WARNING( true, ( "CommandQueue::notifyClient(): command was nullptr!\n" ) ); return; } @@ -612,7 +612,7 @@ bool CommandQueue::doWarmupTrigger(const CommandQueueEntry &entry ) CreatureObject * const creatureOwner = getServerOwner().asCreatureObject(); - if (creatureOwner != NULL) + if (creatureOwner != nullptr) { creatureOwner->doWarmupChecks( *entry.m_command, entry.m_targetId, entry.m_params, m_status, m_statusDetail ); @@ -620,7 +620,7 @@ bool CommandQueue::doWarmupTrigger(const CommandQueueEntry &entry ) if ( m_status == Command::CEC_Success ) { - FATAL( entry.m_command == 0, ( "entry had a null command\n" ) ); + FATAL( entry.m_command == 0, ( "entry had a nullptr command\n" ) ); std::vector timeValues; timeValues.push_back( entry.m_command->m_warmTime ); @@ -659,7 +659,7 @@ uint32 CommandQueue::getCurrentCommand() const if ( entry.m_command == 0 ) { - WARNING( true, ( "CommandQueue::getCurrentCommand(): command was NULL!\n" ) ); + WARNING( true, ( "CommandQueue::getCurrentCommand(): command was nullptr!\n" ) ); return 0; } @@ -680,7 +680,7 @@ void CommandQueue::switchState() if ( entry.m_command == 0 ) { - WARNING( true, ( "CommandQueue::switchState(): command was NULL!\n" ) ); + WARNING( true, ( "CommandQueue::switchState(): command was nullptr!\n" ) ); return; } @@ -726,7 +726,7 @@ void CommandQueue::switchState() bool const targetIsAuthoritative = target && target->isAuthoritative(); REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_COMMAND: commandName=[%s] commandHash=[%lu] owner=[%s][%s][%s] target=[%s][%s][%s] sequenceId=[%lu] params=[%s] clearable=[%s] priority=[%d]\n", - entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "NULL", + entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "nullptr", entryCopy.m_command ? entryCopy.m_command->m_commandHash : 0, NameManager::getInstance().getPlayerName(getOwner().getNetworkId()).c_str(), getOwner().getNetworkId().getValueString().c_str(), @@ -746,7 +746,7 @@ void CommandQueue::switchState() for (; itEntry != m_queue.end(); ++itEntry) { - REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "NULL")); + REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "nullptr")); } } #endif @@ -838,7 +838,7 @@ void CommandQueue::switchState() bool const targetIsAuthoritative = target && target->isAuthoritative(); REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_COMMAND: commandName=[%s] commandHash=[%lu] owner=[%s][%s][%s] target=[%s][%s][%s] sequenceId=[%lu] params=[%s] clearable=[%s] priority=[%d]\n", - entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "NULL", + entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "nullptr", entryCopy.m_command ? entryCopy.m_command->m_commandHash : 0, NameManager::getInstance().getPlayerName(getOwner().getNetworkId()).c_str(), getOwner().getNetworkId().getValueString().c_str(), @@ -858,7 +858,7 @@ void CommandQueue::switchState() for (; itEntry != m_queue.end(); ++itEntry) { - REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "NULL")); + REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "nullptr")); } } #endif @@ -1160,7 +1160,7 @@ void CommandQueue::notifyClientOfCommandRemoval(uint32 sequenceId, float waitTim CreatureObject * const creatureOwner = getServerOwner().asCreatureObject(); - if ( (creatureOwner != NULL) + if ( (creatureOwner != nullptr) && creatureOwner->getClient() && (sequenceId != 0)) { @@ -1359,7 +1359,7 @@ void CommandQueue::executeCommand(Command const &command, NetworkId const &targe CreatureObject * const creatureOwner = getServerOwner().asCreatureObject(); - if (creatureOwner != NULL) + if (creatureOwner != nullptr) { CreatureController * const creatureController = creatureOwner->getCreatureController(); if (creatureController && creatureController->getSecureTrade()) @@ -1399,7 +1399,7 @@ void CommandQueue::executeCommand(Command const &command, NetworkId const &targe TangibleObject * const tangibleOwner = getServerOwner().asTangibleObject(); - if (tangibleOwner != NULL) + if (tangibleOwner != nullptr) { // Really execute the command - swap targets if necessary, and call // forceExecuteCommand (which will handle messaging if not authoritative) @@ -1440,7 +1440,7 @@ CommandQueue * CommandQueue::getCommandQueue(Object & object) { Property * const property = object.getProperty(getClassPropertyId()); - return (property != NULL) ? (static_cast(property)) : NULL; + return (property != nullptr) ? (static_cast(property)) : nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueue.h b/engine/server/library/serverGame/src/shared/command/CommandQueue.h index bedf3717..03c861e0 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandQueue.h +++ b/engine/server/library/serverGame/src/shared/command/CommandQueue.h @@ -218,7 +218,7 @@ public: void resetCooldowns(); // debug diagnostic - void spew(std::string * output = NULL); + void spew(std::string * output = nullptr); private: CommandQueue(CommandQueue const &); diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp index d2d55dfd..7529726f 100755 --- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp +++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp @@ -201,7 +201,7 @@ namespace CommoditiesMarketNamespace Container::ContainerErrorCode tmp = Container::CEC_Success; ServerObject *bazaarContainer = auctionContainer.getBazaarContainer(); - if (!bazaarContainer || !ContainerInterface::canTransferTo(bazaarContainer, item, NULL, tmp)) + if (!bazaarContainer || !ContainerInterface::canTransferTo(bazaarContainer, item, nullptr, tmp)) { errorCode = ar_INVALID_ITEM_ID; } @@ -326,7 +326,7 @@ bool CommoditiesMarketNamespace::isVendorItemRestriction(ServerObject const & it return false; } - ItemRestriction const * itemRestriction = NULL; + ItemRestriction const * itemRestriction = nullptr; std::map::const_iterator const iterFind = itemRestrictionList.find(itemRestrictionFile); if (iterFind != itemRestrictionList.end()) @@ -1068,7 +1068,7 @@ void CommoditiesMarket::getCommoditiesServerConnection() if (ObjectIdManager::hasAvailableObjectId()) { s_market = new CommoditiesServerConnection(ConfigServerGame::getCommoditiesServerServiceBindInterface(), static_cast(ConfigServerGame::getCommoditiesServerServiceBindPort())); - s_timeMarketConnectionCreated = ::time(NULL); + s_timeMarketConnectionCreated = ::time(nullptr); } } @@ -1082,10 +1082,10 @@ int CommoditiesMarket::getCommoditiesServerConnectionAgeSeconds() if (s_timeMarketConnectionCreated <= 0) return 0; - if (s_market == NULL) + if (s_market == nullptr) return 0; - return static_cast(::time(NULL) - s_timeMarketConnectionCreated); + return static_cast(::time(nullptr) - s_timeMarketConnectionCreated); } // ---------------------------------------------------------------------- @@ -1295,7 +1295,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId CreatureObject * const auctionCreator = dynamic_cast(NetworkIdManager::getObjectById(auctionOwnerId)); ServerObject * const item = dynamic_cast(NetworkIdManager::getObjectById(itemId)); - Client *client = NULL; + Client *client = nullptr; if (auctionCreator) client = auctionCreator->getClient(); @@ -1347,7 +1347,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId if (container) { Container::ContainerErrorCode tmp = Container::CEC_Success; - bool result = ContainerInterface::transferItemToVolumeContainer(*container,*item, NULL, tmp); + bool result = ContainerInterface::transferItemToVolumeContainer(*container,*item, nullptr, tmp); if (!result) { LOG("CustomerService", ("Auction: Player %s transfer of item (%Ld) to auction container (%Ld) failed with code %d", @@ -2536,7 +2536,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId) bool transferAllowed = true; Container::ContainerErrorCode error = Container::CEC_Success; - transferAllowed = ContainerInterface::canTransferTo(targetContainer, *item, NULL, error); + transferAllowed = ContainerInterface::canTransferTo(targetContainer, *item, nullptr, error); if (!transferAllowed) { @@ -2603,11 +2603,11 @@ void CommoditiesMarket::onGetItemReply(int32 result, int32 requestId, NetworkId LOG("AuctionRetrieval", ("CommoditiesMarket::received onGetItemReply for loading object %s for retrieval", itemId.getValueString().c_str())); AuctionResult auctionResult = ar_OK; CreatureObject *player = dynamic_cast(NetworkIdManager::getObjectById(itemOwnerId)); - Client *client = player ? player->getClient() : NULL; + Client *client = player ? player->getClient() : nullptr; bool transactionFailed = false; - ServerObject* vendor = NULL; - ServerObject* item = NULL; + ServerObject* vendor = nullptr; + ServerObject* item = nullptr; if (result == ARC_AuctionDoesNotExist) { @@ -2637,7 +2637,7 @@ void CommoditiesMarket::onGetItemReply(int32 result, int32 requestId, NetworkId vendor = safe_cast(ContainerInterface::getContainedByObject(*item)); if (vendor && vendor->getNetworkId() == location) { - bool retval = ContainerInterface::transferItemToVolumeContainer(*inventory, *item, NULL, tmp, false); + bool retval = ContainerInterface::transferItemToVolumeContainer(*inventory, *item, nullptr, tmp, false); if (retval) { @@ -2779,7 +2779,7 @@ void CommoditiesMarket::onIsVendorOwner(const NetworkId & requesterId, const Net ServerObject * const auctionContainer = safe_cast(NetworkIdManager::getObjectById(container)); NetworkId resultContainer = container; - const TangibleObject * resultContainerObject = auctionContainer ? auctionContainer->asTangibleObject() : NULL; + const TangibleObject * resultContainerObject = auctionContainer ? auctionContainer->asTangibleObject() : nullptr; if (auctionContainer) { marketName = getLocationString(*auctionContainer); @@ -2952,7 +2952,7 @@ void CommoditiesMarket::onGetItemDetailsReply(int32 result, int32 requestId, Net OutOfBandBase *base = *it; if (!base) { - WARNING(true, ("NULL OOB Base for Auction Data")); + WARNING(true, ("nullptr OOB Base for Auction Data")); return; } if (base->getTypeId() == OutOfBandPackager::OT_auctionToken) @@ -2979,7 +2979,7 @@ void CommoditiesMarket::onGetItemDetailsReply(int32 result, int32 requestId, Net base = *it; if (!base) { - WARNING(true, ("NULL OOB Base for Auction Data")); + WARNING(true, ("nullptr OOB Base for Auction Data")); return; } if (base->getTypeId() == OutOfBandPackager::OT_objectAttributes) @@ -3624,22 +3624,22 @@ void CommoditiesMarket::updateItemTypeMap(int itemTypeMapVersionNumber, int item // get the server template const ObjectTemplate * ot = ObjectTemplateList::fetch(static_cast(itemTemplateId)); - if (ot != NULL) + if (ot != nullptr) { objectName = StringId(std::string(ot->getName())); // get the shared template const ServerObjectTemplate * serverOt = ot->asServerObjectTemplate(); - if (serverOt != NULL) + if (serverOt != nullptr) { const std::string sharedTemplateName(serverOt->getSharedTemplate()); serverOt->releaseReference(); - serverOt = NULL; + serverOt = nullptr; ot = ObjectTemplateList::fetch(sharedTemplateName); - if (ot != NULL) + if (ot != nullptr) { const SharedObjectTemplate * sharedOt = ot->asSharedObjectTemplate(); - if (sharedOt != NULL) + if (sharedOt != nullptr) { gameObjectType = static_cast(sharedOt->getGameObjectType()); StringId const tempObjectName(objectName); @@ -3649,19 +3649,19 @@ void CommoditiesMarket::updateItemTypeMap(int itemTypeMapVersionNumber, int item objectName = tempObjectName; } sharedOt->releaseReference(); - sharedOt = NULL; + sharedOt = nullptr; } else { ot->releaseReference(); - ot = NULL; + ot = nullptr; } } } else { ot->releaseReference(); - ot = NULL; + ot = nullptr; } } else diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp index 1b7b95c9..ad3ff41c 100755 --- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp +++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp @@ -576,7 +576,7 @@ void CommoditiesServerConnection::onReceive(const Archive::ByteStream & message) ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(response.getValue().first.first, diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp index 65298e93..994b695b 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp @@ -74,7 +74,7 @@ CreatureObject * const ConsoleCommandParserAiNamespace::getAiCreatureObject(Crea CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if ( (aiCreatureObject == NULL) + if ( (aiCreatureObject == nullptr) || aiCreatureObject->isPlayerControlled()) { Chat::sendSystemMessage(user, Unicode::narrowToWide(FormattedString<1024>().sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString); @@ -113,7 +113,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -121,7 +121,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -129,7 +129,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiCreatureObject->getNetworkId().getValueString().c_str())), Unicode::emptyString); result += getErrorMessage(argv[0], ERR_FAIL); @@ -148,7 +148,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -167,7 +167,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri AICreatureController * const aiCreatureController = AICreatureController::getAiCreatureController(targetNetworkId); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { result = Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI\n", targetNetworkId.getValueString().c_str())); result += getErrorMessage(argv[0], ERR_FAIL); @@ -190,7 +190,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CellProperty const * const cellProperty = creatureOwner->getParentCell(); - if (cellProperty != NULL) + if (cellProperty != nullptr) { Vector const & position_p = creatureOwner->getPosition_p(); @@ -245,13 +245,13 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject()); float const hate = iterHateList->second; std::string hateTargetName; - if (hateTargetTangibleObject != NULL) + if (hateTargetTangibleObject != nullptr) { hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str(); } else { - hateTargetName = "NULL"; + hateTargetName = "nullptr"; } result += Unicode::narrowToWide(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate)); @@ -271,13 +271,13 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri CachedNetworkId const hateTarget(iter->first); TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject()); std::string hateTargetName; - if (hateTargetTangibleObject != NULL) + if (hateTargetTangibleObject != nullptr) { hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str(); } else { - hateTargetName = "NULL"; + hateTargetName = "nullptr"; } result += Unicode::narrowToWide(fs.sprintf("%s:%s (%.2f, %lu, %lu)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), iter->second.first, iter->second.second.first, iter->second.second.second)); @@ -295,7 +295,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -313,7 +313,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri } TangibleObject const * const to = TangibleObject::asTangibleObject(NetworkIdManager::getObjectById(targetNetworkId)); - if (to == NULL) + if (to == nullptr) { result += Unicode::narrowToWide(fs.sprintf("Target %s not found or not TangibleObject\n", targetNetworkId.getValueString().c_str())); } @@ -342,13 +342,13 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject()); float const hate = iterHateList->second; std::string hateTargetName; - if (hateTargetTangibleObject != NULL) + if (hateTargetTangibleObject != nullptr) { hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str(); } else { - hateTargetName = "NULL"; + hateTargetName = "nullptr"; } result += Unicode::narrowToWide(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate)); @@ -368,13 +368,13 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri CachedNetworkId const hateTarget(iter->first); TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject()); std::string hateTargetName; - if (hateTargetTangibleObject != NULL) + if (hateTargetTangibleObject != nullptr) { hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str(); } else { - hateTargetName = "NULL"; + hateTargetName = "nullptr"; } result += Unicode::narrowToWide(fs.sprintf("%s:%s (%.2f, %lu, %lu)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), iter->second.first, iter->second.second.first, iter->second.second.second)); @@ -390,7 +390,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -398,7 +398,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -416,7 +416,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -424,7 +424,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } @@ -442,14 +442,14 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } else { NetworkId aiNetworkId; - CreatureObject * aiCreatureObject = NULL; + CreatureObject * aiCreatureObject = nullptr; if (argv.size() > 2) { @@ -458,7 +458,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri aiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1])); aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if ( (aiCreatureObject != NULL) + if ( (aiCreatureObject != nullptr) && !aiCreatureObject->isPlayerControlled()) { aiCreatureObject->setBaseWalkSpeed(Unicode::toFloat(argv[2])); @@ -471,14 +471,14 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri aiNetworkId = userCreatureObject->getLookAtTarget(); aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if ( (aiCreatureObject != NULL) + if ( (aiCreatureObject != nullptr) && !aiCreatureObject->isPlayerControlled()) { aiCreatureObject->setBaseWalkSpeed(Unicode::toFloat(argv[1])); } } - if ( (aiCreatureObject == NULL) + if ( (aiCreatureObject == nullptr) || aiCreatureObject->isPlayerControlled()) { Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString); @@ -495,14 +495,14 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject == NULL) + if (userCreatureObject == nullptr) { result += getErrorMessage(argv[0], ERR_FAIL); } else { NetworkId aiNetworkId; - CreatureObject * aiCreatureObject = NULL; + CreatureObject * aiCreatureObject = nullptr; if (argv.size() > 2) { @@ -511,7 +511,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri aiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1])); aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if ( (aiCreatureObject != NULL) + if ( (aiCreatureObject != nullptr) && !aiCreatureObject->isPlayerControlled()) { aiCreatureObject->setBaseRunSpeed(Unicode::toFloat(argv[2])); @@ -524,14 +524,14 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri aiNetworkId = userCreatureObject->getLookAtTarget(); aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if ( (aiCreatureObject != NULL) + if ( (aiCreatureObject != nullptr) && !aiCreatureObject->isPlayerControlled()) { aiCreatureObject->setBaseRunSpeed(Unicode::toFloat(argv[1])); } } - if ( (aiCreatureObject == NULL) + if ( (aiCreatureObject == nullptr) || aiCreatureObject->isPlayerControlled()) { Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString); @@ -549,7 +549,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri { CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId); - if (userCreatureObject != NULL) + if (userCreatureObject != nullptr) { NetworkId sparedAiNetworkId; @@ -573,9 +573,9 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri for (int i = 0; i < serverObjectCount; ++i) { ServerObject * const serverObject = ServerWorld::getObject(i); - CreatureObject * const creatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL; + CreatureObject * const creatureObject = (serverObject != nullptr) ? serverObject->asCreatureObject() : nullptr; - if ( (creatureObject != NULL) + if ( (creatureObject != nullptr) && !creatureObject->isDead() && !creatureObject->isPlayerControlled() && (creatureObject->getNetworkId() != sparedAiNetworkId)) @@ -597,10 +597,10 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri else if (isAbbrev(argv[0], "debug")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; int temp; - if (serverObject != NULL) + if (serverObject != nullptr) { if ( serverObject->getObjVars().getItem("ai_debug_string", temp) && (temp > 0)) @@ -621,7 +621,7 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri Client * const client = serverObject->getClient(); - if (client != NULL) + if (client != nullptr) { AiDebugString aiDebugString; aiDebugString.enableClearClientFlag(); @@ -650,9 +650,9 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri else if (isAbbrev(argv[0], "debugText")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { AiDebugString::setTextEnabled(!AiDebugString::isTextEnabled()); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp index 7b4af2ef..5a89f47e 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp @@ -415,7 +415,7 @@ bool ConsoleCommandParserCity::performParsing (const NetworkId & userId, const S } else { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[3]).c_str()) - 1; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp index 442bc622..7397c1e8 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp @@ -63,21 +63,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -172,21 +172,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -249,21 +249,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -326,21 +326,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -403,21 +403,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -466,21 +466,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -529,21 +529,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -592,21 +592,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -719,21 +719,21 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -776,7 +776,7 @@ bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, c else if (isCommand (argv [0], "setServerFirstTime")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[3]).c_str()) - 1; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp index 6a28b3eb..51b45c94 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp @@ -151,7 +151,7 @@ bool ConsoleCommandParserCraft::performParsing (const NetworkId & userId, const else if (isAbbrev( argv [0], "enableSchematicFilter")) { - if (creatureObject->getClient() == NULL || !creatureObject->getClient()->isGod()) + if (creatureObject->getClient() == nullptr || !creatureObject->getClient()->isGod()) result += getErrorMessage (argv[0], ERR_FAIL); else { @@ -164,7 +164,7 @@ bool ConsoleCommandParserCraft::performParsing (const NetworkId & userId, const else if (isAbbrev( argv [0], "disableSchematicFilter")) { - if (creatureObject->getClient() == NULL || !creatureObject->getClient()->isGod()) + if (creatureObject->getClient() == nullptr || !creatureObject->getClient()->isGod()) result += getErrorMessage (argv[0], ERR_FAIL); else { diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp index cc9bebd7..e3a443db 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp @@ -53,19 +53,19 @@ bool ConsoleCommandParserCraftStation::performParsing (const NetworkId & userId, { /* // get the station TangibleObject * station = getStation(argv, result); - if (station == NULL) + if (station == nullptr) return true; // get the ingredient NetworkId ingredientId(Unicode::wideToNarrow (argv[2])); ServerObject * object = ServerWorld::findObjectByNetworkId(ingredientId); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT); return true; } TangibleObject * ingredient = dynamic_cast(object); - if (ingredient == NULL) + if (ingredient == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT); return true; @@ -82,19 +82,19 @@ bool ConsoleCommandParserCraftStation::performParsing (const NetworkId & userId, { /* // get the station TangibleObject * station = getStation(argv, result); - if (station == NULL) + if (station == nullptr) return true; // get the ingredient NetworkId ingredientId(Unicode::wideToNarrow (argv[2])); ServerObject * object = ServerWorld::findObjectByNetworkId(ingredientId); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT); return true; } TangibleObject * ingredient = dynamic_cast(object); - if (ingredient == NULL) + if (ingredient == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT); return true; @@ -112,13 +112,13 @@ bool ConsoleCommandParserCraftStation::performParsing (const NetworkId & userId, /* // get the station NetworkId id(Unicode::wideToNarrow (argv[1])); ServerObject * object = ServerWorld::findObjectByNetworkId(id); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; } TangibleObject * station = dynamic_cast(object); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -144,33 +144,33 @@ bool ConsoleCommandParserCraftStation::performParsing (const NetworkId & userId, /** * Finds the crafting station for a given id. * - * @return the station or NULL on error + * @return the station or nullptr on error */ TangibleObject * ConsoleCommandParserCraftStation::getStation(const StringVector_t & argv, String_t & result) { NetworkId id(Unicode::wideToNarrow (argv[1])); ServerObject * object = ServerWorld::findObjectByNetworkId(id); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); - return NULL; + return nullptr; } TangibleObject * station = dynamic_cast(object); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); - return NULL; + return nullptr; } // make sure the station is a atation and that it isn't in use if (!station->getObjVars().hasItem("crafting.station")) { result += getErrorMessage (argv [0], ERR_INVALID_STATION); - return NULL; + return nullptr; } if (station->getObjVars().hasItem("crafting.crafter")) { result += getErrorMessage (argv [0], ERR_STATION_IN_USE); - return NULL; + return nullptr; } return station; } // ConsoleCommandParserCraftStation::getStation diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp index f2ca6349..3484d6c2 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp @@ -1218,17 +1218,17 @@ bool ConsoleCommandParserGuild::performParsing (const NetworkId & userId, const { // new guild leader is not a guild member, so make a guild member first, then make guild leader ServerObject const* o = dynamic_cast(ServerWorld::findObjectByNetworkId(leaderOid)); - CreatureObject const* c = (o ? o->asCreatureObject() : NULL); - PlayerObject const* p = (c ? PlayerCreatureController::getPlayerObject(c) : NULL); - if (o == NULL) + CreatureObject const* c = (o ? o->asCreatureObject() : nullptr); + PlayerObject const* p = (c ? PlayerCreatureController::getPlayerObject(c) : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); } - else if (p == NULL) + else if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); } diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp index 1b405dd1..d8af83e3 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp @@ -64,7 +64,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); ServerObject * ingredient = safe_cast(ingredientId.getObject()); - if (station == NULL || ingredient == NULL) + if (station == nullptr || ingredient == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -77,7 +77,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } ServerObject * hopper = station->getInputHopper(); - if (hopper == NULL) + if (hopper == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -99,7 +99,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); ServerObject * ingredient = safe_cast(ingredientId.getObject()); - if (station == NULL || ingredient == NULL) + if (station == nullptr || ingredient == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -112,7 +112,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } ServerObject * hopper = station->getInputHopper(); - if (hopper == NULL) + if (hopper == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -124,7 +124,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, return true; } - if (playerObject->getInventory() == NULL) + if (playerObject->getInventory() == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -144,7 +144,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -157,14 +157,14 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } ServerObject * hopper = station->getInputHopper(); - if (hopper == NULL) + if (hopper == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper); - if (container == NULL) + if (container == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -174,7 +174,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, while (iter != container->end()) { const Container::ContainedItem & itemId = *iter; - if (itemId.getObject() != NULL) + if (itemId.getObject() != nullptr) { const ServerObject * item = safe_cast(itemId.getObject()); result += Unicode::narrowToWide("("); @@ -182,7 +182,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, result += Unicode::narrowToWide(") - "); const ResourceContainerObject * crate = dynamic_cast< const ResourceContainerObject *>(item); - if (crate != NULL) + if (crate != nullptr) { char buffer[32]; _itoa(crate->getQuantity(), buffer, 10); @@ -226,7 +226,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); ManufactureSchematicObject * schematic = dynamic_cast(schematicId.getObject()); - if (station == NULL || schematic == NULL) + if (station == nullptr || schematic == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -239,7 +239,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } // if (station->addSchematic(*schematic, playerObject)) - if (station->addSchematic(*schematic, NULL)) + if (station->addSchematic(*schematic, nullptr)) result += getErrorMessage(argv[0], ERR_SUCCESS); else result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER); @@ -253,7 +253,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -266,9 +266,9 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } ManufactureSchematicObject * schematic = station->getSchematic(); - if (schematic != NULL) + if (schematic != nullptr) { - if (playerObject->getDatapad() == NULL) + if (playerObject->getDatapad() == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -291,7 +291,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -304,7 +304,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, } ManufactureSchematicObject * schematic = station->getSchematic(); - if (schematic != NULL) + if (schematic != nullptr) { result += Unicode::narrowToWide("("); result += Unicode::narrowToWide(schematic->getNetworkId().getValueString()); @@ -325,7 +325,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); } @@ -344,7 +344,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); } @@ -360,7 +360,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, else if (isAbbrev( argv [0], "getObjects")) { ServerObject * myInventory = playerObject->getInventory(); - if (myInventory == NULL) + if (myInventory == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -370,21 +370,21 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } ServerObject * hopper = station->getOutputHopper(); - if (hopper == NULL) + if (hopper == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper); - if (container == NULL) + if (container == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -394,7 +394,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, while (iter != container->end()) { const Container::ContainedItem & itemId = *iter; - if (itemId.getObject() != NULL) + if (itemId.getObject() != nullptr) { ContainerInterface::transferItemToVolumeContainer (*myInventory, *safe_cast(itemId.getObject()), playerObject, tmp); } @@ -419,21 +419,21 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, ManufactureInstallationObject * station = dynamic_cast(stationId.getObject()); - if (station == NULL) + if (station == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } ServerObject * hopper = station->getOutputHopper(); - if (hopper == NULL) + if (hopper == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper); - if (container == NULL) + if (container == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -443,7 +443,7 @@ bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, while (iter != container->end()) { const Container::ContainedItem & itemId = *iter; - if (itemId.getObject() != NULL) + if (itemId.getObject() != nullptr) { const ServerObject * item = safe_cast(itemId.getObject()); result += Unicode::narrowToWide("("); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp index 33801387..feff5d1e 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp @@ -58,7 +58,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const { NetworkId sourceId(Unicode::wideToNarrow (argv[1])); NetworkId targetId(Unicode::wideToNarrow (argv[2])); - int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10)); + int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), nullptr, 10)); ServerObject* source = dynamic_cast(NetworkIdManager::getObjectById(sourceId)); if (!source) @@ -75,7 +75,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const { NetworkId sourceId(Unicode::wideToNarrow (argv[1])); NetworkId targetId(Unicode::wideToNarrow (argv[2])); - int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10)); + int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), nullptr, 10)); ServerObject* source = dynamic_cast(NetworkIdManager::getObjectById(sourceId)); if (!source) @@ -91,7 +91,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const else if (isAbbrev( argv [0], "namedTransfer")) { NetworkId sourceId(Unicode::wideToNarrow (argv[1])); - int amount(strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10)); + int amount(strtol(Unicode::wideToNarrow (argv[3]).c_str (), nullptr, 10)); ServerObject* source = dynamic_cast(NetworkIdManager::getObjectById(sourceId)); if (!source) @@ -117,7 +117,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const else if (isAbbrev( argv [0], "withdraw")) { NetworkId sourceId(Unicode::wideToNarrow (argv[1])); - int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10)); + int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), nullptr, 10)); ServerObject* source = dynamic_cast(NetworkIdManager::getObjectById(sourceId)); if (!source) @@ -133,7 +133,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const else if (isAbbrev( argv [0], "deposit")) { NetworkId sourceId(Unicode::wideToNarrow (argv[1])); - int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10)); + int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), nullptr, 10)); ServerObject* source = dynamic_cast(NetworkIdManager::getObjectById(sourceId)); if (!source) @@ -175,7 +175,7 @@ bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const } else if (isAbbrev( argv [0], "setGalacticReserve")) { - int const newGalacticReserve(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10)); + int const newGalacticReserve(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), nullptr, 10)); if ((newGalacticReserve < 0) || (newGalacticReserve > ConfigServerGame::getMaxGalacticReserveDepositBillion())) { result += Unicode::narrowToWide(FormattedString<1024>().sprintf("specified galactic reserve balance (%d) must be in the (inclusive) range (0, %d)\n", newGalacticReserve, ConfigServerGame::getMaxGalacticReserveDepositBillion())); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp index 929f6413..71f81106 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp @@ -52,19 +52,19 @@ bool ConsoleCommandParserNpc::performParsing (const NetworkId & userId, const St NetworkId const oid(Unicode::wideToNarrow(argv[1])); ServerObject * const object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject * const npc = object->asTangibleObject(); - if (npc == NULL) + if (npc == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - playerObject->startNpcConversation(*npc, NULL, NpcConversationData::CS_Player, 0); + playerObject->startNpcConversation(*npc, nullptr, NpcConversationData::CS_Player, 0); result += getErrorMessage (argv[0], ERR_SUCCESS); } @@ -82,7 +82,7 @@ bool ConsoleCommandParserNpc::performParsing (const NetworkId & userId, const St else if (isAbbrev( argv [0], "respond")) { TangibleObject * const playerObject = safe_cast(ServerWorld::findObjectByNetworkId(userId)); - int const response = strtol(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10); + int const response = strtol(Unicode::wideToNarrow(argv[1]).c_str (), nullptr, 10); playerObject->respondToNpc(response); result += getErrorMessage (argv[0], ERR_SUCCESS); } diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp index ed626f69..a092fc3a 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp @@ -119,23 +119,23 @@ namespace ConsoleCommandParserObjectNamespace { WARNING(true, ("ConsoleCommandParserObject invalid object template [%s]", templateName.c_str())); ot->releaseReference(); - return NULL; + return nullptr; } if (sot->getId() == ServerShipObjectTemplate::ServerShipObjectTemplate_tag) { SharedObjectTemplate const * const sharedTemplate = safe_cast(ObjectTemplateList::fetch(sot->getSharedTemplate())); - if (NULL == sharedTemplate || + if (nullptr == sharedTemplate || (sharedTemplate->getGameObjectType() != SharedObjectTemplate::GOT_ship_mining_asteroid_dynamic && sharedTemplate->getGameObjectType() != SharedObjectTemplate::GOT_ship_mining_asteroid_static)) { ot->releaseReference(); - return NULL; + return nullptr; } } return sot; } - return NULL; + return nullptr; } void checkBadBuildClusterObject(ServerObject *& o) @@ -523,7 +523,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const obj = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (obj == NULL) + if (obj == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -531,7 +531,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const Client const * const client = obj->getClient(); - if(client == NULL) + if(client == nullptr) { result += Unicode::narrowToWide("specified object is not a client object\n"); return true; @@ -561,7 +561,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const } const char *objectTemplateName = obj->getObjectTemplateName(); - result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total opened objects\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "NULL object template"), opened.size())); + result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total opened objects\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "nullptr object template"), opened.size())); if(!text.empty()) { @@ -615,7 +615,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const ServerObject * const object = dynamic_cast(NetworkIdManager::getObjectById(oid)); if (object) { - uint32 const pid = (strtoul(Unicode::wideToNarrow(argv[2]).c_str (), NULL, 10)); + uint32 const pid = (strtoul(Unicode::wideToNarrow(argv[2]).c_str (), nullptr, 10)); GenericValueTypeMessage > const msg( "RequestAuthTransfer", std::make_pair( @@ -646,9 +646,9 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const } real x,y,z; - x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); - y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); + x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); + y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); ServerObject *newObject = 0; ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString); @@ -706,9 +706,9 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const } real x,y,z; - x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); - y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); + x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); + y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); // check to see if we're in a region we shouldn't be building in if ( ConfigServerGame::getBlockBuildRegionPlacement() ) @@ -726,10 +726,10 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const } real quatW,quatX,quatY,quatZ; - quatW = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); - quatX = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL)); - quatY = static_cast(strtod(Unicode::wideToNarrow(argv[7]).c_str(), NULL)); - quatZ = static_cast(strtod(Unicode::wideToNarrow(argv[8]).c_str(), NULL)); + quatW = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); + quatX = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), nullptr)); + quatY = static_cast(strtod(Unicode::wideToNarrow(argv[7]).c_str(), nullptr)); + quatZ = static_cast(strtod(Unicode::wideToNarrow(argv[8]).c_str(), nullptr)); ServerObject * const cell = safe_cast(ContainerInterface::getContainingCellObject(*playerObject)); @@ -934,7 +934,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[2])); ServerObject* object = dynamic_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) { //container does not exist result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); @@ -994,7 +994,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId cellId(Unicode::wideToNarrow(argv[2])); ServerObject* cell = dynamic_cast(NetworkIdManager::getObjectById(cellId)); - if (cell == NULL && cellId != NetworkId::cms_invalid) + if (cell == nullptr && cellId != NetworkId::cms_invalid) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1011,9 +1011,9 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const } real x,y,z; - x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); - z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); + x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); + z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); ServerObject *newObject = 0; ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString); @@ -1070,22 +1070,22 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const NetworkId cellId(Unicode::wideToNarrow(argv[2])); ServerObject * const cell = safe_cast(NetworkIdManager::getObjectById(cellId)); - if (cell == NULL && cellId != NetworkId::cms_invalid) + if (cell == nullptr && cellId != NetworkId::cms_invalid) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } real x,y,z; - x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); - z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); + x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); + z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); real quatW,quatX,quatY,quatZ; - quatW = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL)); - quatX = static_cast(strtod(Unicode::wideToNarrow(argv[7]).c_str(), NULL)); - quatY = static_cast(strtod(Unicode::wideToNarrow(argv[8]).c_str(), NULL)); - quatZ = static_cast(strtod(Unicode::wideToNarrow(argv[9]).c_str(), NULL)); + quatW = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), nullptr)); + quatX = static_cast(strtod(Unicode::wideToNarrow(argv[7]).c_str(), nullptr)); + quatY = static_cast(strtod(Unicode::wideToNarrow(argv[8]).c_str(), nullptr)); + quatZ = static_cast(strtod(Unicode::wideToNarrow(argv[9]).c_str(), nullptr)); ServerObject *newObject = 0; ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString); @@ -1165,7 +1165,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* object = dynamic_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1200,7 +1200,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* object = dynamic_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1236,7 +1236,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const const NetworkId oid (Unicode::wideToNarrow(argv[1])); ServerObject* const object = safe_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else if (object->getClient()) result += getErrorMessage(argv[0], ERR_INVALID_USER); @@ -1268,7 +1268,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const ServerObject* const object = safe_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); // ---------- @@ -1279,11 +1279,11 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { ServerObject * object = ServerWorld::getObject(i); - if(object == NULL) continue; + if(object == nullptr) continue; CreatureObject * creature = object->asCreatureObject(); - if(creature == NULL) continue; + if(creature == nullptr) continue; if(creature->getNetworkId() == oid) continue; @@ -1307,11 +1307,11 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { ServerObject * object = ServerWorld::getObject(i); - if(object == NULL) continue; + if(object == nullptr) continue; CreatureObject * creature = object->asCreatureObject(); - if(creature == NULL) continue; + if(creature == nullptr) continue; if(creature->getParentCell() != CellProperty::getWorldCellProperty()) continue; @@ -1331,9 +1331,9 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); Vector pos; - pos.x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); - pos.y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - pos.z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); + pos.x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); + pos.y = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + pos.z = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); // disallow certain object types from being "move" bool allowMove = true; @@ -1418,7 +1418,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1433,9 +1433,9 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); real r,p,y; - r = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); - p = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); + r = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); + p = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); if (rotateObject(oid, r, p, y)) { result += getErrorMessage(argv[0], ERR_SUCCESS); @@ -1450,7 +1450,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1479,7 +1479,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const // erase keys assigned to this player. s_playerCreatureNameMap.erase(userId); - if (dataTable != NULL) + if (dataTable != nullptr) { StringVector creatureStrings; { @@ -1548,7 +1548,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId const oid(Unicode::wideToNarrow(argv[1])); ServerObject* const o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1580,7 +1580,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - o->deletePobPersistedContents(NULL, DeleteReasons::God); + o->deletePobPersistedContents(nullptr, DeleteReasons::God); result += getErrorMessage(argv[0], ERR_SUCCESS); } else if (isCommand( argv[0], "moveItemInHouseToMe")) @@ -1607,7 +1607,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); TangibleObject* vendor = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (vendor == NULL) + if (vendor == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1621,7 +1621,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); TangibleObject* vendor = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (vendor == NULL) + if (vendor == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1699,13 +1699,13 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); CreatureObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } real scale; - scale = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); + scale = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); o->setMovementScale(scale); result += getErrorMessage(argv[0], ERR_SUCCESS); } @@ -1716,13 +1716,13 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); CreatureObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } real scale; - scale = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); + scale = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); o->setScaleFactor(scale); result += getErrorMessage(argv[0], ERR_SUCCESS); } @@ -1765,7 +1765,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1788,13 +1788,13 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { CachedNetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(oid.getObject()); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } Container const * const container = ContainerInterface::getContainer(*o); - if (container == NULL) + if (container == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1811,7 +1811,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1846,7 +1846,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1881,7 +1881,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = ServerWorld::findObjectByNetworkId(oid); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1914,7 +1914,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); TangibleObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1940,7 +1940,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); const ServerObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1976,7 +1976,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const ServerMessageForwarding::end(); - if (ObjectTemplateList::reload(templateFile) == NULL) + if (ObjectTemplateList::reload(templateFile) == nullptr) { result += getErrorMessage(argv[0], ERR_TEMPLATE_NOT_LOADED); return true; @@ -1991,7 +1991,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); CreatureObject * creature = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (creature == NULL || !creature->isIncapacitated()) + if (creature == nullptr || !creature->isIncapacitated()) result += Unicode::narrowToWide("no"); else if (creature->isDead()) result += Unicode::narrowToWide("dead"); @@ -2011,11 +2011,11 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const LocationData d; d.name = argv[2]; Vector pos; - pos.x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - pos.y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); - pos.z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); + pos.x = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + pos.y = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); + pos.z = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); d.location.setCenter(pos); - float radius = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL)); + float radius = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), nullptr)); d.location.setRadius(radius); o->addLocationTarget(d); } @@ -2079,7 +2079,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const oid.getObject()); const CreatureObject * creature = dynamic_cast( tangible); - if (creature != NULL) + if (creature != nullptr) { char buffer[1024]; sprintf(buffer, "he:%d, co=%d, ac=%d, st=%d, mi=%d, wi=%d", @@ -2091,7 +2091,7 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const creature->getAttribute(Attributes::Willpower)); result += Unicode::narrowToWide(buffer); } - else if (tangible != NULL) + else if (tangible != nullptr) { char buffer[1024]; sprintf(buffer, "max hp = %d, damage taken = %d", @@ -2156,13 +2156,13 @@ bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const bool value = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), 0, 10) != 0; ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(actorId)); - CreatureObject * const c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * const c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -2261,7 +2261,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const const char *objectTemplateName = obj->getObjectTemplateName(); - result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total observers (%d observers on this game server)\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "NULL object template"), obj->getObserversCount(), observerList.size())); + result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total observers (%d observers on this game server)\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "nullptr object template"), obj->getObserversCount(), observerList.size())); if (!observers.empty()) { @@ -2560,7 +2560,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const else if(isCommand(argv[0], "setPathLinkDistance")) { - float dist = static_cast(strtod(Unicode::wideToNarrow(argv[1]).c_str(), NULL)); + float dist = static_cast(strtod(Unicode::wideToNarrow(argv[1]).c_str(), nullptr)); CityPathGraphManager::setLinkDistance(dist); @@ -2601,7 +2601,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { CachedNetworkId const oid(Unicode::wideToNarrow(argv[1])); TangibleObject * object = dynamic_cast(oid.getObject()); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else { @@ -2619,7 +2619,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { CachedNetworkId const oid(Unicode::wideToNarrow(argv[1])); TangibleObject * object = dynamic_cast(oid.getObject()); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else { @@ -2653,7 +2653,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const ServerObject * object = dynamic_cast(oid.getObject()); CreatureObject * creature = dynamic_cast(object); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else { @@ -2694,7 +2694,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[1])); CreatureObject *creature = dynamic_cast(NetworkIdManager::getObjectById(oid)); - PlayerObject *player = NULL; + PlayerObject *player = nullptr; if (creature) player = PlayerCreatureController::getPlayerObject(creature); if (player) @@ -2739,7 +2739,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[1])); CreatureObject *creature = dynamic_cast(NetworkIdManager::getObjectById(oid)); - PlayerObject *player = NULL; + PlayerObject *player = nullptr; if (creature) player = PlayerCreatureController::getPlayerObject(creature); if (player) @@ -2864,7 +2864,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); const InstallationObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -2888,7 +2888,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[1])); InstallationObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -2904,7 +2904,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); const InstallationObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -2928,7 +2928,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[1])); InstallationObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -3056,7 +3056,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject *o = safe_cast(NetworkIdManager::getObjectById(oid)); - if (o != NULL && o->asCreatureObject() != NULL && o->isPlayerControlled()) + if (o != nullptr && o->asCreatureObject() != nullptr && o->isPlayerControlled()) { CreatureObject * creatureTarget = o->asCreatureObject(); @@ -3068,7 +3068,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const for (CreatureObject::SkillList::const_iterator i = skills.begin(); i != skills.end(); ++i) { const SkillObject * profession = (*i)->findProfessionForSkill(); - if (profession != NULL) + if (profession != nullptr) professionName = profession->getSkillName(); } } @@ -3317,7 +3317,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId oid (Unicode::wideToNarrow(argv[1])); ServerObject* const object = safe_cast(NetworkIdManager::getObjectById(oid)); - if (object == NULL) + if (object == nullptr) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else if (!object->getClient()) result += getErrorMessage(argv[0], ERR_INVALID_USER); @@ -3346,7 +3346,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId ownerId (Unicode::wideToNarrow(argv[2])); ServerObject * const object = safe_cast(NetworkIdManager::getObjectById(houseId)); - TangibleObject * const tangible = object ? object->asTangibleObject() : NULL; + TangibleObject * const tangible = object ? object->asTangibleObject() : nullptr; if (!tangible) result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); else @@ -3359,7 +3359,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { ServerObject * object = safe_cast(NetworkIdManager::getObjectById(playerObject->getLookAtTarget())); - if (NULL == object) + if (nullptr == object) object = playerObject; RegionMaster::RegionVector rv; @@ -3373,7 +3373,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const for (RegionMaster::RegionVector::const_iterator it = rv.begin(); it != rv.end(); ++it) { Region const * const r = *it; - if (NULL != r) + if (nullptr != r) { _itoa(r->getGeography(), buf, 10); result += Unicode::narrowToWide(buf); @@ -3390,7 +3390,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { ServerObject * const target = safe_cast(NetworkIdManager::getObjectById(playerObject->getLookAtTarget())); - if (NULL == target) + if (nullptr == target) { result += Unicode::narrowToWide("Invalid target"); return true; @@ -3434,7 +3434,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const ServerObject * object = safe_cast(NetworkIdManager::getObjectById(playerObject->getLookAtTarget())); - if (NULL == object) + if (nullptr == object) object = playerObject; Vector const & pos_w = object->getPosition_w(); @@ -3449,7 +3449,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { ServerObject * object = safe_cast(NetworkIdManager::getObjectById(playerObject->getLookAtTarget())); - if (NULL == object) + if (nullptr == object) object = playerObject; Vector const & pos_w = object->getPosition_w(); @@ -3463,7 +3463,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { ServerObject * object = safe_cast(NetworkIdManager::getObjectById(playerObject->getLookAtTarget())); - if (NULL == object) + if (nullptr == object) object = playerObject; Vector const & pos_w = object->getPosition_w(); @@ -3477,7 +3477,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); const ServerObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -3503,7 +3503,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); const ServerObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -3576,13 +3576,13 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject const* c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject const* c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -3590,7 +3590,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const else { PlayerObject const* p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -3612,8 +3612,8 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject* c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject* c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -3623,7 +3623,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const result += Unicode::narrowToWide("specified object is not authoritative on this game server\n"); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -3631,7 +3631,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const else { PlayerObject* p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -3668,20 +3668,20 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -3755,14 +3755,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject const* t = o->asTangibleObject(); - if (t == NULL) + if (t == nullptr) { result += Unicode::narrowToWide("specified object is not a tangible object\n"); return true; @@ -3797,14 +3797,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId sourceOid(Unicode::wideToNarrow(argv[1])); ServerObject * sourceSo = dynamic_cast(ServerWorld::findObjectByNetworkId(sourceOid)); - if (sourceSo == NULL) + if (sourceSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str())); return true; } TangibleObject * sourceTo = sourceSo->asTangibleObject(); - if (sourceTo == NULL) + if (sourceTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str())); return true; @@ -3812,14 +3812,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const NetworkId targetOid(Unicode::wideToNarrow(argv[2])); ServerObject * targetSo = dynamic_cast(ServerWorld::findObjectByNetworkId(targetOid)); - if (targetSo == NULL) + if (targetSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", targetOid.getValueString().c_str())); return true; } TangibleObject * targetTo = targetSo->asTangibleObject(); - if (targetTo == NULL) + if (targetTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", targetOid.getValueString().c_str())); return true; @@ -3839,14 +3839,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId sourceOid(Unicode::wideToNarrow(argv[1])); ServerObject * sourceSo = dynamic_cast(ServerWorld::findObjectByNetworkId(sourceOid)); - if (sourceSo == NULL) + if (sourceSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str())); return true; } TangibleObject * sourceTo = sourceSo->asTangibleObject(); - if (sourceTo == NULL) + if (sourceTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str())); return true; @@ -3866,14 +3866,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId sourceOid(Unicode::wideToNarrow(argv[1])); ServerObject * sourceSo = dynamic_cast(ServerWorld::findObjectByNetworkId(sourceOid)); - if (sourceSo == NULL) + if (sourceSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str())); return true; } TangibleObject * sourceTo = sourceSo->asTangibleObject(); - if (sourceTo == NULL) + if (sourceTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str())); return true; @@ -3891,14 +3891,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId sourceOid(Unicode::wideToNarrow(argv[1])); ServerObject const * sourceSo = dynamic_cast(ServerWorld::findObjectByNetworkId(sourceOid)); - if (sourceSo == NULL) + if (sourceSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str())); return true; } CreatureObject const * sourceCo = sourceSo->asCreatureObject(); - if (sourceCo == NULL) + if (sourceCo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a creature object\n", sourceOid.getValueString().c_str())); return true; @@ -3915,14 +3915,14 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId sourceOid(Unicode::wideToNarrow(argv[1])); ServerObject * sourceSo = dynamic_cast(ServerWorld::findObjectByNetworkId(sourceOid)); - if (sourceSo == NULL) + if (sourceSo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str())); return true; } CreatureObject * sourceCo = sourceSo->asCreatureObject(); - if (sourceCo == NULL) + if (sourceCo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a creature object\n", sourceOid.getValueString().c_str())); return true; @@ -3931,7 +3931,7 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const result += Unicode::narrowToWide(FormattedString<512>().sprintf("dumping %s's command queue contents\n", sourceCo->getNetworkId().getValueString().c_str())); CommandQueue * queue = sourceCo->getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { std::string output; queue->spew(&output); @@ -3947,26 +3947,26 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); time_t const timeStartInterval = ((p->getChatSpamTimeEndInterval() > 0) ? static_cast(p->getChatSpamTimeEndInterval() - (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60)) : 0); if ((timeStartInterval <= 0) || (timeNow < timeStartInterval)) @@ -3986,28 +3986,28 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } Client * client = o->getClient(); - if (client == NULL) + if (client == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str())); return true; @@ -4042,28 +4042,28 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } Client * client = o->getClient(); - if (client == NULL) + if (client == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str())); return true; @@ -4083,28 +4083,28 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } Client * client = o->getClient(); - if (client == NULL) + if (client == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str())); return true; @@ -4180,12 +4180,12 @@ bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const } else { - result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getFootprint() returns NULL.\n", oid.getValueString().c_str())); + result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getFootprint() returns nullptr.\n", oid.getValueString().c_str())); } } else { - result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getCollisionProperty() returns NULL.\n", oid.getValueString().c_str())); + result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getCollisionProperty() returns nullptr.\n", oid.getValueString().c_str())); } } else diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp index e4a928c5..77063e84 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp @@ -100,7 +100,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { NetworkId oid (Unicode::wideToNarrow (argv[1])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -224,7 +224,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const // This is now a no-op, but left in to avoid breaking the god client // NetworkId oid (Unicode::wideToNarrow (argv[1])); // ServerObject* object = ServerWorld::findObjectByNetworkId(oid); -// if (object == NULL) +// if (object == nullptr) // { // result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); // return true; @@ -241,7 +241,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { NetworkId oid (Unicode::wideToNarrow(argv[1])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -317,7 +317,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { ServerObject * const userServerObject = ServerWorld::findObjectByNetworkId(userId); - if (userServerObject != NULL) + if (userServerObject != nullptr) { NetworkId specifiedNetworkId; @@ -329,7 +329,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { CreatureObject * const userCreatureObject = CreatureObject::asCreatureObject(userServerObject); - if (userCreatureObject != NULL) + if (userCreatureObject != nullptr) { specifiedNetworkId = userCreatureObject->getLookAtTarget(); } @@ -337,7 +337,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const ServerObject * const specifiedServerObject = ServerWorld::findObjectByNetworkId(specifiedNetworkId); - if (specifiedServerObject != NULL) + if (specifiedServerObject != nullptr) { DynamicVariableList const & objVarList = specifiedServerObject->getObjVars(); FormattedString<1024> fs; @@ -357,7 +357,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { NetworkId oid = NetworkId(Unicode::wideToNarrow(argv[1])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -376,7 +376,7 @@ bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const { NetworkId oid = NetworkId(Unicode::wideToNarrow(argv[1])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp index d212d0ca..a9f691b6 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp @@ -103,13 +103,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const* o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject const* c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject const* c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -117,7 +117,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject const* p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -185,7 +185,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St result += Unicode::narrowToWide(FormattedString<512>().sprintf("lifetime PvP kills: %ld\n",p->getLifetimePvpKills())); result += Unicode::narrowToWide(FormattedString<512>().sprintf("next GCW rating calculation time: %ld",p->getNextGcwRatingCalcTime())); - int32 const now = static_cast(::time(NULL)); + int32 const now = static_cast(::time(nullptr)); if (p->getNextGcwRatingCalcTime() > 0) { if (p->getNextGcwRatingCalcTime() >= now) @@ -223,13 +223,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -237,7 +237,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -259,13 +259,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -273,7 +273,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -295,13 +295,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -309,7 +309,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -331,13 +331,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -345,7 +345,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -369,13 +369,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -383,7 +383,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -405,13 +405,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -419,7 +419,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -441,13 +441,13 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - CreatureObject * c = (o ? o->asCreatureObject() : NULL); - if (o == NULL) + CreatureObject * c = (o ? o->asCreatureObject() : nullptr); + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } - else if (c == NULL) + else if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -455,7 +455,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St else { PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -477,21 +477,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -585,7 +585,7 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -612,21 +612,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -660,21 +660,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -708,21 +708,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -756,21 +756,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -804,21 +804,21 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -852,14 +852,14 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId const oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; @@ -874,14 +874,14 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId const actorOid(Unicode::wideToNarrow(argv[1])); ServerObject const * const actorSo = dynamic_cast(ServerWorld::findObjectByNetworkId(actorOid)); - if (actorSo == NULL) + if (actorSo == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject const * const actorTo = actorSo->asTangibleObject(); - if (actorTo == NULL) + if (actorTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", actorOid.getValueString().c_str())); return true; @@ -889,14 +889,14 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St NetworkId const targetOid(Unicode::wideToNarrow(argv[2])); ServerObject const * const targetSo = dynamic_cast(ServerWorld::findObjectByNetworkId(targetOid)); - if (targetSo == NULL) + if (targetSo == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject const * const targetTo = targetSo->asTangibleObject(); - if (targetTo == NULL) + if (targetTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", targetOid.getValueString().c_str())); return true; @@ -924,14 +924,14 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St { NetworkId const actorOid(Unicode::wideToNarrow(argv[1])); ServerObject * const actorSo = dynamic_cast(ServerWorld::findObjectByNetworkId(actorOid)); - if (actorSo == NULL) + if (actorSo == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject * const actorTo = actorSo->asTangibleObject(); - if (actorTo == NULL) + if (actorTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", actorOid.getValueString().c_str())); return true; @@ -939,14 +939,14 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St NetworkId const targetOid(Unicode::wideToNarrow(argv[2])); ServerObject * const targetSo = dynamic_cast(ServerWorld::findObjectByNetworkId(targetOid)); - if (targetSo == NULL) + if (targetSo == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } TangibleObject * const targetTo = targetSo->asTangibleObject(); - if (targetTo == NULL) + if (targetTo == nullptr) { result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", targetOid.getValueString().c_str())); return true; @@ -968,28 +968,28 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St NetworkId const oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } ShipObject const * const ship = ShipObject::getContainingShipObject(c); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide("specified character object is not in a ship\n"); return true; @@ -1042,28 +1042,28 @@ bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const St NetworkId const oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; } ShipObject const * const ship = ShipObject::getContainingShipObject(c); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide("specified character object is not in a ship\n"); return true; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp index 2d22864d..cde60a8e 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp @@ -73,7 +73,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con CachedNetworkId harvester(Unicode::wideToNarrow (argv[1])); ServerObject* harvesterObject = safe_cast(harvester.getObject()); - if (harvesterObject == NULL) + if (harvesterObject == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -90,7 +90,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con CachedNetworkId harvester(Unicode::wideToNarrow (argv[1])); ServerObject* harvesterObject = safe_cast(harvester.getObject()); - if (harvesterObject == NULL) + if (harvesterObject == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -123,7 +123,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con CachedNetworkId harvester(Unicode::wideToNarrow (argv[1])); ServerObject* harvesterObject = safe_cast(harvester.getObject()); - if (harvesterObject == NULL) + if (harvesterObject == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -208,7 +208,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con ResourceContainerObject * const container = dynamic_cast(NetworkIdManager::getObjectById(contId)); std::string const & resourcePath = Unicode::wideToNarrow(argv[2]); ResourceTypeObject * const resType = ServerUniverse::getInstance().getResourceTypeByName(resourcePath); - int const amount = strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10); + int const amount = strtol(Unicode::wideToNarrow (argv[3]).c_str (), nullptr, 10); NetworkId const source(Unicode::wideToNarrow (argv[4])); if (container && resType) @@ -228,7 +228,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con { NetworkId contId (Unicode::wideToNarrow (argv[1])); ResourceContainerObject* container=dynamic_cast(NetworkIdManager::getObjectById(contId)); - if (container != NULL) + if (container != nullptr) { NetworkId sourceId; if (argv.size() >= 3) @@ -251,7 +251,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con { NetworkId contId (Unicode::wideToNarrow (argv[1])); ResourceContainerObject* container=dynamic_cast(NetworkIdManager::getObjectById(contId)); - if (container != NULL) + if (container != nullptr) { if (container->debugRecycle()) result += getErrorMessage(argv[0], ERR_SUCCESS); @@ -267,7 +267,7 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con CachedNetworkId contId (Unicode::wideToNarrow (argv[1])); ResourceContainerObject* container=dynamic_cast(contId.getObject()); ResourceTypeObject *resType=ServerUniverse::getInstance().getResourceTypeByName(Unicode::wideToNarrow(argv[2])); - int amount=strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10); + int amount=strtol(Unicode::wideToNarrow (argv[3]).c_str (), nullptr, 10); if (container && resType) { @@ -307,8 +307,8 @@ bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, con { const std::string parentResourceClassName (Unicode::wideToNarrow(argv[1])); const std::string resourceTypeName (Unicode::wideToNarrow(argv[2])); - const int surveyRange = strtol(Unicode::wideToNarrow(argv[3]).c_str(),NULL,10); - const int numPoints = strtol(Unicode::wideToNarrow(argv[4]).c_str(),NULL,10); + const int surveyRange = strtol(Unicode::wideToNarrow(argv[3]).c_str(),nullptr,10); + const int numPoints = strtol(Unicode::wideToNarrow(argv[4]).c_str(),nullptr,10); const Object * player = NetworkIdManager::getObjectById(userId); if (player) diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp index a2703595..99f1f236 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp @@ -62,7 +62,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow (argv[2])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage (argv [0], ERR_INVALID_OBJECT); return true; @@ -81,7 +81,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[2])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -100,7 +100,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const { ServerObject * const userServerObject = ServerWorld::findObjectByNetworkId(userId); - if (userServerObject != NULL) + if (userServerObject != nullptr) { NetworkId specifiedNetworkId; @@ -112,7 +112,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const { CreatureObject * const userCreatureObject = CreatureObject::asCreatureObject(userServerObject); - if (userCreatureObject != NULL) + if (userCreatureObject != nullptr) { specifiedNetworkId = userCreatureObject->getLookAtTarget(); } @@ -120,7 +120,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const ServerObject * const specifiedServerObject = ServerObject::getServerObject(specifiedNetworkId); - if (specifiedServerObject != NULL) + if (specifiedServerObject != nullptr) { ScriptList const & scripts = specifiedServerObject->getScriptObject()->getScripts(); FormattedString<1024> fs; @@ -226,7 +226,7 @@ bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const // get the object id NetworkId oid(Unicode::wideToNarrow(argv[oidIndex])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp index f789d127..c81f8966 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp @@ -301,7 +301,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const return true; } - unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10); + unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), nullptr, 10); const bool isPublic = (val != 0); SetConnectionServerPublic const p(isPublic); @@ -354,8 +354,8 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const return true; } - unsigned long secsToWait = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10); - unsigned long maxSecs = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10); + unsigned long secsToWait = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), nullptr, 10); + unsigned long maxSecs = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), nullptr, 10); Unicode::String systemMessage; for( size_t i=3; i< argv.size(); ++i) { @@ -386,7 +386,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const return true; } - unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10); + unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), nullptr, 10); switch (val) { case 1: @@ -482,7 +482,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject* object = ServerWorld::findObjectByNetworkId(oid); - if (object == NULL) + if (object == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -574,7 +574,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const } else if (isAbbrev (argv[0], "getSceneId")) { - if (user == NULL) + if (user == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -596,7 +596,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const return true; } - unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10); + unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), nullptr, 10); if (user->getClient()->setGodMode(val != 0)) result += getErrorMessage (argv[0], ERR_SUCCESS); else @@ -637,7 +637,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const { std::string tableName; tableName = Unicode::wideToNarrow(argv[1]); - if (DataTableManager::reload(tableName) != NULL) + if (DataTableManager::reload(tableName) != nullptr) { ServerMessageForwarding::beginBroadcast(); @@ -694,7 +694,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const else { PlanetObject * planet = ServerUniverse::getInstance().getCurrentPlanet(); - if (planet == NULL) + if (planet == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -708,7 +708,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const for (std::vector::const_iterator i = regions.begin(); i != regions.end(); ++i) { const RegionRectangle * ro = dynamic_cast(*i); - if (ro != NULL) + if (ro != nullptr) { float minX, minY, maxX, maxY; ro->getExtent(minX, minY, maxX, maxY); @@ -717,7 +717,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const client->send(mrgrr, true); } const RegionCircle* co = dynamic_cast(*i); - if (co != NULL) + if (co != nullptr) { float centerX, centerY, radius; co->getExtent(centerX, centerY, radius); @@ -743,7 +743,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const { uint32 processId = GameServer::getInstance().getProcessId(); if (argv.size() > 3) - processId = strtoul(Unicode::wideToNarrow(argv[3]).c_str(), NULL, 10); + processId = strtoul(Unicode::wideToNarrow(argv[3]).c_str(), nullptr, 10); std::string op = Unicode::wideToNarrow(argv[1]) + " " + Unicode::wideToNarrow(argv[2]); @@ -760,7 +760,7 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const { uint32 processId = GameServer::getInstance().getProcessId(); if (argv.size() > 2) - processId = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10); + processId = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), nullptr, 10); std::string op(Unicode::wideToNarrow(argv[1])); if (processId == GameServer::getInstance().getProcessId()) @@ -840,8 +840,8 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const } else if (isAbbrev(argv[0], "getRegionsAt")) { - float x = static_cast(strtod(Unicode::wideToNarrow(argv[1]).c_str(), NULL)); - float z = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); + float x = static_cast(strtod(Unicode::wideToNarrow(argv[1]).c_str(), nullptr)); + float z = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); std::vector results; @@ -990,10 +990,10 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const //" ", "Save out an area for buildout datatables" std::string const &serverFilename = Unicode::wideToNarrow(argv[1]); std::string const &clientFilename = Unicode::wideToNarrow(argv[2]); - float x1 = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - float z1 = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); - float x2 = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); - float z2 = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL)); + float x1 = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + float z1 = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); + float x2 = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); + float z2 = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), nullptr)); ServerBuildoutManager::saveArea(serverFilename, clientFilename, x1, z1, x2, z2); } else if (isAbbrev(argv[0], "clientSaveBuildoutArea")) @@ -1001,10 +1001,10 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const //" " std::string const &scene = Unicode::wideToNarrow(argv[1]); std::string const &areaName = Unicode::wideToNarrow(argv[2]); - float x1 = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); - float z1 = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL)); - float x2 = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL)); - float z2 = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL)); + float x1 = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); + float z1 = static_cast(strtod(Unicode::wideToNarrow(argv[4]).c_str(), nullptr)); + float x2 = static_cast(strtod(Unicode::wideToNarrow(argv[5]).c_str(), nullptr)); + float z2 = static_cast(strtod(Unicode::wideToNarrow(argv[6]).c_str(), nullptr)); if (scene == ConfigServerGame::getSceneID() && user->getClient()) ServerBuildoutManager::clientSaveArea(*user->getClient(), areaName, x1, z1, x2, z2); } @@ -1044,7 +1044,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const if (argv.size() == 2) { // specify server by process id - uint32 serverId = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10); + uint32 serverId = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), nullptr, 10); if (serverId != 0) { ExcommunicateGameServerMessage exmsg(serverId, 0, ""); @@ -1058,7 +1058,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { // specify server by scene & preload role number std::string const &scene = Unicode::wideToNarrow(argv[1]); - uint32 preloadRole = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10); + uint32 preloadRole = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), nullptr, 10); GenericValueTypeMessage > msg("RestartServerByRoleMessage", std::make_pair(scene, preloadRole)); if (scene == ConfigServerGame::getSceneID()) @@ -1072,8 +1072,8 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { // specify server by geographic location std::string const &scene = Unicode::wideToNarrow(argv[1]); - int x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL)); - int z = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL)); + int x = static_cast(strtod(Unicode::wideToNarrow(argv[2]).c_str(), nullptr)); + int z = static_cast(strtod(Unicode::wideToNarrow(argv[3]).c_str(), nullptr)); RestartServerMessage msg(scene, x, z); if (scene == ConfigServerGame::getSceneID()) @@ -1322,14 +1322,14 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const NetworkId oid2(Unicode::wideToNarrow(argv[2])); ServerObject const * const object1 = ServerWorld::findObjectByNetworkId(oid1); - if (object1 == NULL) + if (object1 == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } ServerObject const * const object2 = ServerWorld::findObjectByNetworkId(oid2); - if (object2 == NULL) + if (object2 == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; @@ -1366,7 +1366,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const TerrainObject const * terrain = TerrainObject::getConstInstance(); if (!terrain) { - result += Unicode::narrowToWide("terrain object is NULL\n"); + result += Unicode::narrowToWide("terrain object is nullptr\n"); return true; } @@ -1443,7 +1443,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const TerrainObject const * terrain = TerrainObject::getConstInstance(); if (!terrain) { - result += Unicode::narrowToWide("terrain object is NULL\n"); + result += Unicode::narrowToWide("terrain object is nullptr\n"); return true; } @@ -1491,7 +1491,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const TerrainObject * terrain = TerrainObject::getInstance(); if (!terrain) { - result += Unicode::narrowToWide("terrain object is NULL\n"); + result += Unicode::narrowToWide("terrain object is nullptr\n"); return true; } @@ -1557,8 +1557,8 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { result += Unicode::narrowToWide(iterFind->second.getDebugString()); - ServerObject const * const soGroupObject = (iterFind->second.groupId.isValid() ? safe_cast(NetworkIdManager::getObjectById(iterFind->second.groupId)) : NULL); - GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : NULL); + ServerObject const * const soGroupObject = (iterFind->second.groupId.isValid() ? safe_cast(NetworkIdManager::getObjectById(iterFind->second.groupId)) : nullptr); + GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : nullptr); if (groupObject) { unsigned int const secondsLeftOnGroupPickup = groupObject->getSecondsLeftOnGroupPickup(); @@ -1717,7 +1717,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBrief")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); std::multimap, std::string> > resultList; NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList); @@ -1726,7 +1726,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeAfterBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1749,7 +1749,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBeforeBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1772,7 +1772,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBetweenBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1817,7 +1817,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "listCharacterLastLoginTimeDetailed")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); std::multimap, std::string> > resultList; NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList); @@ -1829,7 +1829,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeAfterDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1855,7 +1855,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBeforeDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1881,7 +1881,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBetweenDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -1929,7 +1929,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTime")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); int const argc = argv.size(); Unicode::String mailBody; @@ -1952,7 +1952,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_days == days) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[2])) && (s_mailSubject == argv[3]) && (s_mailBody == mailBody)) { @@ -1991,7 +1991,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeAfter")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2028,7 +2028,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody)) { @@ -2067,7 +2067,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeBefore")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2104,7 +2104,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody)) { @@ -2143,7 +2143,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeBetween")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2202,7 +2202,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoffLower == cutoffLower) && (s_cutoffUpper == cutoffUpper) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[13])) && (s_mailSubject == argv[14]) && (s_mailBody == mailBody)) { @@ -2244,7 +2244,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "listCharacterCreateTimeBrief")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); std::multimap, std::string> > resultList; NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList); @@ -2253,7 +2253,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeAfterBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2276,7 +2276,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeBeforeBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2299,7 +2299,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeBetweenBrief")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2344,7 +2344,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "listCharacterCreateTimeDetailed")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); std::multimap, std::string> > resultList; NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList); @@ -2356,7 +2356,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeAfterDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2382,7 +2382,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeBeforeDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2408,7 +2408,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "listCharacterCreateTimeBetweenDetailed")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2456,7 +2456,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else if (isAbbrev(argv[0], "sendMailToCharacterCreateTime")) { int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str()); - time_t const cutoff = std::max(static_cast(0), static_cast(::time(NULL) - (60 * 60 * 24 * days))); + time_t const cutoff = std::max(static_cast(0), static_cast(::time(nullptr) - (60 * 60 * 24 * days))); int const argc = argv.size(); Unicode::String mailBody; @@ -2479,7 +2479,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_days == days) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[2])) && (s_mailSubject == argv[3]) && (s_mailBody == mailBody)) { @@ -2518,7 +2518,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeAfter")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2555,7 +2555,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody)) { @@ -2594,7 +2594,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeBefore")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2631,7 +2631,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody)) { @@ -2670,7 +2670,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const } else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeBetween")) { - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900; timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1; @@ -2729,7 +2729,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const static Unicode::String s_mailBody; static time_t s_confirmationTimeout = 0; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if ((s_cutoffLower == cutoffLower) && (s_cutoffUpper == cutoffUpper) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[13])) && (s_mailSubject == argv[14]) && (s_mailBody == mailBody)) { @@ -2776,7 +2776,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const uint32 const targetStationId = static_cast(atoi(Unicode::wideToNarrow(argv[4]).c_str())); std::string const targetCluster = Unicode::wideToNarrow(argv[5]); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); result += Unicode::narrowToWide(FormattedString<512>().sprintf(" currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str())); result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n characterCreateTime: %ld\n", sourceCharacterCreateTime)); @@ -2837,7 +2837,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { std::string const sourceCluster = Unicode::wideToNarrow(argv[1]); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); result += Unicode::narrowToWide(FormattedString<512>().sprintf(" currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str())); result += Unicode::narrowToWide(FormattedString<512>().sprintf(" sourceCluster: %s\n", sourceCluster.c_str())); @@ -2893,7 +2893,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { result += Unicode::narrowToWide(FormattedString<512>().sprintf(" free CTS info file: %s\n", FreeCtsDataTable::getFreeCtsFileName().c_str())); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); result += Unicode::narrowToWide(FormattedString<512>().sprintf(" currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str())); } @@ -3125,7 +3125,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else { result += Unicode::narrowToWide(FormattedString<1024>().sprintf("Requesting adjustment of imperial score for GCW score category (%s) by (%d). It can take up to 1 minute for the adjustment request to be completed.\n", category.c_str(), adjustment)); - ServerUniverse::getInstance().adjustGcwImperialScore("remote server adjustGcwImperialScore", NULL, category, adjustment); + ServerUniverse::getInstance().adjustGcwImperialScore("remote server adjustGcwImperialScore", nullptr, category, adjustment); } } else if (isAbbrev(argv[0], "adjustGcwRebelScore")) @@ -3148,7 +3148,7 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const else { result += Unicode::narrowToWide(FormattedString<1024>().sprintf("Requesting adjustment of rebel score for GCW score category (%s) by (%d). It can take up to 1 minute for the adjustment request to be completed.\n", category.c_str(), adjustment)); - ServerUniverse::getInstance().adjustGcwRebelScore("remote server adjustGcwRebelScore", NULL, category, adjustment); + ServerUniverse::getInstance().adjustGcwRebelScore("remote server adjustGcwRebelScore", nullptr, category, adjustment); } } else if (isAbbrev(argv[0], "decayGcwScore")) @@ -3202,20 +3202,20 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } - if (PlayerCreatureController::getPlayerObject(c) == NULL) + if (PlayerCreatureController::getPlayerObject(c) == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; @@ -3240,21 +3240,21 @@ bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const { NetworkId oid(Unicode::wideToNarrow(argv[1])); ServerObject const * const o = dynamic_cast(ServerWorld::findObjectByNetworkId(oid)); - if (o == NULL) + if (o == nullptr) { result += getErrorMessage(argv[0], ERR_INVALID_OBJECT); return true; } CreatureObject const * const c = o->asCreatureObject(); - if (c == NULL) + if (c == nullptr) { result += Unicode::narrowToWide("specified object is not a creature object\n"); return true; } PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c); - if (p == NULL) + if (p == nullptr) { result += Unicode::narrowToWide("specified object is not a character object\n"); return true; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp index 38efa02a..3fc8ad7d 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp @@ -116,7 +116,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S slotNameToken.clear (); } - if (ship == NULL) + if (ship == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); return true; @@ -126,7 +126,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (chassisType); - if (shipChassis == NULL) + if (shipChassis == nullptr) { result += Unicode::narrowToWide ("No chassis"); return true; @@ -178,7 +178,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S if (ship->isSlotInstalled(chassisSlot)) shipComponentData = ship->createShipComponentData(chassisSlot); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { result += Unicode::narrowToWide (" Loaded NONE\n"); } @@ -223,7 +223,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S { TangibleObject * const component = findTangible (user->getLookAtTarget (), argv, 1); - if (component == NULL) + if (component == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); return true; @@ -231,7 +231,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*component); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { result += Unicode::narrowToWide ("Not a ship component"); return true; @@ -252,13 +252,13 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S TangibleObject * const component = findTangible (NetworkId::cms_invalid, argv, 1); std::string const & slotName = Unicode::wideToNarrow (argv [2]); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; } - if (component == NULL) + if (component == nullptr) { result += Unicode::narrowToWide ("no component"); return true; @@ -279,14 +279,14 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S } ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (ship->getChassisType ()); - if (shipChassis == NULL) + if (shipChassis == nullptr) { result += Unicode::narrowToWide ("Ship chassis invalid"); return true; } ShipChassisSlot const * const slot = shipChassis->getSlot (shipChassisSlotType); - if (slot == NULL) + if (slot == nullptr) { result += Unicode::narrowToWide ("Ship chassis does not support that slot"); return true; @@ -294,7 +294,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*component); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { result += Unicode::narrowToWide ("Not a ship component"); return true; @@ -325,7 +325,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S std::string const & componentName = Unicode::wideToNarrow (argv [1]); std::string const & slotName = Unicode::wideToNarrow (argv [2]); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; @@ -334,7 +334,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S uint32 const componentCrc = Crc::normalizeAndCalculate (componentName.c_str ()); ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { result += Unicode::narrowToWide ("Invalid component name"); return true; @@ -364,13 +364,13 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S TangibleObject * const targetContainer = findTangible (user->getInventory ()->getNetworkId (), argv, 2); std::string const & slotName = Unicode::wideToNarrow (argv [1]); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; } - if (targetContainer == NULL) + if (targetContainer == nullptr) { result += Unicode::narrowToWide ("no target container"); return true; @@ -405,7 +405,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S ShipObject * const ship = dynamic_cast(findTangible (user->getLookAtTarget (), argv, 2)); std::string const & slotName = Unicode::wideToNarrow (argv [1]); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; @@ -436,14 +436,14 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S else if (isCommand (argv[0], CommandNames::pseudoDamageShip)) { ShipObject const * const victimShipObject = user->getPilotedShip(); - if (victimShipObject == NULL) + if (victimShipObject == nullptr) { result += Unicode::narrowToWide ("You are not piloting a ship."); return true; } ShipObject const * const attackerShipObject = dynamic_cast(findTangible (user->getLookAtTarget (), argv, 2)); - if (attackerShipObject == NULL) + if (attackerShipObject == nullptr) { result += Unicode::narrowToWide ("You don't have attacker ship targeted."); return true; @@ -486,12 +486,12 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S ShipObject const * const idotShip = idot.getShipObject(); - if (ship != NULL && ship != idotShip) + if (ship != nullptr && ship != idotShip) continue; uint32 const chassisType = idotShip->getChassisType(); ShipChassis const * const chassis = ShipChassis::findShipChassisByCrc(chassisType); - std::string const chassisTypeName = (chassis != NULL) ? chassis->getName().getString() : ""; + std::string const chassisTypeName = (chassis != nullptr) ? chassis->getName().getString() : ""; float hpCur = 0.0f; float hpMax = 0.0f; @@ -522,7 +522,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S { ShipObject * const ship = dynamic_cast(findTangible (user->getLookAtTarget (), argv, 4)); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; @@ -546,7 +546,7 @@ bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const S { ShipObject * const ship = dynamic_cast(findTangible (user->getLookAtTarget (), argv, 4)); - if (ship == NULL) + if (ship == nullptr) { result += Unicode::narrowToWide ("no ship"); return true; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp index fc1a1a49..3b356f42 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp @@ -99,7 +99,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -107,7 +107,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { const std::string skillName = Unicode::wideToNarrow (argv[1]); const SkillObject * const skill = SkillManager::getInstance ().getSkill (skillName); - if (skill == NULL) + if (skill == nullptr) { result += Unicode::narrowToWide ("unknown skill"); } @@ -126,7 +126,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 3); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -146,7 +146,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -198,7 +198,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 1); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -233,7 +233,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 1); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -262,7 +262,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 1); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -288,7 +288,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -296,7 +296,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { std::string skillName = Unicode::wideToNarrow (argv[1]); const SkillObject * skill = SkillManager::getInstance ().getSkill (skillName); - if (skill == NULL) + if (skill == nullptr) { result += Unicode::narrowToWide ("unknown skill"); } @@ -317,7 +317,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -336,7 +336,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 1); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -367,7 +367,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -384,7 +384,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -401,7 +401,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -418,7 +418,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 2); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } @@ -435,7 +435,7 @@ bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const { CreatureObject * const creature = findCreature (userId, argv, 1); - if (creature == NULL) + if (creature == nullptr) { result += getErrorMessage (argv[0], ERR_INVALID_OBJECT); } diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp index 9972dcf5..0964cdac 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp @@ -66,9 +66,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const AiShipController::setAttackingEnabled(true); Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[WAR] AI will now attack."), Unicode::emptyString); } @@ -80,9 +80,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const AiShipController::setAttackingEnabled(false); Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[PEACE] AI will no longer attack."), Unicode::emptyString); } @@ -92,20 +92,20 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "path")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if ( (serverObject != NULL) + if ( (serverObject != nullptr) && (argv.size () > 1)) { NetworkId networkId(Unicode::wideToNarrow(argv[1])); AiShipController * const aiShipController = AiShipController::getAiShipController(networkId); - if (aiShipController != NULL) + if (aiShipController != nullptr) { SpacePath * const spacePath = aiShipController->getPath(); - if (spacePath != NULL) + if (spacePath != nullptr) { SpacePath::TransformList const & transformList = spacePath->getTransformList(); SpacePath::TransformList::const_iterator iterTransformList = transformList.begin(); @@ -127,7 +127,7 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const } else { - Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("NULL path"), Unicode::emptyString); + Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("nullptr path"), Unicode::emptyString); } } else @@ -141,9 +141,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "reloaddata")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { AiShipPilotData::reload(); @@ -156,10 +156,10 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "clientDebug")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; int temp; - if (serverObject != NULL) + if (serverObject != nullptr) { if ( serverObject->getObjVars().getItem("ai_debug_string", temp) && (temp > 0)) @@ -180,7 +180,7 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const Client * const client = serverObject->getClient(); - if (client != NULL) + if (client != nullptr) { AiDebugString aiDebugString; aiDebugString.enableClearClientFlag(); @@ -209,9 +209,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "serverDebug")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { AiShipController::setClientDebugEnabled(!AiShipController::isClientDebugEnabled()); @@ -225,9 +225,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "clientDebugText")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { AiDebugString::setTextEnabled(!AiDebugString::isTextEnabled()); @@ -241,12 +241,12 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "maneuver")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; - CreatureObject const * const creatureObject = serverObject ? serverObject->asCreatureObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + CreatureObject const * const creatureObject = serverObject ? serverObject->asCreatureObject() : nullptr; if (serverObject) { - if ((creatureObject != NULL) && (argv.size () > 1)) + if ((creatureObject != nullptr) && (argv.size () > 1)) { AiShipController const * const lookAtAiShipController = AiShipController::getAiShipController(creatureObject->getLookAtTarget()); @@ -295,9 +295,9 @@ bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const else if (isAbbrev(argv[0], "fastAxis")) { Object * const object = NetworkIdManager::getObjectById(userId); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - if (serverObject != NULL) + if (serverObject != nullptr) { Unicode::String systemMessage; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp index 0152e24d..3b91f7f0 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp @@ -42,7 +42,7 @@ bool ConsoleCommandParserVeteran::performParsing (const NetworkId & userId, cons { NetworkId targetPlayer(Unicode::wideToNarrow (argv[1])); ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(targetPlayer)); - Client const * const client = so ? so->getClient() : NULL; + Client const * const client = so ? so->getClient() : nullptr; if (client) { std::string output; @@ -107,7 +107,7 @@ bool ConsoleCommandParserVeteran::performParsing (const NetworkId & userId, cons { NetworkId targetPlayer(Unicode::wideToNarrow(argv[1])); ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(targetPlayer)); - CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject const * const playerCreature = so ? so->asCreatureObject() : nullptr; if (!playerCreature) result += getErrorMessage(argv[0],ERR_INVALID_OBJECT); else @@ -126,7 +126,7 @@ bool ConsoleCommandParserVeteran::performParsing (const NetworkId & userId, cons { std::string url(Unicode::wideToNarrow(argv[1])); ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(userId)); - Client const * const client = so ? so->getClient() : NULL; + Client const * const client = so ? so->getClient() : nullptr; if (client) { client->launchWebBrowser(url); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp index 46e4a6fd..f31601df 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp @@ -41,14 +41,14 @@ #include "sharedCommandParser/CommandParser.h" #include "sharedNetworkMessages/ConsoleChannelMessages.h" -CommandParser * ConsoleMgr::ms_parser = NULL; +CommandParser * ConsoleMgr::ms_parser = nullptr; //----------------------------------------------------------------------- void ConsoleMgr::install() { - if (ms_parser == NULL) + if (ms_parser == nullptr) { ms_parser = new ConsoleCommandParserDefault(); ms_parser->addSubCommand(new ConsoleCommandParserCombatEngine ()); @@ -80,10 +80,10 @@ void ConsoleMgr::install() void ConsoleMgr::remove() { - if (ms_parser != NULL) + if (ms_parser != nullptr) { delete ms_parser; - ms_parser = NULL; + ms_parser = nullptr; } } // ConsoleMgr::remove @@ -93,7 +93,7 @@ void ConsoleMgr::processString(const std::string & msg, Client *from, uint32 msg { DEBUG_REPORT_LOG_PRINT(true, ("Console Message Received: %s\n",(msg.c_str()))); - if (ms_parser == NULL) + if (ms_parser == nullptr) { DEBUG_WARNING(true, ("Console command parser has not been created!")); return; diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleManager.h b/engine/server/library/serverGame/src/shared/console/ConsoleManager.h index f32ac0a3..8f71dbd6 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleManager.h +++ b/engine/server/library/serverGame/src/shared/console/ConsoleManager.h @@ -17,9 +17,9 @@ public: static void install(); static void remove(); - static void processString(const std::string & msg, Client *from = NULL,uint32 msgId = 0); - static void broadcastString(const std::string & msg, Client *to = NULL, uint32 msgId = 0); - static void broadcastString(const CommandParser::String_t & msg, Client *to = NULL, uint32 msgId = 0); + static void processString(const std::string & msg, Client *from = nullptr,uint32 msgId = 0); + static void broadcastString(const std::string & msg, Client *to = nullptr, uint32 msgId = 0); + static void broadcastString(const CommandParser::String_t & msg, Client *to = nullptr, uint32 msgId = 0); static void broadcastString(const std::string & msg, NetworkId to, uint32 msgId = 0); private: diff --git a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp index 040d0a9c..14425612 100755 --- a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp @@ -83,7 +83,7 @@ namespace AiCreatureControllerNamespace bool s_installed = false; typedef std::set ObserverList; - PersistentCrcString * s_defaultCreatureName = NULL; + PersistentCrcString * s_defaultCreatureName = nullptr; void remove(); Location getLocation(ServerObject const & serverObject); @@ -97,7 +97,7 @@ void AiCreatureControllerNamespace::remove() DEBUG_FATAL(!s_installed, ("Not installed.")); delete s_defaultCreatureName; - s_defaultCreatureName = NULL; + s_defaultCreatureName = nullptr; s_installed = false; } @@ -106,9 +106,9 @@ void AiCreatureControllerNamespace::remove() Location AiCreatureControllerNamespace::getLocation(ServerObject const & serverObject) { CellProperty const * const cellProperty = serverObject.getParentCell(); - Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL; - Vector const & positionRelativeToCellOrWorld = (cellObject != NULL) ? serverObject.getPosition_c() : serverObject.getPosition_w(); - NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid; + Object const * const cellObject = (cellProperty != nullptr) ? &cellProperty->getOwner() : nullptr; + Vector const & positionRelativeToCellOrWorld = (cellObject != nullptr) ? serverObject.getPosition_c() : serverObject.getPosition_w(); + NetworkId const & networkIdForCellOrWorld = (cellObject != nullptr) ? cellObject->getNetworkId() : NetworkId::cms_invalid; return Location(positionRelativeToCellOrWorld, networkIdForCellOrWorld, Location::getCrcBySceneName(serverObject.getSceneId())); } @@ -164,10 +164,10 @@ AICreatureController::~AICreatureController() Object * const owner = getOwner(); - if (owner != NULL && owner->isAuthoritative() && !getHibernate() && m_hibernationDelay.get() > 0 && m_hibernationTimer.get() > 0) + if (owner != nullptr && owner->isAuthoritative() && !getHibernate() && m_hibernationDelay.get() > 0 && m_hibernationTimer.get() > 0) ObjectTracker::removeDelayedHibernatingAI(); - if ( (owner != NULL) + if ( (owner != nullptr) && AiLogManager::isLogging(owner->getNetworkId())) { AiLogManager::setLogging(owner->getNetworkId(), false); @@ -205,9 +205,9 @@ void AICreatureController::CreatureNameChangedCallback::modified(AICreatureContr void AICreatureController::handleMessage (int message, float value, const MessageQueue::Data* const data, uint32 flags) { CreatureObject * const owner = static_cast(getOwner()); - if (owner == NULL) + if (owner == nullptr) { - DEBUG_FATAL(true, ("Owner is NULL in AiCreatureController::handleMessage\n")); + DEBUG_FATAL(true, ("Owner is nullptr in AiCreatureController::handleMessage\n")); return; } @@ -219,7 +219,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag AiMovementMessage const * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { if (owner->isAuthoritative()) { @@ -256,7 +256,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetCreatureName) owner(%s)", getDebugInformation().c_str())); MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { setCreatureName(msg->getValue()); } @@ -267,7 +267,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetHomeLocation) owner(%s)", getDebugInformation().c_str())); MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { setHomeLocation(msg->getValue()); } @@ -278,7 +278,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetFrozen) owner(%s)", getDebugInformation().c_str())); MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { setFrozen(msg->getValue()); } @@ -289,7 +289,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetRetreating) owner(%s)", getDebugInformation().c_str())); MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { setRetreating(msg->getValue()); } @@ -300,7 +300,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetLogging) owner(%s)", getDebugInformation().c_str())); MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { setLogging(msg->getValue()); } @@ -333,7 +333,7 @@ void AICreatureController::handleMessage (int message, float value, const Messag case CM_setHibernationDelay: { MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) setHibernationDelay(msg->getValue()); } break; @@ -469,7 +469,7 @@ float AICreatureController::realAlter(float time) CreatureObject * const creatureOwner = getCreature(); #ifdef _DEBUG - AiDebugString * aiDebugString = NULL; + AiDebugString * aiDebugString = nullptr; if (!creatureOwner->getObservers().empty()) { aiDebugString = new AiDebugString; @@ -508,7 +508,7 @@ float AICreatureController::realAlter(float time) if (!creatureOwner->isInWorld() || getHibernate()) { #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { sendDebugAiToClients(*aiDebugString); delete aiDebugString; @@ -522,8 +522,8 @@ float AICreatureController::realAlter(float time) // check floating { CollisionProperty const * const collision = creatureOwner->getCollisionProperty(); - Footprint const * const foot = (collision != NULL) ? collision->getFootprint() : NULL; - bool floating = (foot != NULL) ? foot->isFloating() : false; + Footprint const * const foot = (collision != nullptr) ? collision->getFootprint() : nullptr; + bool floating = (foot != nullptr) ? foot->isFloating() : false; if (floating) { @@ -547,7 +547,7 @@ float AICreatureController::realAlter(float time) // Update our inPathfindingRegion flag whenever the behavior changes CityPathGraph const * graph = CityPathGraphManager::getCityGraphFor(creatureOwner); - m_inPathfindingRegion = (graph != NULL); + m_inPathfindingRegion = (graph != nullptr); applyMovementChange(); } @@ -589,10 +589,10 @@ float AICreatureController::realAlter(float time) bool resetHateTimer = false; CachedNetworkId const & hateTarget = creatureOwner->getHateTarget(); CreatureObject * const hateTargetCreatureObject = CreatureObject::asCreatureObject(hateTarget.getObject()); - CreatureController const * const hateTargetCreatureController = (hateTargetCreatureObject != NULL) ? CreatureController::asCreatureController(hateTargetCreatureObject->getController()) : NULL; + CreatureController const * const hateTargetCreatureController = (hateTargetCreatureObject != nullptr) ? CreatureController::asCreatureController(hateTargetCreatureObject->getController()) : nullptr; - if ( (hateTargetCreatureObject != NULL) - && (hateTargetCreatureController != NULL)) + if ( (hateTargetCreatureObject != nullptr) + && (hateTargetCreatureController != nullptr)) { float const hateTargetMovementSpeedSquared = hateTargetCreatureController->getCurrentVelocity().magnitudeSquared(); float const hateTargetWalkSpeedSquared = sqr(hateTargetCreatureObject->getWalkSpeed()); @@ -605,7 +605,7 @@ float AICreatureController::realAlter(float time) { Object * const combatStartLocationCell = NetworkIdManager::getObjectById(m_combatStartLocation.get().getCell()); Vector const & combatStartPosition_c = m_combatStartLocation.get().getCoordinates(); - Vector const & combatStartPosition_w = (combatStartLocationCell != NULL) ? combatStartLocationCell->rotateTranslate_o2w(combatStartPosition_c) : combatStartPosition_c; + Vector const & combatStartPosition_w = (combatStartLocationCell != nullptr) ? combatStartLocationCell->rotateTranslate_o2w(combatStartPosition_c) : combatStartPosition_c; float const distanceToCombatStartLocationSquared = creatureOwner->getPosition_w().magnitudeBetweenSquared(combatStartPosition_w); float const aggroRadius = getAggroRadius(); @@ -621,7 +621,7 @@ float AICreatureController::realAlter(float time) hateTargetCreatureObject->resetHateTimer(); } } - else if (hateTarget.getObject() != NULL) + else if (hateTarget.getObject() != nullptr) { // AI don't need to lose interest in stationary AI @@ -662,7 +662,7 @@ float AICreatureController::realAlter(float time) } #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { m_movement->addDebug(*aiDebugString); } @@ -697,7 +697,7 @@ float AICreatureController::realAlter(float time) updateMovementType(); #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { sendDebugAiToClients(*aiDebugString); delete aiDebugString; @@ -711,7 +711,7 @@ float AICreatureController::realAlter(float time) //---------------------------------------------------------------------- void AICreatureController::changeMovement(AiMovementBasePtr newMovement) { - LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::changeMovement() movement(%s)", (newMovement != AiMovementBaseNullPtr) ? AiMovementBase::getMovementString(newMovement->getType()) : "NULL")); + LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::changeMovement() movement(%s)", (newMovement != AiMovementBaseNullPtr) ? AiMovementBase::getMovementString(newMovement->getType()) : "nullptr")); if (getOwner()->isAuthoritative()) { @@ -876,11 +876,11 @@ void AICreatureController::loiter(CellProperty const * homeCell, Vector const & { if (isRetreating()) { - WARNING(true, ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), ((homeCell != NULL) ? homeCell->getCellName() : "NULL"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay)); + WARNING(true, ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), ((homeCell != nullptr) ? homeCell->getCellName() : "nullptr"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay)); return; } - LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f]", getDebugInformation().c_str(), ((homeCell != NULL) ? homeCell->getCellName() : "NULL"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay)); + LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f]", getDebugInformation().c_str(), ((homeCell != nullptr) ? homeCell->getCellName() : "nullptr"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay)); AiMovementBasePtr movement(new AiMovementLoiter(this, homeCell, home_p, minDistance, maxDistance, minDelay, maxDelay)); @@ -910,7 +910,7 @@ void AICreatureController::moveTo(CellProperty const * cell, Vector const & targ { if (isRetreating()) { - WARNING(true, ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), ((cell != NULL) ? cell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z, radius)); + WARNING(true, ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), ((cell != nullptr) ? cell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z, radius)); return; } @@ -918,9 +918,9 @@ void AICreatureController::moveTo(CellProperty const * cell, Vector const & targ if (getMovementType() == AMT_move) { - AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : NULL; + AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : nullptr; - if (aiMovementMove != NULL) + if (aiMovementMove != nullptr) { AiLocation const & target = aiMovementMove->getTarget(); @@ -935,7 +935,7 @@ void AICreatureController::moveTo(CellProperty const * cell, Vector const & targ if (!duplicateMovement) { - LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f)", getDebugInformation().c_str(), ((cell != NULL) ? cell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z, radius)); + LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f)", getDebugInformation().c_str(), ((cell != nullptr) ? cell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z, radius)); AiMovementBasePtr movement(new AiMovementMove(this, cell, target_p, radius)); @@ -957,9 +957,9 @@ void AICreatureController::moveTo(Unicode::String const & targetName) if (getMovementType() == AMT_move) { - AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : NULL; + AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : nullptr; - if (aiMovementMove != NULL) + if (aiMovementMove != nullptr) { if (aiMovementMove->getTargetName() == targetName) { @@ -992,8 +992,8 @@ void AICreatureController::patrol( std::vector const & locations, bool if (getMovementType() == AMT_patrol) { - AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : NULL; - if (aiMovementPatrol != NULL) + AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : nullptr; + if (aiMovementPatrol != nullptr) { // if () // { @@ -1026,8 +1026,8 @@ void AICreatureController::patrol( std::vector const & location if (getMovementType() == AMT_patrol) { - AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : NULL; - if (aiMovementPatrol != NULL) + AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : nullptr; + if (aiMovementPatrol != nullptr) { // if () // { @@ -1071,7 +1071,7 @@ bool AICreatureController::faceTo(CellProperty const * targetCell, Vector const { if (isRetreating()) { - WARNING(true, ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) Trying to faceTo while retreating, failing faceTo request.", getDebugInformation().c_str(), ((targetCell != NULL) ? targetCell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z)); + WARNING(true, ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) Trying to faceTo while retreating, failing faceTo request.", getDebugInformation().c_str(), ((targetCell != nullptr) ? targetCell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z)); return false; } @@ -1079,9 +1079,9 @@ bool AICreatureController::faceTo(CellProperty const * targetCell, Vector const if (getMovementType() == AMT_face) { - AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : NULL; + AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : nullptr; - if (aiMovementFace != NULL) + if (aiMovementFace != nullptr) { AiLocation const & target = aiMovementFace->getTarget(); @@ -1095,7 +1095,7 @@ bool AICreatureController::faceTo(CellProperty const * targetCell, Vector const if (!duplicateMovement) { - LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f)", getDebugInformation().c_str(), ((targetCell != NULL) ? targetCell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z)); + LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f)", getDebugInformation().c_str(), ((targetCell != nullptr) ? targetCell->getCellName() : "nullptr"), target_p.x, target_p.y, target_p.z)); AiMovementBasePtr behavior(new AiMovementFace(this, targetCell, target_p)); @@ -1126,9 +1126,9 @@ bool AICreatureController::faceTo( NetworkId const & targetId ) if (getMovementType() == AMT_face) { - AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : NULL; + AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : nullptr; - if (aiMovementFace != NULL) + if (aiMovementFace != nullptr) { AiLocation const & target = aiMovementFace->getTarget(); @@ -1171,9 +1171,9 @@ bool AICreatureController::follow( NetworkId const & targetId, float minDistance if (getMovementType() == AMT_follow) { - AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : NULL; + AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : nullptr; - if (aiMovementFollow != NULL) + if (aiMovementFollow != nullptr) { AiLocation const & target = aiMovementFollow->getTarget(); @@ -1219,9 +1219,9 @@ bool AICreatureController::follow( NetworkId const & targetId, Vector const & of if (getMovementType() == AMT_follow) { - AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : NULL; + AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : nullptr; - if (aiMovementFollow != NULL) + if (aiMovementFollow != nullptr) { AiLocation const & offsetTarget = aiMovementFollow->getOffsetTarget(); @@ -1403,9 +1403,9 @@ void AICreatureController::moveCreature( CellProperty const * newCell, Vector co CellProperty * currentCell = getOwner()->getParentCell(); - CellObject * newCellObject = NULL; + CellObject * newCellObject = nullptr; - if( (newCell != NULL) && (newCell != CellProperty::getWorldCellProperty()) ) + if( (newCell != nullptr) && (newCell != CellProperty::getWorldCellProperty()) ) { newCellObject = const_cast(safe_cast(&newCell->getOwner())); } @@ -1422,12 +1422,12 @@ void AICreatureController::moveCreature( CellProperty const * newCell, Vector co CellProperty const * destCell = getCreatureCell()->getDestinationCell(oldPosition+offset,newPosition+offset,dummy); - if((destCell != NULL) && (destCell != newCell)) + if((destCell != nullptr) && (destCell != newCell)) { newPosition = CollisionUtils::transformToCell(newCell,newPosition,destCell); newCell = destCell; - newCellObject = NULL; + newCellObject = nullptr; if(newCell != CellProperty::getWorldCellProperty()) { @@ -1820,15 +1820,15 @@ AICreatureController * AICreatureController::getAiCreatureController(NetworkId c { Object * const object = NetworkIdManager::getObjectById(networkId); - return (object != NULL) ? AICreatureController::asAiCreatureController(object->getController()) : NULL; + return (object != nullptr) ? AICreatureController::asAiCreatureController(object->getController()) : nullptr; } // ---------------------------------------------------------------------- AICreatureController * AICreatureController::asAiCreatureController(Controller * controller) { - CreatureController * const creatureController = (controller != NULL) ? controller->asCreatureController() : NULL; - AICreatureController * const aiCreatureController = (creatureController != NULL) ? creatureController->asAiCreatureController() : NULL; + CreatureController * const creatureController = (controller != nullptr) ? controller->asCreatureController() : nullptr; + AICreatureController * const aiCreatureController = (creatureController != nullptr) ? creatureController->asAiCreatureController() : nullptr; return aiCreatureController; } @@ -1837,8 +1837,8 @@ AICreatureController * AICreatureController::asAiCreatureController(Controller * AICreatureController const * AICreatureController::asAiCreatureController(Controller const * controller) { - CreatureController const * const creatureController = (controller != NULL) ? controller->asCreatureController() : NULL; - AICreatureController const * const aiCreatureController = (creatureController != NULL) ? creatureController->asAiCreatureController() : NULL; + CreatureController const * const creatureController = (controller != nullptr) ? controller->asCreatureController() : nullptr; + AICreatureController const * const aiCreatureController = (creatureController != nullptr) ? creatureController->asAiCreatureController() : nullptr; return aiCreatureController; } @@ -1880,7 +1880,7 @@ float AICreatureController::getRespectRadius(NetworkId const & target) const CreatureObject const * respectCreatureObject = CreatureObject::getCreatureObject(target); - if (respectCreatureObject != NULL) + if (respectCreatureObject != nullptr) { // If the target has a master, then use the master's level for the respect calculation @@ -1893,7 +1893,7 @@ float AICreatureController::getRespectRadius(NetworkId const & target) const // Respect is only towards players - if ( (respectCreatureObject != NULL) + if ( (respectCreatureObject != nullptr) && respectCreatureObject->isPlayerControlled()) { CreatureObject const * const creatureOwner = getCreature(); @@ -1906,7 +1906,7 @@ float AICreatureController::getRespectRadius(NetworkId const & target) const } else { - WARNING(true, ("AICreatureController::getRespectRadius() owner(%s) master(%s) The owner has a master who is not a player. Why does this happen?", getDebugInformation().c_str(), (respectCreatureObject != NULL) ? respectCreatureObject->getDebugInformation().c_str() : masterId.getValueString().c_str())); + WARNING(true, ("AICreatureController::getRespectRadius() owner(%s) master(%s) The owner has a master who is not a player. Why does this happen?", getDebugInformation().c_str(), (respectCreatureObject != nullptr) ? respectCreatureObject->getDebugInformation().c_str() : masterId.getValueString().c_str())); } } @@ -1942,7 +1942,7 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) // Display the name and level { - aiDebugString.addText(fs.sprintf("%d %s\n", creatureOwner->getLevel(), (getCreatureName().isEmpty() ? "NULL" : getCreatureName().getString())), PackedRgb::solidWhite); + aiDebugString.addText(fs.sprintf("%d %s\n", creatureOwner->getLevel(), (getCreatureName().isEmpty() ? "nullptr" : getCreatureName().getString())), PackedRgb::solidWhite); } // Display the look at target @@ -1990,7 +1990,7 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) { Floor const * const floor = CollisionWorld::getFloorStandingOn(*creatureOwner); - aiDebugString.addText(fs.sprintf("floor (%s)\n", (floor == NULL) ? "none" : floor->getId().getValueString().c_str()), PackedRgb::solidWhite); + aiDebugString.addText(fs.sprintf("floor (%s)\n", (floor == nullptr) ? "none" : floor->getId().getValueString().c_str()), PackedRgb::solidWhite); } // Display the AI movement speed @@ -2008,15 +2008,15 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) // Primary Weapon { ServerObject const * const primaryServerObject = ServerObject::getServerObject(getPrimaryWeapon()); - WeaponObject const * const primaryWeaponObject = (primaryServerObject != NULL) ? primaryServerObject->asWeaponObject() : NULL; + WeaponObject const * const primaryWeaponObject = (primaryServerObject != nullptr) ? primaryServerObject->asWeaponObject() : nullptr; - if (primaryWeaponObject != NULL) + if (primaryWeaponObject != nullptr) { aiDebugString.addText(fs.sprintf("%s pri(%s) [%.0f...%.0f] sp(%s)\n", (usingPrimaryWeapon() ? "->" : ""), FileNameUtils::get(primaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), primaryWeaponObject->getMinRange(), primaryWeaponObject->getMaxRange(), m_aiCreatureData->m_primarySpecials.isEmpty() ? "none" : m_aiCreatureData->m_primarySpecials.getString()), PackedRgb::solidWhite); } else { - aiDebugString.addText(fs.sprintf("pri(NULL:ERROR)\n"), PackedRgb::solidWhite); + aiDebugString.addText(fs.sprintf("pri(nullptr:ERROR)\n"), PackedRgb::solidWhite); } //if (usingPrimaryWeapon()) @@ -2040,9 +2040,9 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) // Secondary Weapon { ServerObject const * const secondaryServerObject = ServerObject::getServerObject(getSecondaryWeapon()); - WeaponObject const * const secondaryWeaponObject = (secondaryServerObject != NULL) ? secondaryServerObject->asWeaponObject() : NULL; + WeaponObject const * const secondaryWeaponObject = (secondaryServerObject != nullptr) ? secondaryServerObject->asWeaponObject() : nullptr; - if (secondaryWeaponObject != NULL) + if (secondaryWeaponObject != nullptr) { aiDebugString.addText(fs.sprintf("%s sec (%s) [%.0f...%.0f] sp(%s)\n", (usingSecondaryWeapon() ? "->" : ""), FileNameUtils::get(secondaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), secondaryWeaponObject->getMinRange(), secondaryWeaponObject->getMaxRange(), m_aiCreatureData->m_secondarySpecials.isEmpty() ? "none" : m_aiCreatureData->m_secondarySpecials.getString()), PackedRgb::solidWhite); } @@ -2113,13 +2113,13 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject()); float const hate = iterHateList->second; std::string hateTargetName; - if (hateTargetTangibleObject != NULL) + if (hateTargetTangibleObject != nullptr) { hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str(); } else { - hateTargetName = "NULL"; + hateTargetName = "nullptr"; } aiDebugString.addText(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate), (iterHateList == hateList.begin()) ? PackedRgb::solidGreen : PackedRgb::solidRed); @@ -2174,7 +2174,7 @@ void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString) // Only send to the client if the objvar is set int temp = 0; - if ( (characterObject != NULL) + if ( (characterObject != nullptr) && characterObject->getObjVars().getItem("ai_debug_string", temp)) { if (temp > 0) @@ -2196,7 +2196,7 @@ void AICreatureController::setHomeLocation(Location const & location) { if (getOwner()->isAuthoritative()) { - LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setHomeLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), location.getSceneIdCrc(), (location.getSceneId() != NULL) ? location.getSceneId() : "NULL", location.getCell().getValueString().c_str(), location.getCoordinates().x, location.getCoordinates().y, location.getCoordinates().z)); + LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setHomeLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), location.getSceneIdCrc(), (location.getSceneId() != nullptr) ? location.getSceneId() : "nullptr", location.getCell().getValueString().c_str(), location.getCoordinates().x, location.getCoordinates().y, location.getCoordinates().z)); m_homeLocation = location; } @@ -2221,7 +2221,7 @@ void AICreatureController::markCombatStartLocation() { m_combatStartLocation = getLocation(*creatureOwner); - LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AICreatureController::markCombatStartLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), m_combatStartLocation.get().getSceneIdCrc(), (m_combatStartLocation.get().getSceneId() != NULL) ? m_combatStartLocation.get().getSceneId() : "NULL", m_combatStartLocation.get().getCell().getValueString().c_str(), m_combatStartLocation.get().getCoordinates().x, m_combatStartLocation.get().getCoordinates().y, m_combatStartLocation.get().getCoordinates().z)); + LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AICreatureController::markCombatStartLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), m_combatStartLocation.get().getSceneIdCrc(), (m_combatStartLocation.get().getSceneId() != nullptr) ? m_combatStartLocation.get().getSceneId() : "nullptr", m_combatStartLocation.get().getCell().getValueString().c_str(), m_combatStartLocation.get().getCoordinates().x, m_combatStartLocation.get().getCoordinates().y, m_combatStartLocation.get().getCoordinates().z)); m_primaryWeaponActions.reset(); m_secondaryWeaponActions.reset(); @@ -2279,14 +2279,14 @@ void AICreatureController::onCreatureNameChanged(std::string const & creatureNam AiCreatureCombatProfile const * const primaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials); - if (primaryWeaponCombatProfile != NULL) + if (primaryWeaponCombatProfile != nullptr) { m_primaryWeaponActions.setCombatProfile(*creatureOwner, *primaryWeaponCombatProfile); } AiCreatureCombatProfile const * const secondaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_secondarySpecials); - if (secondaryWeaponCombatProfile != NULL) + if (secondaryWeaponCombatProfile != nullptr) { m_secondaryWeaponActions.setCombatProfile(*creatureOwner, *secondaryWeaponCombatProfile); } @@ -2326,7 +2326,7 @@ void AICreatureController::destroyPrimaryWeapon() { WeaponObject * const primaryWeapon = WeaponObject::getWeaponObject(getPrimaryWeapon()); - if (primaryWeapon != NULL) + if (primaryWeapon != nullptr) { unEquipWeapons(); primaryWeapon->permanentlyDestroy(DeleteReasons::God); @@ -2361,7 +2361,7 @@ void AICreatureController::destroySecondaryWeapon() { WeaponObject * const secondaryWeapon = WeaponObject::getWeaponObject(getSecondaryWeapon()); - if (secondaryWeapon != NULL) + if (secondaryWeapon != nullptr) { unEquipWeapons(); secondaryWeapon->permanentlyDestroy(DeleteReasons::God); @@ -2372,7 +2372,7 @@ void AICreatureController::destroySecondaryWeapon() PersistentCrcString const & AICreatureController::getCreatureName() const { - if (m_aiCreatureData->m_name == NULL) + if (m_aiCreatureData->m_name == nullptr) { return *s_defaultCreatureName; } @@ -2401,7 +2401,7 @@ NetworkId AICreatureController::createWeapon(char const * const functionName, Cr CreatureObject * const creatureOwner = getCreature(); ServerObject * const inventory = creatureOwner->getInventory(); - if (inventory == NULL) + if (inventory == nullptr) { WARNING(true, ("AICreatureController::%s() Unable to find inventory for (%s) to place a weapon(%s)", functionName, getDebugInformation().c_str(), weaponName.getString())); } @@ -2440,7 +2440,7 @@ NetworkId AICreatureController::createWeapon(char const * const functionName, Cr bool const persisted = false; ServerObject * const newObject = ServerWorld::createNewObject(weaponCrcName.getCrc(), *inventory, persisted); - if (newObject != NULL) + if (newObject != nullptr) { result = newObject->getNetworkId(); } @@ -2464,7 +2464,7 @@ NetworkId AICreatureController::getUnarmedWeapon() CreatureObject * const creatureOwner = getCreature(); WeaponObject * const defaultWeapon = creatureOwner->getDefaultWeapon(); - if (defaultWeapon != NULL) + if (defaultWeapon != nullptr) { result = defaultWeapon->getNetworkId(); } @@ -2492,9 +2492,9 @@ void AICreatureController::equipPrimaryWeapon() if (!usingPrimaryWeapon()) { ServerObject * const primaryWeaponServerObject = ServerObject::getServerObject(getPrimaryWeapon()); - WeaponObject * const primaryWeaponObject = (primaryWeaponServerObject != NULL) ? primaryWeaponServerObject->asWeaponObject() : NULL; + WeaponObject * const primaryWeaponObject = (primaryWeaponServerObject != nullptr) ? primaryWeaponServerObject->asWeaponObject() : nullptr; - if (primaryWeaponObject != NULL) + if (primaryWeaponObject != nullptr) { unEquipWeapons(); @@ -2508,7 +2508,7 @@ void AICreatureController::equipPrimaryWeapon() { Container::ContainerErrorCode errorCode; - if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *primaryWeaponServerObject, NULL, errorCode)) + if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *primaryWeaponServerObject, nullptr, errorCode)) { LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::equipPrimaryWeapon() owner(%s) primaryWeapon(%s)\n", getDebugInformation().c_str(), primaryWeaponServerObject->getDebugInformation().c_str())); @@ -2516,7 +2516,7 @@ void AICreatureController::equipPrimaryWeapon() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(creatureOwner); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(primaryWeaponObject->getNetworkId()); @@ -2557,9 +2557,9 @@ void AICreatureController::equipSecondaryWeapon() if (!usingSecondaryWeapon()) { ServerObject * const secondaryWeaponServerObject = ServerObject::getServerObject(getSecondaryWeapon()); - WeaponObject * const secondaryWeaponObject = (secondaryWeaponServerObject != NULL) ? secondaryWeaponServerObject->asWeaponObject() : NULL; + WeaponObject * const secondaryWeaponObject = (secondaryWeaponServerObject != nullptr) ? secondaryWeaponServerObject->asWeaponObject() : nullptr; - if (secondaryWeaponObject != NULL) + if (secondaryWeaponObject != nullptr) { unEquipWeapons(); @@ -2573,7 +2573,7 @@ void AICreatureController::equipSecondaryWeapon() { Container::ContainerErrorCode errorCode; - if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *secondaryWeaponServerObject, NULL, errorCode)) + if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *secondaryWeaponServerObject, nullptr, errorCode)) { LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::equipSecondaryWeapon() owner(%s) secondaryWeapon(%s) errorCode(%d)\n", getDebugInformation().c_str(), secondaryWeaponServerObject->getDebugInformation().c_str())); @@ -2581,7 +2581,7 @@ void AICreatureController::equipSecondaryWeapon() GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(creatureOwner); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(secondaryWeaponObject->getNetworkId()); @@ -2631,7 +2631,7 @@ void AICreatureController::unEquipWeapons() { ServerObject * const inventory = creatureOwner->getInventory(); - if (inventory != NULL) + if (inventory != nullptr) { Container::ContainerErrorCode error; @@ -2648,13 +2648,13 @@ void AICreatureController::unEquipWeapons() // Equip the default weapon { - if (defaultWeapon != NULL) + if (defaultWeapon != nullptr) { creatureOwner->setCurrentWeapon(*defaultWeapon); } else { - WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) NULL default weapon", getDebugInformation().c_str())); + WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) nullptr default weapon", getDebugInformation().c_str())); } } } @@ -2690,7 +2690,7 @@ bool AICreatureController::usingPrimaryWeapon() { WeaponObject const * const currentWeaponObject = getCreature()->getCurrentWeapon(); - if (currentWeaponObject != NULL) + if (currentWeaponObject != nullptr) { result = (getPrimaryWeapon() == currentWeaponObject->getNetworkId()); } @@ -2708,7 +2708,7 @@ bool AICreatureController::usingSecondaryWeapon() { WeaponObject const * const currentWeaponObject = getCreature()->getCurrentWeapon(); - if (currentWeaponObject != NULL) + if (currentWeaponObject != nullptr) { result = (getSecondaryWeapon() == currentWeaponObject->getNetworkId()); } @@ -2815,7 +2815,7 @@ void AICreatureController::setRetreating(bool const retreating) { CellObject const * const cellObject = CellObject::getCellObject(cellId); - if (cellObject != NULL) + if (cellObject != nullptr) { CellProperty const * const cellProperty = cellObject->getCellProperty(); @@ -2965,7 +2965,7 @@ time_t AICreatureController::getKnockDownRecoveryTime() const { AiCreatureCombatProfile const * const combatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials); - return (combatProfile != NULL) ? combatProfile->m_knockDownRecoveryTime : 0; + return (combatProfile != nullptr) ? combatProfile->m_knockDownRecoveryTime : 0; } //----------------------------------------------------------------------- std::string const AICreatureController::getCombatActionsString() @@ -2979,7 +2979,7 @@ std::string const AICreatureController::getCombatActionsString() { WeaponObject const * const primaryWeaponObject = WeaponObject::getWeaponObject(getPrimaryWeapon()); - if (primaryWeaponObject != NULL) + if (primaryWeaponObject != nullptr) { result += fs.sprintf("PRIMARY WEAPON >>> %s range[%.0f...%.0f] %s\n", FileNameUtils::get(primaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), primaryWeaponObject->getMinRange(), primaryWeaponObject->getMaxRange(), usingPrimaryWeapon() ? "(active)" : ""); } @@ -2989,7 +2989,7 @@ std::string const AICreatureController::getCombatActionsString() } AiCreatureCombatProfile const * const primaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials); - if (primaryWeaponCombatProfile != NULL) + if (primaryWeaponCombatProfile != nullptr) { result += primaryWeaponCombatProfile->toString(); } @@ -3003,7 +3003,7 @@ std::string const AICreatureController::getCombatActionsString() { WeaponObject const * const secondaryWeaponObject = WeaponObject::getWeaponObject(getSecondaryWeapon()); - if (secondaryWeaponObject != NULL) + if (secondaryWeaponObject != nullptr) { result += fs.sprintf("SECONDARY WEAPON >>> %s range[%.0f...%.0f] %s\n", FileNameUtils::get(secondaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), secondaryWeaponObject->getMinRange(), secondaryWeaponObject->getMaxRange(), usingSecondaryWeapon() ? "(active)" : ""); } @@ -3014,7 +3014,7 @@ std::string const AICreatureController::getCombatActionsString() AiCreatureCombatProfile const * const secondaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_secondarySpecials); - if (secondaryWeaponCombatProfile != NULL) + if (secondaryWeaponCombatProfile != nullptr) { result += secondaryWeaponCombatProfile->toString(); } diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp index d2bf69f7..3fe9a88f 100755 --- a/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp @@ -127,15 +127,15 @@ AiShipController * AiShipController::getAiShipController(NetworkId const & unit) { Object * const object = NetworkIdManager::getObjectById(unit); - return (object != NULL) ? AiShipController::asAiShipController(object->getController()) : NULL; + return (object != nullptr) ? AiShipController::asAiShipController(object->getController()) : nullptr; } // ---------------------------------------------------------------------- AiShipController * AiShipController::asAiShipController(Controller * const controller) { - ShipController * const shipController = (controller != NULL) ? controller->asShipController() : NULL; - AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; + ShipController * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; + AiShipController * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; return aiShipController; } @@ -144,8 +144,8 @@ AiShipController * AiShipController::asAiShipController(Controller * const contr AiShipController const * AiShipController::asAiShipController(Controller const * const controller) { - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; - AiShipController const * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; + AiShipController const * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; return aiShipController; } @@ -155,18 +155,18 @@ AiShipController const * AiShipController::asAiShipController(Controller const * AiShipController::AiShipController(ShipObject * const owner) : ShipController(owner), m_pilotData(&AiShipPilotData::getDefaultPilotData()), - m_pendingNonAttackBehavior(NULL), - m_nonAttackBehavior(NULL), - m_pendingAttackBehavior(NULL), - m_attackBehavior(NULL), + m_pendingNonAttackBehavior(nullptr), + m_nonAttackBehavior(nullptr), + m_pendingAttackBehavior(nullptr), + m_attackBehavior(nullptr), m_shipName(), m_shipClass(ShipAiReactionManager::SC_invalid), m_requestedSlowDown(false), - m_squad(NULL), - m_attackSquad(NULL), + m_squad(nullptr), + m_attackSquad(nullptr), m_formationPosition_l(), m_attackFormationPosition_l(), - m_path(NULL), + m_path(nullptr), m_currentPathIndex(0), m_aggroRadius(200.0f), m_countermeasureState(CS_none), @@ -190,22 +190,22 @@ AiShipController::~AiShipController() // Remove this unit from its squad - if (m_squad != NULL) + if (m_squad != nullptr) { // The owner of the squad is SpaceSquadManager getSquad().removeUnit(getOwner()->getNetworkId()); - m_squad = NULL; + m_squad = nullptr; } // Remove this unit from its attack squad - if (m_attackSquad != NULL) + if (m_attackSquad != nullptr) { // The owner of the attack squad is SpaceSquad m_attackSquad->removeUnit(getOwner()->getNetworkId()); - m_attackSquad = NULL; + m_attackSquad = nullptr; } else { @@ -215,17 +215,17 @@ AiShipController::~AiShipController() // Remove path here. SpacePathManager::release(m_path, getOwner()); - m_path = NULL; - m_pilotData = NULL; + m_path = nullptr; + m_pilotData = nullptr; delete m_nonAttackBehavior; - m_nonAttackBehavior = NULL; + m_nonAttackBehavior = nullptr; delete m_pendingNonAttackBehavior; - m_pendingNonAttackBehavior = NULL; + m_pendingNonAttackBehavior = nullptr; delete m_pendingAttackBehavior; - m_pendingAttackBehavior = NULL; + m_pendingAttackBehavior = nullptr; delete m_attackBehavior; - m_attackBehavior = NULL; + m_attackBehavior = nullptr; delete m_reactToMissileTimer; delete m_pilotManagerInfo; delete m_exclusiveAggroSet; @@ -234,7 +234,7 @@ AiShipController::~AiShipController() // ---------------------------------------------------------------------- void AiShipController::endBaselines() { - DEBUG_FATAL((m_squad != NULL), ("m_squad should be NULL")); + DEBUG_FATAL((m_squad != nullptr), ("m_squad should be nullptr")); m_squad = SpaceSquadManager::createSquad(); getSquad().addUnit(getOwner()->getNetworkId()); @@ -252,7 +252,7 @@ float AiShipController::realAlter(float const elapsedTime) #ifdef _DEBUG - AiDebugString * aiDebugString = NULL; + AiDebugString * aiDebugString = nullptr; if ( s_spaceAiClientDebugEnabled && !getShipOwner()->getObservers().empty()) { @@ -263,25 +263,25 @@ float AiShipController::realAlter(float const elapsedTime) // We have to have a pending behavior because while in a behavior a trigger can get called which can then kill that behavior, so we have to wait until the next frame to switch behaviors so they don't stomp each other from triggers. - if (m_pendingNonAttackBehavior != NULL) + if (m_pendingNonAttackBehavior != nullptr) { delete m_nonAttackBehavior; m_nonAttackBehavior = m_pendingNonAttackBehavior; - m_pendingNonAttackBehavior = NULL; + m_pendingNonAttackBehavior = nullptr; } - if (m_pendingDockingBehavior != NULL) + if (m_pendingDockingBehavior != nullptr) { delete m_dockingBehavior; m_dockingBehavior = m_pendingDockingBehavior; - m_pendingDockingBehavior = NULL; + m_pendingDockingBehavior = nullptr; } - if ( (m_dockingBehavior != NULL) + if ( (m_dockingBehavior != nullptr) && (m_dockingBehavior->isDockFinished())) { delete m_dockingBehavior; - m_dockingBehavior = NULL; + m_dockingBehavior = nullptr; } m_yawPosition = 0.f; @@ -292,7 +292,7 @@ float AiShipController::realAlter(float const elapsedTime) ShipObject * const shipOwner = NON_NULL(getShipOwner()); PROFILER_AUTO_BLOCK_DEFINE("behaviors"); - if (m_attackBehavior != NULL) // This was added for ships that are contructed for AI but not fully contructed proper using the space_mobile.tab + if (m_attackBehavior != nullptr) // This was added for ships that are contructed for AI but not fully contructed proper using the space_mobile.tab { if (isAttacking()) // Capital ships never go into attack mode as such, always follow their non-attacking behavior (although they may fire turrets as they go) { @@ -314,7 +314,7 @@ float AiShipController::realAlter(float const elapsedTime) shipOwner->openWings(); } - if (m_dockingBehavior != NULL) + if (m_dockingBehavior != nullptr) { m_dockingBehavior->unDock(); } @@ -325,7 +325,7 @@ float AiShipController::realAlter(float const elapsedTime) m_attackBehavior->alter(elapsedTime); #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { m_attackBehavior->addDebug(*aiDebugString); } @@ -337,9 +337,9 @@ float AiShipController::realAlter(float const elapsedTime) Object * const leaderObject = getAttackSquad().getLeader().getObject(); ShipController * const leaderShipController = leaderObject->getController()->asShipController(); - AiShipController * const leaderAiShipController = (leaderShipController != NULL) ? leaderShipController->asAiShipController() : NULL; + AiShipController * const leaderAiShipController = (leaderShipController != nullptr) ? leaderShipController->asAiShipController() : nullptr; - if (leaderAiShipController != NULL) + if (leaderAiShipController != nullptr) { Transform transform(leaderObject->getTransform_o2w()); transform.setPosition_p(leaderAiShipController->getMoveToGoalPosition_w()); @@ -361,7 +361,7 @@ float AiShipController::realAlter(float const elapsedTime) { delete m_attackBehavior; m_attackBehavior = m_pendingAttackBehavior; - m_pendingAttackBehavior = NULL; + m_pendingAttackBehavior = nullptr; } } else if (isBeingDocked()) @@ -370,18 +370,18 @@ float AiShipController::realAlter(float const elapsedTime) setThrottle(0.0f); } - else if (m_dockingBehavior != NULL) + else if (m_dockingBehavior != nullptr) { m_dockingBehavior->alter(elapsedTime); #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { m_dockingBehavior->addDebug(*aiDebugString); } #endif // _DEBUG } - else if (m_nonAttackBehavior != NULL) + else if (m_nonAttackBehavior != nullptr) { PROFILER_AUTO_BLOCK_DEFINE("non-attack behaviors"); @@ -413,7 +413,7 @@ float AiShipController::realAlter(float const elapsedTime) m_nonAttackBehavior->alter(elapsedTime); #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { m_nonAttackBehavior->addDebug(*aiDebugString); } @@ -425,7 +425,7 @@ float AiShipController::realAlter(float const elapsedTime) Object * const squadLeader = getSquad().getLeader().getObject(); - if (squadLeader != NULL) + if (squadLeader != nullptr) { Vector goalPosition_w(Formation::getPosition_w(squadLeader->getTransform_o2w(), getFormationPosition_l())); @@ -434,9 +434,9 @@ float AiShipController::realAlter(float const elapsedTime) if (getOwner()->getPosition_w().magnitudeBetweenSquared(goalPosition_w) > sqr(getLargestTurnRadius() * s_slowDownTurnRadiusGain)) { ShipController * const followedUnitShipController = squadLeader->getController()->asShipController(); - AiShipController * const followedUnitAiShipController = (followedUnitShipController != NULL) ? followedUnitShipController->asAiShipController() : NULL; + AiShipController * const followedUnitAiShipController = (followedUnitShipController != nullptr) ? followedUnitShipController->asAiShipController() : nullptr; - if (followedUnitAiShipController != NULL) + if (followedUnitAiShipController != nullptr) { followedUnitAiShipController->requestSlowDown(); } @@ -462,7 +462,7 @@ float AiShipController::realAlter(float const elapsedTime) } #ifdef _DEBUG - if (aiDebugString != NULL) + if (aiDebugString != nullptr) { m_nonAttackBehavior->addDebug(*aiDebugString); } @@ -476,7 +476,7 @@ float AiShipController::realAlter(float const elapsedTime) } else { - DEBUG_WARNING(true, ("debug_ai: There should never be a NULL non-attacking behavior %s", getOwner()->getDebugInformation().c_str())); + DEBUG_WARNING(true, ("debug_ai: There should never be a nullptr non-attacking behavior %s", getOwner()->getDebugInformation().c_str())); } } @@ -551,8 +551,8 @@ float AiShipController::realAlter(float const elapsedTime) } #ifdef _DEBUG - if ( (m_attackBehavior != NULL) - && (aiDebugString != NULL)) + if ( (m_attackBehavior != nullptr) + && (aiDebugString != nullptr)) { PROFILER_AUTO_BLOCK_DEFINE("sendDebugAiToClients"); sendDebugAiToClients(*aiDebugString); @@ -574,7 +574,7 @@ void AiShipController::moveTo(Vector const & position_w, float const throttle, f // If we are not following a unit, see if we need to slow down for someone - if ( (m_nonAttackBehavior != NULL) + if ( (m_nonAttackBehavior != nullptr) && (m_nonAttackBehavior->getBehaviorType() != ASBT_follow) && m_requestedSlowDown && !isAttacking()) @@ -645,16 +645,16 @@ bool AiShipController::addDamageTaken(NetworkId const & attackingUnit, float con { ShipObject const * const attackingShipObject = ShipObject::asShipObject(NetworkIdManager::getObjectById(attackingUnit)); - if (attackingShipObject != NULL) + if (attackingShipObject != nullptr) { CreatureObject const * const attackingPilotCreatureObject = attackingShipObject->getPilot(); - if ( (attackingPilotCreatureObject != NULL) + if ( (attackingPilotCreatureObject != nullptr) && attackingPilotCreatureObject->isPlayerControlled()) { GroupObject * const groupObject = attackingPilotCreatureObject->getGroup(); - if (groupObject != NULL) + if (groupObject != nullptr) { GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers(); GroupObject::GroupMemberVector::const_iterator iterGroupMembers = groupMembers.begin(); @@ -665,11 +665,11 @@ bool AiShipController::addDamageTaken(NetworkId const & attackingUnit, float con NetworkId const & groupMemberPilotNetworkId = groupMember.first; CreatureObject const * const groupMemberPilotCreatureObject = CreatureObject::asCreatureObject(NetworkIdManager::getObjectById(groupMemberPilotNetworkId)); - if (groupMemberPilotCreatureObject != NULL) + if (groupMemberPilotCreatureObject != nullptr) { ShipObject const * const groupMemberShipObject = groupMemberPilotCreatureObject->getPilotedShip(); - if (groupMemberShipObject != NULL) + if (groupMemberShipObject != nullptr) { if (groupMemberShipObject != attackingShipObject) { @@ -749,24 +749,24 @@ void AiShipController::follow(NetworkId const & followedUnit, Vector const & dir LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::follow() owner(%s) followedUnit(%s) direction_o(%.1f, %.1f, %.1f) offset(%.1f)", getOwner()->getNetworkId().getValueString().c_str(), followedUnit.getValueString().c_str(), direction_l.x, direction_l.y, direction_l.z, distance)); SpacePathManager::release(m_path, getOwner()); - m_path = NULL; + m_path = nullptr; float appearanceRadius = 0.0f; Object const * const followedObject = NetworkIdManager::getObjectById(followedUnit); - if (followedObject != NULL) + if (followedObject != nullptr) { //-- This needs to be improved to cast a ray from this position back towards the ship and get the actual collision position CollisionProperty const * const ownerCollisionProperty = getOwner()->getCollisionProperty(); CollisionProperty const * const followedObjectCollisionProperty = followedObject->getCollisionProperty(); - if (ownerCollisionProperty != NULL) + if (ownerCollisionProperty != nullptr) { appearanceRadius += ownerCollisionProperty->getBoundingSphere_l().getRadius(); } - if (followedObjectCollisionProperty != NULL) + if (followedObjectCollisionProperty != nullptr) { appearanceRadius += followedObjectCollisionProperty ->getBoundingSphere_l().getRadius(); } @@ -786,7 +786,7 @@ int AiShipController::getBehaviorType() const { AiShipBehaviorType result = ASBT_idle; - if (m_nonAttackBehavior != NULL) + if (m_nonAttackBehavior != nullptr) { result = m_nonAttackBehavior->getBehaviorType(); } @@ -803,7 +803,7 @@ void AiShipController::idle() LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::idle() owner(%s)", getOwner()->getNetworkId().getValueString().c_str())); SpacePathManager::release(m_path, getOwner()); - m_path = NULL; + m_path = nullptr; delete m_pendingNonAttackBehavior; m_pendingNonAttackBehavior = new AiShipBehaviorIdle(*this);; @@ -818,7 +818,7 @@ void AiShipController::track(Object const & target) LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::track() owner(%s) target(%s)", getOwner()->getNetworkId().getValueString().c_str(), target.getNetworkId().getValueString().c_str())); SpacePathManager::release(m_path, getOwner()); - m_path = NULL; + m_path = nullptr; delete m_pendingNonAttackBehavior; m_pendingNonAttackBehavior = new AiShipBehaviorTrack(*this, target); @@ -871,7 +871,7 @@ void AiShipController::clearPatrolPath() { LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::clearPatrolPath() owner(%s)", getOwner()->getNetworkId().getValueString().c_str())); - if (m_path != NULL) + if (m_path != nullptr) { m_path->clear(); } @@ -896,15 +896,15 @@ void AiShipController::triggerBehaviorChanged(AiShipBehaviorType const newBehavi { // Only send the trigger if the new behavior is different from the old behavior - AiShipBehaviorType const oldBehavior = (m_nonAttackBehavior != NULL) ? m_nonAttackBehavior->getBehaviorType() : ASBT_idle; + AiShipBehaviorType const oldBehavior = (m_nonAttackBehavior != nullptr) ? m_nonAttackBehavior->getBehaviorType() : ASBT_idle; if (oldBehavior != newBehavior) { Object * const object = getOwner(); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; - GameScriptObject * const gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + GameScriptObject * const gameScriptObject = (serverObject != nullptr) ? serverObject->getScriptObject() : nullptr; - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::triggerBehaviorChanged() unit(%s) old(%s) new(%s)", getOwner()->getNetworkId().getValueString().c_str(), AiShipBehaviorBase::getBehaviorString(oldBehavior), AiShipBehaviorBase::getBehaviorString(newBehavior))); @@ -925,10 +925,10 @@ void AiShipController::triggerBehaviorChanged(AiShipBehaviorType const newBehavi void AiShipController::triggerEnterCombat(NetworkId const & attackTarget) { Object * const object = getOwner(); - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; - GameScriptObject * const gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + GameScriptObject * const gameScriptObject = (serverObject != nullptr) ? serverObject->getScriptObject() : nullptr; - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::triggerEnterCombat() unit(%s) attackTarget(%s)", getOwner()->getNetworkId().getValueString().c_str(), attackTarget.getValueString().c_str())); @@ -968,7 +968,7 @@ void AiShipController::setPilotType(std::string const & pilotType) AiPilotManager::getPilotData(*m_pilotData, *m_pilotManagerInfo); // Make sure the ship name is set - if (shipObject != NULL) + if (shipObject != nullptr) { std::string shipName; @@ -986,7 +986,7 @@ void AiShipController::setPilotType(std::string const & pilotType) // Create the attack behavior based on the ship class delete m_attackBehavior; - m_attackBehavior = NULL; + m_attackBehavior = nullptr; m_shipClass = ShipAiReactionManager::getShipClass(m_shipName); @@ -1009,7 +1009,7 @@ void AiShipController::setPilotType(std::string const & pilotType) setAggroRadius(m_pilotData->m_aggroRadius); - FATAL((m_attackBehavior == NULL), ("The attack behavior can not be NULL.")); + FATAL((m_attackBehavior == nullptr), ("The attack behavior can not be nullptr.")); } // ---------------------------------------------------------------------- @@ -1029,8 +1029,8 @@ CachedNetworkId const & AiShipController::getPrimaryAttackTarget() const ShipObject const * AiShipController::getPrimaryAttackTargetShipObject() const { Object const * const targetObject = getPrimaryAttackTarget().getObject(); - ServerObject const * const targetServerObject = (targetObject != NULL) ? targetObject->asServerObject() : NULL; - ShipObject const * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL; + ServerObject const * const targetServerObject = (targetObject != nullptr) ? targetObject->asServerObject() : nullptr; + ShipObject const * const targetShipObject = (targetServerObject != nullptr) ? targetServerObject->asShipObject() : nullptr; return targetShipObject; } @@ -1097,7 +1097,7 @@ void AiShipController::setSquad(SpaceSquad * const squad) { // Remove the unit from its previous squad - if ( (m_squad != NULL) + if ( (m_squad != nullptr) && !m_squad->isEmpty()) { m_squad->removeUnit(getOwner()->getNetworkId()); @@ -1170,7 +1170,7 @@ void AiShipController::setAttackSquad(SpaceAttackSquad * const attackSquad) { // Remove the unit from its pervious attack squad - if (m_attackSquad != NULL) + if (m_attackSquad != nullptr) { m_attackSquad->removeUnit(getOwner()->getNetworkId()); } @@ -1210,7 +1210,7 @@ float AiShipController::getShipRadius() const ShipObject const * const shipObject = getShipOwner(); CollisionProperty const * const shipCollision = shipObject->getCollisionProperty(); - if (shipCollision != NULL) + if (shipCollision != nullptr) { result = shipCollision->getBoundingSphere_l().getRadius(); } @@ -1288,9 +1288,9 @@ bool AiShipController::shouldCheckForEnemies() const void AiShipController::setCurrentPathIndex(unsigned int const index) { - //LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setCurrentPathIndex() unit(%s) pathIndex(%u) pathSize(%u)", getOwner()->getNetworkId().getValueString().c_str(), index, (m_path != NULL) ? m_path->getTransformList().size() : 0)); + //LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setCurrentPathIndex() unit(%s) pathIndex(%u) pathSize(%u)", getOwner()->getNetworkId().getValueString().c_str(), index, (m_path != nullptr) ? m_path->getTransformList().size() : 0)); - if ( (m_path != NULL) + if ( (m_path != nullptr) && !m_path->isEmpty()) { m_currentPathIndex = index; @@ -1298,7 +1298,7 @@ void AiShipController::setCurrentPathIndex(unsigned int const index) else { m_currentPathIndex = 0; - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (m_currentPathIndex > 0), "debug_ai", ("AiShipController::setCurrentPathIndex() Setting a non-zero path index(%d) on a NULL or empty path", index)); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (m_currentPathIndex > 0), "debug_ai", ("AiShipController::setCurrentPathIndex() Setting a non-zero path index(%d) on a nullptr or empty path", index)); } } @@ -1317,7 +1317,7 @@ float AiShipController::calculateThrottleToPosition_w(Vector const & position_w, Object const * const object = getOwner(); - if (object != NULL) + if (object != nullptr) { float const distanceToGoalSquared = object->getPosition_w().magnitudeBetweenSquared(position_w); @@ -1420,7 +1420,7 @@ void AiShipController::switchToBomberAttack() bool AiShipController::removeAttackTarget(NetworkId const & unit) { LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::removeAttackTarget() owner(%s) unit(%s)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str())); - DEBUG_WARNING((unit == NetworkId::cms_invalid), ("debug_ai: owner(%s) ERROR: Trying to remove a NULL unit(%s) from the attack target list.", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str())); + DEBUG_WARNING((unit == NetworkId::cms_invalid), ("debug_ai: owner(%s) ERROR: Trying to remove a nullptr unit(%s) from the attack target list.", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str())); return ShipController::removeAttackTarget(unit); } @@ -1637,7 +1637,7 @@ void AiShipController::sendDebugAiToClients(AiDebugString & aiDebugString) bool const checkForEnemies = shouldCheckForEnemies(); float const leashRadius = m_attackBehavior->getLeashRadius(); - aiDebugString.addText(formattedString.sprintf("%s agg(%.0f) lsh(%.0f) %s\n", AiShipController::getAttackOrdersString(getAttackOrders()), m_aggroRadius, leashRadius, (m_attackBehavior == NULL) ? " [NO ATTACK BEHAVIOR]" : (checkForEnemies ? " [LFE]" : ""))); + aiDebugString.addText(formattedString.sprintf("%s agg(%.0f) lsh(%.0f) %s\n", AiShipController::getAttackOrdersString(getAttackOrders()), m_aggroRadius, leashRadius, (m_attackBehavior == nullptr) ? " [NO ATTACK BEHAVIOR]" : (checkForEnemies ? " [LFE]" : ""))); } } @@ -1687,7 +1687,7 @@ void AiShipController::sendDebugAiToClients(AiDebugString & aiDebugString) // Only send to the client if the objvar is set int temp = 0; - if ( (characterObject != NULL) + if ( (characterObject != nullptr) && characterObject->getObjVars().getItem("ai_debug_string", temp)) { if (temp > 0) @@ -1768,8 +1768,8 @@ void AiShipController::addExclusiveAggro(NetworkId const & unit) // Make sure this is a player Object * const unitObject = NetworkIdManager::getObjectById(unit); - ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL; - CreatureObject * const unitCreatureObject = (unitServerObject != NULL) ? unitServerObject->asCreatureObject() : NULL; + ServerObject * const unitServerObject = (unitObject != nullptr) ? unitObject->asServerObject() : nullptr; + CreatureObject * const unitCreatureObject = (unitServerObject != nullptr) ? unitServerObject->asCreatureObject() : nullptr; if ( !unitCreatureObject || !unitCreatureObject->isPlayerControlled()) @@ -1829,11 +1829,11 @@ bool AiShipController::isExclusiveAggro(CreatureObject const & pilot) const CreatureObject const * const aggroCreatureObject = CreatureObject::asCreatureObject(aggroCachedNetworkId.getObject()); - if (aggroCreatureObject != NULL) + if (aggroCreatureObject != nullptr) { GroupObject * const groupObject = aggroCreatureObject->getGroup(); - if (groupObject != NULL) + if (groupObject != nullptr) { GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers(); GroupObject::GroupMemberVector::const_iterator iterGroupMembers = groupMembers.begin(); @@ -1871,7 +1871,7 @@ bool AiShipController::isValidTarget(ShipObject const & unit) const CreatureObject const * const pilotCreatureObject = unit.getPilot(); - if (pilotCreatureObject != NULL) + if (pilotCreatureObject != nullptr) { if (pilotCreatureObject->isPlayerControlled()) { diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp index 3e4549aa..21fef53d 100755 --- a/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp +++ b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp @@ -25,7 +25,7 @@ bool AiShipControllerInterface::addDamageTaken(NetworkId const & unit, NetworkId bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { bool const verifyAttacker = false; @@ -45,7 +45,7 @@ bool AiShipControllerInterface::setAttackOrders(NetworkId const & unit, AiShipCo bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->setAttackOrders(attackOrders); @@ -64,7 +64,7 @@ bool AiShipControllerInterface::idle(NetworkId const & unit) bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->idle(); @@ -83,7 +83,7 @@ bool AiShipControllerInterface::track(NetworkId const & unit, Object const & tar bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->track(target); @@ -102,7 +102,7 @@ bool AiShipControllerInterface::setLeashRadius(NetworkId const & unit, float con bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->setLeashRadius(radius); @@ -121,7 +121,7 @@ bool AiShipControllerInterface::follow(NetworkId const & unit, NetworkId const & bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->follow(followedUnit, direction_o, direction); @@ -140,7 +140,7 @@ bool AiShipControllerInterface::addPatrolPath(NetworkId const & unit, SpacePath bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->addPatrolPath(path); @@ -159,7 +159,7 @@ bool AiShipControllerInterface::clearPatrolPath(NetworkId const & unit) bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->clearPatrolPath(); @@ -178,7 +178,7 @@ bool AiShipControllerInterface::moveTo(NetworkId const & unit, SpacePath * const bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; aiShipController->moveTo(path); diff --git a/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp index 067da019..f25d0fb1 100755 --- a/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp @@ -122,7 +122,7 @@ CreatureController::~CreatureController() void CreatureController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags) { CreatureObject * const owner = static_cast(getOwner()); - DEBUG_FATAL(!owner, ("Owner is NULL in CreatureController::handleMessage\n")); + DEBUG_FATAL(!owner, ("Owner is nullptr in CreatureController::handleMessage\n")); switch(message) { @@ -629,7 +629,7 @@ void CreatureController::handleMessage (const int message, const float value, co case CM_setIncapacitated: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) owner->setIncapacitated(msg->getValue().first, msg->getValue().second); } break; @@ -853,7 +853,7 @@ void CreatureController::handleMessage (const int message, const float value, co if (owner && msg) owner->setAlternateAppearance(msg->getValue()); else - WARNING(true, ("CreatureController: received CM_setAppearanceFromObjectTemplate but owner or message was NULL.")); + WARNING(true, ("CreatureController: received CM_setAppearanceFromObjectTemplate but owner or message was nullptr.")); } break; @@ -873,9 +873,9 @@ void CreatureController::handleMessage (const int message, const float value, co if (msg) { ServerObject * defender = safe_cast(NetworkIdManager::getObjectById(msg->getDefender())); - if (defender != NULL) + if (defender != nullptr) { - if (defender->asCreatureObject() != NULL) + if (defender->asCreatureObject() != nullptr) { defender->asCreatureObject()->pushedMe(msg->getAttacker(), msg->getAttackerPos(), msg->getDefenderPos(), msg->getDistance()); } @@ -894,7 +894,7 @@ void CreatureController::handleMessage (const int message, const float value, co if (msg) { ServerObject * target = safe_cast(NetworkIdManager::getObjectById(msg->getTarget())); - if (target != NULL && target->asTangibleObject() != NULL) + if (target != nullptr && target->asTangibleObject() != nullptr) { if (owner->isAuthoritative()) owner->addSlowDownEffect(*(target->asTangibleObject()), msg->getConeLength(), msg->getConeAngle(), msg->getSlopeAngle(), msg->getExpireTime()); @@ -964,7 +964,7 @@ void CreatureController::handleMessage (const int message, const float value, co { MessageQueueCyberneticsChangeRequest const * const msg = safe_cast(data); NOT_NULL(msg); - if (msg != NULL) + if (msg != nullptr) { NetworkId const & playerId = msg->getTarget(); GameScriptObject * const scriptObject = owner->getScriptObject(); @@ -984,10 +984,10 @@ void CreatureController::handleMessage (const int message, const float value, co case CM_setCurrentQuest: { MessageQueueGenericValueType const * const msg = safe_cast const *>(data); - if (msg != NULL) + if (msg != nullptr) { PlayerObject * player = PlayerCreatureController::getPlayerObject(owner); - if (player != NULL) + if (player != nullptr) { player->setCurrentQuest(msg->getValue()); } @@ -1003,7 +1003,7 @@ void CreatureController::handleMessage (const int message, const float value, co case CM_setRegenRate: { MessageQueueGenericValueType > const * const msg = safe_cast > const *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->setRegenRate(static_cast(msg->getValue().first), msg->getValue().second); } @@ -1516,7 +1516,7 @@ void CreatureController::conclude() // combatants must be adjusted to reflect the server's idea of the post-alter end posture. // This information was not known at the time the message was constructed. MessageQueueCombatAction * combatMessage = safe_cast(data); - if (combatMessage != NULL) + if (combatMessage != nullptr) { //-- Fix up end postures in messages. @@ -1527,7 +1527,7 @@ void CreatureController::conclude() combatMessage->getAttacker()); const CreatureObject * attacker = dynamic_cast( NetworkIdManager::getObjectById(attackerData.id)); - attackerData.endPosture = (attacker != NULL) ? attacker->getPosture() : static_cast(0); + attackerData.endPosture = (attacker != nullptr) ? attacker->getPosture() : static_cast(0); // set the defenders' posture const MessageQueueCombatAction::DefenderDataVector & defenderData = @@ -1539,7 +1539,7 @@ void CreatureController::conclude() const_cast(*iter); const CreatureObject * defender = dynamic_cast( NetworkIdManager::getObjectById(defenderData.id)); - defenderData.endPosture = (defender != NULL) ? defender->getPosture() : static_cast(0); + defenderData.endPosture = (defender != nullptr) ? defender->getPosture() : static_cast(0); } } } @@ -1667,7 +1667,7 @@ void CreatureController::handleSecureTradeMessage(const MessageQueueSecureTrade )); } } - else if (recipient->getClient() == NULL) + else if (recipient->getClient() == nullptr) { // GameServer::getInstance().sendToPlanetServer( // GenericValueTypeMessage >( @@ -1862,7 +1862,7 @@ void CreatureController::setAppearanceFromObjectTemplate(std::string const &serv CreatureObject * owner = dynamic_cast(getOwner()); if (!owner) { - WARNING(true, ("setAppearanceFromObjectTemplate(): owner is NULL or not a CreatureObject.")); + WARNING(true, ("setAppearanceFromObjectTemplate(): owner is nullptr or not a CreatureObject.")); return; } @@ -2007,7 +2007,7 @@ void CreatureController::calculateWaterState(bool& isSwimming, bool &isBurning, if (ownerCreature->getState(States::RidingMount)) { CreatureObject const *const mountCreature = ownerCreature->getMountedCreature(); - CreatureController const *const mountCreatureController = mountCreature ? safe_cast(mountCreature->getController()) : NULL; + CreatureController const *const mountCreatureController = mountCreature ? safe_cast(mountCreature->getController()) : nullptr; if (mountCreatureController) { // Note: we do the real computation for the mount here because the rider gets @@ -2135,28 +2135,28 @@ CreatureController const * CreatureController::asCreatureController() const PlayerCreatureController * CreatureController::asPlayerCreatureController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- PlayerCreatureController const * CreatureController::asPlayerCreatureController() const { - return NULL; + return nullptr; } //---------------------------------------------------------------------- AICreatureController * CreatureController::asAiCreatureController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- AICreatureController const * CreatureController::asAiCreatureController() const { - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -2170,23 +2170,23 @@ CreatureController * CreatureController::getCreatureController(NetworkId const & CreatureController * CreatureController::getCreatureController(Object * object) { - Controller * controller = (object != NULL) ? object->getController() : NULL; + Controller * controller = (object != nullptr) ? object->getController() : nullptr; - return (controller != NULL) ? controller->asCreatureController() : NULL; + return (controller != nullptr) ? controller->asCreatureController() : nullptr; } // ---------------------------------------------------------------------- CreatureController * CreatureController::asCreatureController(Controller * controller) { - return (controller != NULL) ? controller->asCreatureController() : NULL; + return (controller != nullptr) ? controller->asCreatureController() : nullptr; } // ---------------------------------------------------------------------- CreatureController const * CreatureController::asCreatureController(Controller const * controller) { - return (controller != NULL) ? controller->asCreatureController() : NULL; + return (controller != nullptr) ? controller->asCreatureController() : nullptr; } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp b/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp index 97a826ba..465bb3d5 100755 --- a/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp @@ -61,7 +61,7 @@ void PlanetController::handleMessage (const int message, const float value, cons case CM_setWeather: { const MessageQueueGenericValueType >* const message = safe_cast >*> (data); - if (message != NULL) + if (message != nullptr) { owner->setWeather( message->getValue().first, @@ -280,7 +280,7 @@ void PlanetController::handleMessage (const int message, const float value, cons const std::map & data = message->getValue(); for (std::map::const_iterator iter = data.begin(); iter != data.end(); ++iter) - owner->adjustGcwImperialScore("CM_adjustGcwImperialScore", NULL, iter->first, iter->second); + owner->adjustGcwImperialScore("CM_adjustGcwImperialScore", nullptr, iter->first, iter->second); } } break; @@ -293,7 +293,7 @@ void PlanetController::handleMessage (const int message, const float value, cons const std::map & data = message->getValue(); for (std::map::const_iterator iter = data.begin(); iter != data.end(); ++iter) - owner->adjustGcwRebelScore("CM_adjustGcwRebelScore", NULL, iter->first, iter->second); + owner->adjustGcwRebelScore("CM_adjustGcwRebelScore", nullptr, iter->first, iter->second); } } break; diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp index df4260bc..1097566c 100755 --- a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp @@ -164,7 +164,7 @@ namespace PlayerCreatureControllerNamespace if(!mount) { - LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but getMountedCreature() returns NULL.", static_cast(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str())); + LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but getMountedCreature() returns nullptr.", static_cast(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str())); return false; } @@ -172,7 +172,7 @@ namespace PlayerCreatureControllerNamespace if(!primaryRider) { - LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but mount->getPrimaryMountingRider() returns NULL.", static_cast(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str())); + LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but mount->getPrimaryMountingRider() returns nullptr.", static_cast(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str())); return false; } @@ -411,7 +411,7 @@ void PlayerCreatureController::logMoveFailed(char const *reason) "movement", ( "move fail - object %s stationId %u - %s", - creature ? creature->getNetworkId().getValueString().c_str() : "", + creature ? creature->getNetworkId().getValueString().c_str() : "", stationId, reason)); } @@ -425,7 +425,7 @@ bool PlayerCreatureController::isLocationValid(Vector const &position_w, CellObj return false; TerrainObject const *const terrainObject = TerrainObject::getConstInstance(); - if (NULL != terrainObject && (NULL == cell || cell->getCellProperty()->isWorldCell())) + if (nullptr != terrainObject && (nullptr == cell || cell->getCellProperty()->isWorldCell())) { if (!terrainObject->isPassableForceChunkCreation(position_w)) return false; @@ -445,7 +445,7 @@ bool PlayerCreatureController::isLocationValid(Vector const &position_w, CellObj Sphere testSphere(position_w + localSphere.getCenter(), localSphere.getRadius()); - if (CollisionWorld::query(testSphere, NULL)) + if (CollisionWorld::query(testSphere, nullptr)) return false; } return true; @@ -464,7 +464,7 @@ bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const CreatureObject * const creature = NON_NULL(getCreature()); // update the velocity in the serverController - if (creature != NULL) + if (creature != nullptr) { Vector moveDistance = m.getPosition_w() - creature->getPosition_w(); moveDistance.y = 0.0f; @@ -495,8 +495,8 @@ bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const if (!m.isValid()) return handleInvalidMove("invalid destination"); - if (creature == NULL) - return handleInvalidMove("creature is null"); + if (creature == nullptr) + return handleInvalidMove("creature is nullptr"); if (!m.isAllowed(*creature)) return handleInvalidMove("not allowed in dest cell"); @@ -513,7 +513,7 @@ bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const PortalProperty const *destPortalProperty = destCell ? ContainerInterface::getContainedByObject(*destCell)->getPortalProperty() : 0; if (sourcePortalProperty != destPortalProperty) { - // Moving between pobs. This is only valid if one of these is null, since pobs only connect to the world + // Moving between pobs. This is only valid if one of these is nullptr, since pobs only connect to the world if (sourcePortalProperty && destPortalProperty) return handleInvalidMove("tried to move from one pob to another without passing through the world cell"); if (sourcePortalProperty && !sourcePortalProperty->hasPassablePortalToParentCell()) @@ -548,7 +548,7 @@ bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const Client * const client = creature->getClient(); if (!client) - return handleInvalidMove("Creature's client is NULL"); + return handleInvalidMove("Creature's client is nullptr"); uint32 const currentServerSyncStamp = client->getServerSyncStampLong(); @@ -741,7 +741,7 @@ bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const } - m_lastSpeedCheckFailureTime = ::time(NULL); + m_lastSpeedCheckFailureTime = ::time(nullptr); ++m_speedCheckConsecutiveFailureCount; // if this is the first validation failure "in a while", let it pass, because it may be a false positive @@ -1153,11 +1153,11 @@ void PlayerCreatureController::handleMessage (const int message, const float val NetworkId const & designerId = inMsg->getDesignerId(); NetworkId const & recipientId = inMsg->getRecipientId(); Object const * const designerObj = NetworkIdManager::getObjectById(designerId); - ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : NULL; - CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : NULL; + ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : nullptr; + CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : nullptr; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL; + ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : nullptr; if(designer && recipient) { //designer-sent message, either data to sync to the recipient, or committed data to check and apply @@ -1167,7 +1167,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //designer hasn't accepted yet, send change to the client so they can see it before agreeing Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId()); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); @@ -1182,7 +1182,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //check and apply this data once the recipient also accepts Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId()); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); @@ -1201,7 +1201,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val //recipient hasn't accepted yet, send the data to the designer to update the recipient-sent amount of money //designer hasn't accepted yet, send change to the client so they can see it before agreeing Object * const designerObject = NetworkIdManager::getObjectById(inMsg->getDesignerId()); - Controller * const designerController = designerObject ? designerObject->getController() : NULL; + Controller * const designerController = designerObject ? designerObject->getController() : nullptr; if(designerController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); @@ -1232,8 +1232,8 @@ void PlayerCreatureController::handleMessage (const int message, const float val std::string const recipientSpeciesGender = CustomizationManager::getServerSpeciesGender(*recipient); CustomizationData * const customizationData = recipient->fetchCustomizationData(); ServerObject * const hair = recipient->getHair(); - TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL; - CustomizationData * customizationDataHair = NULL; + TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : nullptr; + CustomizationData * customizationDataHair = nullptr; if(tangibleHair) customizationDataHair = tangibleHair->fetchCustomizationData(); if(customizationData) @@ -1285,7 +1285,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //if the recipient canceled the session, tell the designer Object const * const designerObject = NetworkIdManager::getObjectById(session.designerId); - ServerObject const * const designer = designerObject ? designerObject->asServerObject() : NULL; + ServerObject const * const designer = designerObject ? designerObject->asServerObject() : nullptr; if(designer && (owner->getNetworkId() != session.designerId)) Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_canceled_by_recip, Unicode::emptyString); @@ -1304,11 +1304,11 @@ void PlayerCreatureController::handleMessage (const int message, const float val NetworkId const & bufferId = inMsg->getBufferId(); NetworkId const & recipientId = inMsg->getRecipientId(); Object const * const bufferObj = NetworkIdManager::getObjectById(bufferId); - ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : NULL; - CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : NULL; + ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : nullptr; + CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : nullptr; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL; + ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : nullptr; if(buffer && recipient) { //buffer-sent message, either data to sync to the recipient, or committed data to check and apply @@ -1318,7 +1318,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //buffer hasn't accepted yet, send change to the client so they can see it before agreeing Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId()); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); @@ -1333,7 +1333,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //check and apply this data once the recipient also accepts Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId()); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); @@ -1351,7 +1351,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val //recipient hasn't accepted yet, send the data to the buffer to update the recipient-sent amount of money //buffer hasn't accepted yet, send change to the client so they can see it before agreeing Object * const bufferObject = NetworkIdManager::getObjectById(inMsg->getBufferId()); - Controller * const bufferController = bufferObject ? bufferObject->getController() : NULL; + Controller * const bufferController = bufferObject ? bufferObject->getController() : nullptr; if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); @@ -1425,7 +1425,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val { //if the recipient canceled the session, tell the designer Object const * const bufferObject = NetworkIdManager::getObjectById(session.bufferId); - ServerObject const * const buffer = bufferObject ? bufferObject->asServerObject() : NULL; + ServerObject const * const buffer = bufferObject ? bufferObject->asServerObject() : nullptr; if(buffer && (owner->getNetworkId() != session.bufferId)) { @@ -1447,7 +1447,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(msg) { Object const * const terminalO = NetworkIdManager::getObjectById(msg->getValue()); - ServerObject const * const terminal = terminalO ? terminalO->asServerObject() : NULL; + ServerObject const * const terminal = terminalO ? terminalO->asServerObject() : nullptr; if(terminal) { Client const * const client = owner->getClient(); @@ -1461,7 +1461,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val if(!client->isGod()) { Object const * const buildingO = ContainerInterface::getTopmostContainer(*terminal); - ServerObject const * const building = buildingO ? buildingO->asServerObject() : NULL; + ServerObject const * const building = buildingO ? buildingO->asServerObject() : nullptr; if(building) { DynamicVariableList const & buildingObjVars = building->getObjVars(); @@ -1478,13 +1478,13 @@ void PlayerCreatureController::handleMessage (const int message, const float val for(std::vector::const_iterator i = ships.begin(); i != ships.end(); ++i) { Object const * const shipO = NetworkIdManager::getObjectById(*i); - ServerObject const * const shipSO = shipO ? shipO->asServerObject() : NULL; - ShipObject const * const ship = shipSO ? shipSO->asShipObject() : NULL; + ServerObject const * const shipSO = shipO ? shipO->asServerObject() : nullptr; + ShipObject const * const ship = shipSO ? shipSO->asShipObject() : nullptr; if(ship) { ContainedByProperty const * const contained = ship->getContainedByProperty(); - Object const * const containerO = contained ? contained->getContainedBy() : NULL; - ServerObject const * const container = containerO ? containerO->asServerObject() : NULL; + Object const * const containerO = contained ? contained->getContainedBy() : nullptr; + ServerObject const * const container = containerO ? containerO->asServerObject() : nullptr; if(container) { DynamicVariableList const & shipControlDeviceObjVars = container->getObjVars(); @@ -1665,14 +1665,14 @@ void PlayerCreatureController::handleMessage (const int message, const float val { MessageQueueCyberneticsChangeRequest const * const msg = dynamic_cast(data); NOT_NULL(msg); - if (msg != NULL) + if (msg != nullptr) { CreatureObject * const owner = NON_NULL(getCreature()); if(owner) { NetworkId const & npcId = msg->getTarget(); Object * const o = NetworkIdManager::getObjectById(npcId); - ServerObject * const so = o ? o->asServerObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; if(so) { Controller * const npcController = so->getController(); @@ -1696,10 +1696,10 @@ void PlayerCreatureController::handleMessage (const int message, const float val case CM_spaceMiningSaleSellResource: { MessageQueueSpaceMiningSellResource const * const msg = dynamic_cast(data); - if (msg != NULL) + if (msg != nullptr) { ServerObject * const spaceStation = safe_cast(NetworkIdManager::getObjectById(msg->m_spaceStationId)); - if (NULL == spaceStation) + if (nullptr == spaceStation) { WARNING(true, ("PlayerCreatureController CM_spaceMiningSaleSellResource invalid station [%s]", msg->m_spaceStationId.getValueString().c_str())); } @@ -1784,7 +1784,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val DictionaryValueMap::const_iterator itr = valueMap.find(minigameResultTargetName); - if(itr != valueMap.end() && itr->second != NULL) + if(itr != valueMap.end() && itr->second != nullptr) { if(itr->second->getType() == ValueTypeObjId::ms_type) { @@ -1798,7 +1798,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(tableOid, @@ -1859,7 +1859,7 @@ void PlayerCreatureController::handleMessage (const int message, const float val params.addParam(paramsDict, "taskDictionary"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(owner->getNetworkId(), diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp index 6350d91b..921e3980 100755 --- a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp @@ -295,10 +295,10 @@ void PlayerShipController::handleMessage(int const message, float const value, M case CM_spaceMiningSaleSellResource: { MessageQueueSpaceMiningSellResource const * const msg = dynamic_cast(data); - if (msg != NULL) + if (msg != nullptr) { ServerObject * const spaceStation = safe_cast(NetworkIdManager::getObjectById(msg->m_spaceStationId)); - if (NULL == spaceStation) + if (nullptr == spaceStation) { WARNING(true, ("PlayerCreatureController CM_spaceMiningSaleSellResource invalid station [%s]", msg->m_spaceStationId.getValueString().c_str())); } @@ -376,16 +376,16 @@ float PlayerShipController::realAlter(float const elapsedTime) if (owner && owner->isInitialized()) { - if (m_pendingDockingBehavior != NULL) + if (m_pendingDockingBehavior != nullptr) { delete m_dockingBehavior; m_dockingBehavior = m_pendingDockingBehavior; - m_pendingDockingBehavior = NULL; + m_pendingDockingBehavior = nullptr; getShipOwner()->setCondition(static_cast(TangibleObject::C_docking)); Client * const client = owner->getClient(); - if (client != NULL) + if (client != nullptr) { ShipClientUpdateTracker::queueForUpdate(*client, *owner); } @@ -395,16 +395,16 @@ float PlayerShipController::realAlter(float const elapsedTime) } } - if ( (m_dockingBehavior != NULL) + if ( (m_dockingBehavior != nullptr) && m_dockingBehavior->isDockFinished()) { delete m_dockingBehavior; - m_dockingBehavior = NULL; + m_dockingBehavior = nullptr; getShipOwner()->clearCondition(static_cast(TangibleObject::C_docking)); } - if (m_dockingBehavior != NULL) + if (m_dockingBehavior != nullptr) { //-- The docking behavior will calculate new values for m_yaw/m_pitch/m_roll/m_throttle[Position] implicitly through calling ShipController members m_dockingBehavior->alter(elapsedTime); @@ -806,7 +806,7 @@ void PlayerShipController::setWeaponIndexPlayerControlled(int const weaponIndex, { DEBUG_FATAL((weaponIndex < 0), ("Invalid weaponIndex(%d)", weaponIndex)); - if (m_turretTargetingSystem != NULL) + if (m_turretTargetingSystem != nullptr) { safe_cast(m_turretTargetingSystem)->setWeaponIndexPlayerControlled(weaponIndex, playerControlled); } diff --git a/engine/server/library/serverGame/src/shared/controller/ServerController.cpp b/engine/server/library/serverGame/src/shared/controller/ServerController.cpp index bd5ffc3f..535341e6 100755 --- a/engine/server/library/serverGame/src/shared/controller/ServerController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/ServerController.cpp @@ -55,7 +55,7 @@ CellProperty const * getCell(Object const * obj) { - if(obj == NULL) return NULL; + if(obj == nullptr) return nullptr; return obj->getCellProperty(); } @@ -74,7 +74,7 @@ Vector movePointBetweenCells ( Object const * oldCellObject, Object const * new Transform toWorld = Transform::identity; Transform toCell = Transform::identity; - if(oldCellObject != NULL) + if(oldCellObject != nullptr) { CellProperty const * oldCell = getCell(oldCellObject); @@ -84,7 +84,7 @@ Vector movePointBetweenCells ( Object const * oldCellObject, Object const * new } } - if(newCellObject != NULL) + if(newCellObject != nullptr) { CellProperty const * newCell = getCell(newCellObject); @@ -115,7 +115,7 @@ Transform moveTransformBetweenCells ( Object const * oldCellObject, Object const Transform toWorld = Transform::identity; Transform toCell = Transform::identity; - if(oldCellObject != NULL) + if(oldCellObject != nullptr) { CellProperty const * oldCell = getCell(oldCellObject); @@ -125,7 +125,7 @@ Transform moveTransformBetweenCells ( Object const * oldCellObject, Object const } } - if(newCellObject != NULL) + if(newCellObject != nullptr) { CellProperty const * newCell = getCell(newCellObject); @@ -220,7 +220,7 @@ void ServerController::setAuthoritative(bool newAuthoritative) { if (!newAuthoritative && m_bHasGoal && m_goalCellObject) { - m_goalCellObject = NULL; + m_goalCellObject = nullptr; m_bHasGoal = false; m_bAtGoal = true; } @@ -420,7 +420,7 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject) // ---------- - if (newCellObject == NULL) + if (newCellObject == nullptr) { // Object was in a cell and is moving to the world, transfer from cell container to world @@ -428,7 +428,7 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject) Transform const &newTransform = oldCellObject->getTransform_o2w().rotateTranslate_l2p(objectTransform); Container::ContainerErrorCode tmp = Container::CEC_Success; - result = ContainerInterface::transferItemToWorld(object, newTransform, NULL, tmp); + result = ContainerInterface::transferItemToWorld(object, newTransform, nullptr, tmp); if (!result) { @@ -444,13 +444,13 @@ bool changeCells(ServerObject &object, ServerObject *newCellObject) CellProperty * const pCell = ContainerInterface::getCell(*newCellObject); - DEBUG_REPORT_LOG(pCell == NULL, ("changeCells - Received transform with parent to a non-cell object. This should only happen from the DB\n")); + DEBUG_REPORT_LOG(pCell == nullptr, ("changeCells - Received transform with parent to a non-cell object. This should only happen from the DB\n")); if (pCell) { Transform objectTransform = object.getTransform_o2p(); Container::ContainerErrorCode tmp = Container::CEC_Success; - result = ContainerInterface::transferItemToCell(*newCellObject, object, NULL, tmp); + result = ContainerInterface::transferItemToCell(*newCellObject, object, nullptr, tmp); if (!result) { @@ -537,7 +537,7 @@ void ServerController::handleNetUpdateTransform(const MessageQueueDataTransform& return; } - setGoal( message.getTransform(), NULL ); + setGoal( message.getTransform(), nullptr ); } //----------------------------------------------------------------------- @@ -566,7 +566,7 @@ void ServerController::handleNetUpdateTransformWithParent(const MessageQueueData #if 1 Transform start = Transform::identity; start.setPosition_p(ConfigServerGame::getStartingPosition()); - setGoal( start, NULL ); + setGoal( start, nullptr ); #endif return; } diff --git a/engine/server/library/serverGame/src/shared/controller/ShipController.cpp b/engine/server/library/serverGame/src/shared/controller/ShipController.cpp index 3367476d..312131a9 100755 --- a/engine/server/library/serverGame/src/shared/controller/ShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/ShipController.cpp @@ -58,12 +58,12 @@ ShipController::ShipController(ShipObject * newOwner) : m_pitchPosition(0.0f), m_rollPosition(0.0f), m_throttlePosition(0.0f), - m_pendingDockingBehavior(NULL), - m_dockingBehavior(NULL), + m_pendingDockingBehavior(nullptr), + m_dockingBehavior(nullptr), m_attackTargetList(new AiShipAttackTargetList(newOwner)), m_attackTargetDecayTimer(new Timer(static_cast(s_maxTargetAge))), m_enemyCheckQueued(false), - m_turretTargetingSystem(NULL), + m_turretTargetingSystem(nullptr), m_dockedByList(new DockedByList), m_aiTargetingMeList(new CachedNetworkIdList) { @@ -77,7 +77,7 @@ ShipController::~ShipController() // The turret targeting system must be deleted before clearAiTargetingMeList(), because // otherwise it will try to acquire new targets as the list is being cleared delete m_turretTargetingSystem; - m_turretTargetingSystem = NULL; + m_turretTargetingSystem = nullptr; clearAiTargetingMeList(); @@ -85,9 +85,9 @@ ShipController::~ShipController() delete m_dockedByList; delete m_aiTargetingMeList; delete m_pendingDockingBehavior; - m_pendingDockingBehavior = NULL; + m_pendingDockingBehavior = nullptr; delete m_dockingBehavior; - m_dockingBehavior = NULL; + m_dockingBehavior = nullptr; delete m_attackTargetList; delete m_attackTargetDecayTimer; } @@ -226,7 +226,7 @@ void ShipController::handleMessage (const int message, const float value, const UNREF(flags); UNREF(value); ShipObject * const owner = getShipOwner(); - DEBUG_FATAL(!owner, ("Owner is NULL in ShipController::handleMessage\n")); + DEBUG_FATAL(!owner, ("Owner is nullptr in ShipController::handleMessage\n")); switch(message) { case CM_clientLookAtTarget: @@ -265,7 +265,7 @@ void ShipController::addTurretTargetingSystem(ShipTurretTargetingSystem * newSys void ShipController::removeTurretTargetingSystem() { delete m_turretTargetingSystem; - m_turretTargetingSystem = NULL; + m_turretTargetingSystem = nullptr; } // ---------------------------------------------------------------------- @@ -281,7 +281,7 @@ void ShipController::addDockedBy(Object const & unit) { IGNORE_RETURN(m_dockedByList->insert(CachedNetworkId(unit))); - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::addDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != NULL) ? getOwner()->getNetworkId().getValueString().c_str() : "NULL", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::addDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != nullptr) ? getOwner()->getNetworkId().getValueString().c_str() : "nullptr", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size())); } // ---------------------------------------------------------------------- @@ -294,7 +294,7 @@ void ShipController::removeDockedBy(Object const & unit) { m_dockedByList->erase(iterDockedByList); - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != NULL) ? getOwner()->getNetworkId().getValueString().c_str() : "NULL", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != nullptr) ? getOwner()->getNetworkId().getValueString().c_str() : "nullptr", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size())); } else { @@ -314,7 +314,7 @@ ShipController::DockedByList const & ShipController::getDockedByList() const void ShipController::addAiTargetingMe(NetworkId const & unit) { //LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::addAiTargetingMe() owner(%s) unit(%s) m_aiTargetingMeList->size(%u+1)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str(), m_aiTargetingMeList->size())); - DEBUG_FATAL((NetworkIdManager::getObjectById(unit) == NULL), ("ShipController::addAiTargetingMe() owner(%s) unit(%s) ERROR: The Ai who is targeting you is not a valid networkId", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str())); + DEBUG_FATAL((NetworkIdManager::getObjectById(unit) == nullptr), ("ShipController::addAiTargetingMe() owner(%s) unit(%s) ERROR: The Ai who is targeting you is not a valid networkId", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str())); // Make sure this is a valid networkId of an alive object @@ -346,11 +346,11 @@ void ShipController::removeAiTargetingMe(NetworkId const & unit) { ShipObject * const shipOwner = getShipOwner(); - if (shipOwner != NULL) + if (shipOwner != nullptr) { CreatureObject * const pilotOwner = CreatureObject::asCreatureObject(shipOwner->getPilot()); - if ( (pilotOwner != NULL) + if ( (pilotOwner != nullptr) && pilotOwner->isPlayerControlled()) { shipOwner->clearCondition(static_cast(TangibleObject::C_spaceCombatMusic)); @@ -442,7 +442,7 @@ bool ShipController::face(Vector const & goalPosition_w, float elapsedTime) bool useFastAxis = true; AiShipController const * const aiShipController = asAiShipController(); - if (aiShipController != NULL) + if (aiShipController != nullptr) { if ( (aiShipController->getShipClass() == ShipAiReactionManager::SC_capitalShip) || (aiShipController->getShipClass() == ShipAiReactionManager::SC_transport) @@ -620,7 +620,7 @@ float ShipController::getLargestTurnRadius() const ShipObject const * const shipObject = getShipOwner(); - if (shipObject != NULL) + if (shipObject != nullptr) { float const maxYawRate = shipObject->getShipActualYawRateMaximum(); float const maxPitchRate = shipObject->getShipActualPitchRateMaximum(); @@ -650,11 +650,11 @@ void ShipController::dock(ShipObject & dockTarget, float const secondsAtDock) void ShipController::unDock() { - if (m_pendingDockingBehavior != NULL) + if (m_pendingDockingBehavior != nullptr) { m_pendingDockingBehavior->unDock(); } - else if (m_dockingBehavior != NULL) + else if (m_dockingBehavior != nullptr) { m_dockingBehavior->unDock(); } @@ -664,14 +664,14 @@ void ShipController::unDock() bool ShipController::isDocking() const { - return (m_dockingBehavior != NULL) || (m_pendingDockingBehavior != NULL); + return (m_dockingBehavior != nullptr) || (m_pendingDockingBehavior != nullptr); } // ---------------------------------------------------------------------- bool ShipController::isDocked() const { - return ((m_dockingBehavior != NULL) && m_dockingBehavior->isDocked()); + return ((m_dockingBehavior != nullptr) && m_dockingBehavior->isDocked()); } // ---------------------------------------------------------------------- @@ -698,28 +698,28 @@ ShipController const * ShipController::asShipController() const PlayerShipController * ShipController::asPlayerShipController() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- PlayerShipController const * ShipController::asPlayerShipController() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiShipController * ShipController::asAiShipController() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- AiShipController const * ShipController::asAiShipController() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -736,7 +736,7 @@ bool ShipController::addDamageTaken(NetworkId const & attackingUnit, float const bool result = false; ShipObject * const attackingUnitShipObject = ShipObject::asShipObject(NetworkIdManager::getObjectById(attackingUnit)); - if ( (attackingUnitShipObject != NULL) + if ( (attackingUnitShipObject != nullptr) && !attackingUnitShipObject->isDamageAggroImmune()) { result = verifyAttacker ? Pvp::canAttack(*attackingUnitShipObject, *NON_NULL(getShipOwner())) : true; @@ -754,7 +754,7 @@ bool ShipController::addDamageTaken(NetworkId const & attackingUnit, float const bool ShipController::hasTurretTargetingSystem() const { - return (m_turretTargetingSystem != NULL); + return (m_turretTargetingSystem != nullptr); } // ---------------------------------------------------------------------- @@ -792,7 +792,7 @@ bool ShipController::removeAttackTarget(NetworkId const & unit) void ShipController::onAttackTargetChanged(NetworkId const & target) { - if (m_turretTargetingSystem != NULL) + if (m_turretTargetingSystem != nullptr) { m_turretTargetingSystem->onTargetChanged(target); } @@ -802,7 +802,7 @@ void ShipController::onAttackTargetChanged(NetworkId const & target) void ShipController::onAttackTargetLost(NetworkId const & target) { - if (m_turretTargetingSystem != NULL) + if (m_turretTargetingSystem != nullptr) { m_turretTargetingSystem->onTargetLost(target); } @@ -834,12 +834,12 @@ int ShipController::getNumberOfAiUnitsAttackingMe() const CachedNetworkId const & ai = (*iterAiTargetingMeList); Object const * const aiObject = ai.getObject(); - if (aiObject != NULL) + if (aiObject != nullptr) { ShipController const * const shipController = aiObject->getController()->asShipController(); - AiShipController const * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; + AiShipController const * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; - if (aiShipController != NULL) + if (aiShipController != nullptr) { if (aiShipController->getPrimaryAttackTarget() == getOwner()->getNetworkId()) { @@ -849,7 +849,7 @@ int ShipController::getNumberOfAiUnitsAttackingMe() const } else { - DEBUG_WARNING(true, ("ShipController::getNumberOfAiShipAttackingMe() ERROR: Why am I(%s) being targeted by a NULL object(%s)?", getOwner()->getDebugInformation().c_str(), ai.getValueString().c_str())); + DEBUG_WARNING(true, ("ShipController::getNumberOfAiShipAttackingMe() ERROR: Why am I(%s) being targeted by a nullptr object(%s)?", getOwner()->getDebugInformation().c_str(), ai.getValueString().c_str())); } } @@ -910,11 +910,11 @@ void ShipController::clearAiTargetingMeList() { CachedNetworkId const & id = (*iterPurgeList); - if (id.getObject() != NULL) + if (id.getObject() != nullptr) { ShipController * const shipController = id.getObject()->getController()->asShipController(); - if (shipController != NULL) + if (shipController != nullptr) { IGNORE_RETURN(shipController->removeAttackTarget(getOwner()->getNetworkId())); } diff --git a/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp b/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp index d4e90806..ee670607 100755 --- a/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp @@ -222,7 +222,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_addHate: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_addHate) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_addHate) The message data should never be nullptr")); if(msg) { @@ -233,7 +233,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_setHate: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_setHate) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_setHate) The message data should never be nullptr")); if(msg) { @@ -244,7 +244,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_removeHateTarget: { const MessageQueueGenericValueType * const msg = safe_cast *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be nullptr")); if(msg) { @@ -265,7 +265,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_forceHateTarget: { const MessageQueueGenericValueType * const msg = safe_cast *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be nullptr")); if(msg) { @@ -276,9 +276,9 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_autoExpireHateListTargetEnabled: { const MessageQueueGenericValueType * const msg = safe_cast *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_setHateListExpireTargetEnabled) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_setHateListExpireTargetEnabled) The message data should never be nullptr")); - if (msg != NULL) + if (msg != nullptr) { owner->setHateListAutoExpireTargetEnabled(msg->getValue()); } @@ -315,7 +315,7 @@ void TangibleController::handleMessage (const int message, const float value, co if(object) { ServerObject * transferer = safe_cast(NetworkIdManager::getObjectById(msg->getValue().second)); - // transferer is allowed to be null + // transferer is allowed to be nullptr owner->addObjectToOutputSlot(*object, transferer); } } @@ -576,7 +576,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_addUserToAccessList: { MessageQueueGenericValueType > const *msg = safe_cast > const *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_addUserToAccessList) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_addUserToAccessList) The message data should never be nullptr")); if(msg) { @@ -590,7 +590,7 @@ void TangibleController::handleMessage (const int message, const float value, co case CM_removeUserFromAccessList: { MessageQueueGenericValueType > const *msg = safe_cast > const *>(data); - WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeUserFromAccessList) The message data should never be NULL")); + WARNING((msg == nullptr), ("TangibleController::handleMessage(CM_removeUserFromAccessList) The message data should never be nullptr")); if(msg) { @@ -722,14 +722,14 @@ TangibleController const * TangibleController::asTangibleController() const AiTurretController * TangibleController::asAiTurretController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- AiTurretController const * TangibleController::asAiTurretController() const { - return NULL; + return nullptr; } //======================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp index 8cf03ed4..f2104fad 100755 --- a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp @@ -24,7 +24,7 @@ namespace AttribModNameManagerNamespace std::set unknownCrcs; } -AttribModNameManager * AttribModNameManager::ms_attribModNameManager = NULL; +AttribModNameManager * AttribModNameManager::ms_attribModNameManager = nullptr; //======================================================================== @@ -65,8 +65,8 @@ AttribModNameManager::~AttribModNameManager() { delete m_names; delete m_crcMap; - m_names = NULL; - m_crcMap = NULL; + m_names = nullptr; + m_crcMap = nullptr; } // AttribModNameManager::~AttribModNameManager // ---------------------------------------------------------------------- @@ -76,7 +76,7 @@ AttribModNameManager::~AttribModNameManager() */ void AttribModNameManager::install() { - if (ms_attribModNameManager == NULL) + if (ms_attribModNameManager == nullptr) { ms_attribModNameManager = new AttribModNameManager; ExitChain::add(AttribModNameManager::remove, "AttribModNameManager::remove"); @@ -90,10 +90,10 @@ void AttribModNameManager::install() */ void AttribModNameManager::remove() { - if (ms_attribModNameManager != NULL) + if (ms_attribModNameManager != nullptr) { delete ms_attribModNameManager; - ms_attribModNameManager = NULL; + ms_attribModNameManager = nullptr; } } // AttribModNameManager::remove @@ -263,7 +263,7 @@ void AttribModNameManager::sendAllNamesToServer(std::vector const & serv * * @param crc the crc value to look up * - * @return the attrib mod name, or NULL if there was no name for the crc + * @return the attrib mod name, or nullptr if there was no name for the crc */ const char * AttribModNameManager::getAttribModName(uint32 crc) const { @@ -277,7 +277,7 @@ const char * AttribModNameManager::getAttribModName(uint32 crc) const ServerClock::getInstance().getServerFrame())); AttribModNameManagerNamespace::unknownCrcs.insert(crc); } - return NULL; + return nullptr; } // AttribModNameManager::getAttribModName // ---------------------------------------------------------------------- @@ -350,7 +350,7 @@ void AttribModNameManager::getAttribModNamesFromBase(uint32 base, std::vector & names) const { const char * baseName = getAttribModName(base); - if (baseName != NULL) + if (baseName != nullptr) getAttribModNamesFromBase(baseName, names); } // AttribModNameManager::getAttribModNamesFromBase @@ -366,7 +366,7 @@ void AttribModNameManager::getAttribModCrcsFromBase(uint32 base, std::vector & crcs) const { const char * baseName = getAttribModName(base); - if (baseName != NULL) + if (baseName != nullptr) getAttribModCrcsFromBase(baseName, crcs); } // AttribModNameManager::getAttribModCrcsFromBase diff --git a/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp index 6febe92c..6996f5fc 100755 --- a/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp @@ -133,7 +133,7 @@ void BiographyManager::deleteBiography(const NetworkId &owner) DEBUG_FATAL(!m_installed, ("BioManager not installed")); - BiographyMessage const msg(owner,NULL); + BiographyMessage const msg(owner,nullptr); GameServer::getInstance().sendToDatabaseServer(msg); // Save off the bio for viewing by other players diff --git a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp index ce305b38..89668966 100755 --- a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp @@ -55,7 +55,7 @@ namespace CharacterMatchManagerNamespace // used when invoking LfgDataTable::LfgNode::internalAttributeMatchFunction struct LfgInternalAttributeMatchFunctionParams { - LfgInternalAttributeMatchFunctionParams() : param1(NULL), param2(NULL), param3(NULL), param4(NULL), param5(NULL) {} + LfgInternalAttributeMatchFunctionParams() : param1(nullptr), param2(nullptr), param3(nullptr), param4(nullptr), param5(nullptr) {} void const * param1; void const * param2; @@ -151,8 +151,8 @@ bool CharacterMatchManagerNamespace::isMatch(std::map(NetworkIdManager::getObjectById(networkId)); - Client * const requestClient = (requestServerObject ? requestServerObject->getClient() : NULL); - CreatureObject * const requestCreatureObject = (requestServerObject ? requestServerObject->asCreatureObject() : NULL); - PlayerObject * const requestPlayerObject = (requestCreatureObject ? PlayerCreatureController::getPlayerObject(requestCreatureObject) : NULL); + Client * const requestClient = (requestServerObject ? requestServerObject->getClient() : nullptr); + CreatureObject * const requestCreatureObject = (requestServerObject ? requestServerObject->asCreatureObject() : nullptr); + PlayerObject * const requestPlayerObject = (requestCreatureObject ? PlayerCreatureController::getPlayerObject(requestCreatureObject) : nullptr); if (requestCreatureObject && requestPlayerObject && requestClient) { @@ -210,10 +210,10 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking } // if "friend" is one of the search criteria, this will contain the requester's friends list - PlayerObject::StringVector const * requestPlayerObjectSortedLowercaseFriendList = NULL; + PlayerObject::StringVector const * requestPlayerObjectSortedLowercaseFriendList = nullptr; // if "cts_source_galaxy" is one of the search criteria, this will contain the requester's CTS source galaxy list - std::set const * requestPlayerObjectCtsSourceGalaxy = NULL; + std::set const * requestPlayerObjectCtsSourceGalaxy = nullptr; // if "in_same_guild" is one of the search criteria, this will contain the requester's guild abbrev bool inSameGuildSearch = false; @@ -224,7 +224,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking std::string requestPlayerObjectCitizenOfCity; // if "cts_source_galaxy" is one of the search criteria, this will contain the list of matching CTS source galaxy - std::vector * matchingCtsSourceGalaxy = NULL; + std::vector * matchingCtsSourceGalaxy = nullptr; // allows search of characters marked anonymous bool bypassAnonymous = false; @@ -271,7 +271,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking // special handling for "friend" search attribute if (iterLeafNode->second->name == "friend") { - if (requestPlayerObjectSortedLowercaseFriendList == NULL) + if (requestPlayerObjectSortedLowercaseFriendList == nullptr) { requestPlayerObjectSortedLowercaseFriendList = &(requestPlayerObject->getSortedLowercaseFriendList()); } @@ -284,7 +284,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking // special handling for "cts_source_galaxy" search attribute else if (iterLeafNode->second->name == "cts_source_galaxy") { - if (requestPlayerObjectCtsSourceGalaxy == NULL) + if (requestPlayerObjectCtsSourceGalaxy == nullptr) { std::map const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData(); std::map::const_iterator iterFindLfg = connectedCharacterLfgData.find(networkId); @@ -292,7 +292,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking requestPlayerObjectCtsSourceGalaxy = &(iterFindLfg->second.ctsSourceGalaxy); } - if (matchingCtsSourceGalaxy == NULL) + if (matchingCtsSourceGalaxy == nullptr) matchingCtsSourceGalaxy = new std::vector; LfgInternalAttributeMatchFunctionParams params; @@ -421,7 +421,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking } else { - ConsoleMgr::broadcastString("(NULL) (All)", requestClient); + ConsoleMgr::broadcastString("(nullptr) (All)", requestClient); } for (std::vector >::const_iterator iterSearchAttribute = iterAnyAllParentNode->second.begin(); iterSearchAttribute != iterAnyAllParentNode->second.end(); ++iterSearchAttribute) @@ -544,7 +544,7 @@ void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMaking if (lfgCharacterData.groupId.isValid() && (mmcr.m_matchingCharacterGroup.count(lfgCharacterData.groupId) == 0)) { ServerObject const * const soGroupObject = safe_cast(NetworkIdManager::getObjectById(lfgCharacterData.groupId)); - GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : NULL); + GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : nullptr); if (groupObject) { std::vector & groupInfo = mmcr.m_matchingCharacterGroup[lfgCharacterData.groupId]; diff --git a/engine/server/library/serverGame/src/shared/core/Client.cpp b/engine/server/library/serverGame/src/shared/core/Client.cpp index ab4e4e97..cdef65db 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.cpp +++ b/engine/server/library/serverGame/src/shared/core/Client.cpp @@ -263,8 +263,8 @@ Client::Client(ConnectionServerConnection & connection, const NetworkId & charac { // Don't ever put the character into a packed house ServerObject * const serverObject = containerObject->asServerObject(); - CellObject * const cellObject = (serverObject ? serverObject->asCellObject() : NULL); - BuildingObject * const buildingObject = (cellObject ? cellObject->getOwnerBuilding() : NULL); + CellObject * const cellObject = (serverObject ? serverObject->asCellObject() : nullptr); + BuildingObject * const buildingObject = (cellObject ? cellObject->getOwnerBuilding() : nullptr); if ((buildingObject) && (!buildingObject->isInWorld())) { @@ -713,8 +713,8 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*containedBy); ShipObject * const shipObject = ShipObject::getContainingShipObject(containedBy); - if ( (shipObject != NULL) - && (slottedContainer != NULL) + if ( (shipObject != nullptr) + && (slottedContainer != nullptr) && !shipObject->hasCondition(TangibleObject::C_docking)) { bool shotOk = false; @@ -958,7 +958,7 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) const ObjectMenuSelectMessage m (ri); ServerObject * const target = safe_cast(NetworkIdManager::getObjectById (m.getNetworkId())); GameScriptObject * const scriptObject = target ? target->getScriptObject() : 0; - Object * const targetContainedBy = target ? ContainerInterface::getContainedByObject(*target) : NULL; + Object * const targetContainedBy = target ? ContainerInterface::getContainedByObject(*target) : nullptr; const int menuType = m.getSelectedItemId(); static int examineMenuType = RadialMenuManager::getMenuTypeByName("EXAMINE"); @@ -1080,7 +1080,7 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) { // apply the controller message ServerController * controller = dynamic_cast(target->getController()); - if (controller != NULL) + if (controller != nullptr) { uint32 flags = o.getFlags(); flags &= ~GameControllerMessageFlags::SOURCE_REMOTE; @@ -1096,7 +1096,7 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) if (target) { ServerController * controller = dynamic_cast(target->getController()); - if (controller != NULL) + if (controller != nullptr) { uint32 flags = o.getFlags(); flags &= ~GameControllerMessageFlags::SOURCE_REMOTE; @@ -1315,11 +1315,11 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) { CreatureObject *creatureObject = dynamic_cast(getCharacterObject()); - if (creatureObject != NULL) + if (creatureObject != nullptr) { GameScriptObject *gameScriptObject = creatureObject->getScriptObject(); - if(gameScriptObject != NULL) + if(gameScriptObject != nullptr) { ScriptParams scriptParams; IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_STOMACH_UPDATE, scriptParams)); @@ -1964,7 +1964,7 @@ void Client::receiveClientMessage(const GameNetworkMessage & message) GenericValueTypeMessage > > const msgPlayTimeInfo(readIterator); PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(safe_cast(getCharacterObject())); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->setSessionPlayTimeInfo(msgPlayTimeInfo.getValue().first, msgPlayTimeInfo.getValue().second.first, msgPlayTimeInfo.getValue().second.second); } @@ -2222,7 +2222,7 @@ void Client::addObserving(ServerObject* o) { IGNORE_RETURN(m_observing.insert(o)); TangibleObject *to = o->asTangibleObject(); - if (to && PvpUpdateObserver::satisfyPvpSyncCondition(to->isNonPvpObject(), to->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (o->asCreatureObject() != NULL), to->getPvpFaction())) + if (to && PvpUpdateObserver::satisfyPvpSyncCondition(to->isNonPvpObject(), to->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (o->asCreatureObject() != nullptr), to->getPvpFaction())) addObservingPvpSync(to); } } diff --git a/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp index a0c10d82..ddf92605 100755 --- a/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp +++ b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp @@ -115,7 +115,7 @@ bool ClusterWideDataClient::handleMessage(const MessageDispatch::Emitter &, cons // locate the callback object ClusterWideDataClientNamespace::CallbackObjectIdList::iterator iter = ClusterWideDataClientNamespace::callbackObjectIdList.find(msg.getRequestId()); - ServerObject * object = NULL; + ServerObject * object = nullptr; if (iter != ClusterWideDataClientNamespace::callbackObjectIdList.end()) object = dynamic_cast(NetworkIdManager::getObjectById(iter->second)); diff --git a/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp b/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp index 3c0882b9..ed0b1ffd 100755 --- a/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp @@ -45,7 +45,7 @@ void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::ve AICreatureController const * const defenderAiCreatureController = AICreatureController::asAiCreatureController(defender->getController()); bool const defenderIsInWorldCell = defender->isInWorldCell(); - if (defenderAiCreatureController != NULL) + if (defenderAiCreatureController != nullptr) { ServerWorld::findObjectsInRange(defender->getPosition_w(), defenderAiCreatureController->getAssistRadius(), unfilteredViewers); @@ -54,7 +54,7 @@ void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::ve bool interested = true; ServerObject const * const serverObject = *i; - if ( (serverObject == NULL) + if ( (serverObject == nullptr) || (serverObject == defender) || serverObject->isPlayerControlled() || !serverObject->wantSawAttackTriggers()) @@ -65,7 +65,7 @@ void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::ve { TangibleObject const * const tangibleObject = serverObject->asTangibleObject(); - if (tangibleObject != NULL) + if (tangibleObject != nullptr) { if ( tangibleObject->isInCombat() || tangibleObject->isDisabled() @@ -77,7 +77,7 @@ void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::ve { CreatureObject const * const creatureObject = tangibleObject->asCreatureObject(); - if (creatureObject != NULL) + if (creatureObject != nullptr) { if ( creatureObject->isIncapacitated() || creatureObject->isDead()) @@ -88,7 +88,7 @@ void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::ve { AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController()); - if (aiCreatureController != NULL) + if (aiCreatureController != nullptr) { if (aiCreatureController->isRetreating()) { @@ -138,7 +138,7 @@ void CombatTracker::update() { TangibleObject const * const attackerTangibleObject = TangibleObject::asTangibleObject(iterAttackers->getObject()); - if (attackerTangibleObject != NULL) + if (attackerTangibleObject != nullptr) { localAttackers.push_back(attackerTangibleObject->getNetworkId()); } @@ -158,7 +158,7 @@ void CombatTracker::update() ServerObject * const combatViewer = *iterCombatViewers; GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(combatViewer); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(defender->getNetworkId()); diff --git a/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp b/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp index dc479216..cc7f46e5 100755 --- a/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp @@ -42,14 +42,14 @@ using namespace CommunityManagerNameSpace; //----------------------------------------------------------------------------- PlayerObject *CommunityManagerNameSpace::getPlayerObject(NetworkId const &networkId) { - PlayerObject *result = NULL; + PlayerObject *result = nullptr; Object *object = NetworkIdManager::getObjectById(networkId); - if (object != NULL) + if (object != nullptr) { CreatureObject *creatureObject = dynamic_cast(object); - if (creatureObject != NULL) + if (creatureObject != nullptr) { result = PlayerCreatureController::getPlayerObject(creatureObject); } @@ -61,10 +61,10 @@ PlayerObject *CommunityManagerNameSpace::getPlayerObject(NetworkId const &networ //----------------------------------------------------------------------------- ServerObject *CommunityManagerNameSpace::getServerObject(NetworkId const &networkId) { - ServerObject *result = NULL; + ServerObject *result = nullptr; Object *object = NetworkIdManager::getObjectById(networkId); - if (object != NULL) + if (object != nullptr) { result = dynamic_cast(object); } @@ -77,11 +77,11 @@ void CommunityManagerNameSpace::sendProseChatMessage(NetworkId const &networkId, { Object *object = NetworkIdManager::getObjectById(networkId); - if (object != NULL) + if (object != nullptr) { ServerObject *serverObject = dynamic_cast(object); - if (serverObject != NULL) + if (serverObject != nullptr) { ProsePackage prosePackage; prosePackage.stringId = stringId; @@ -117,7 +117,7 @@ void CommunityManager::handleMessage(ChatOnChangeFriendStatus const &message) PlayerObject *playerObject = getPlayerObject(message.getCharacter()); - if (playerObject != NULL) + if (playerObject != nullptr) { if (message.getAdd()) { @@ -170,7 +170,7 @@ void CommunityManager::handleMessage(ChatOnGetFriendsList const &message) PlayerObject *playerObject = getPlayerObject(message.getCharacter()); - if (playerObject != NULL) + if (playerObject != nullptr) { typedef std::vector StringVector; StringVector friendList; @@ -231,7 +231,7 @@ void CommunityManager::handleMessage(ChatOnChangeIgnoreStatus const &message) PlayerObject *playerObject = getPlayerObject(message.getCharacter()); - if (playerObject != NULL) + if (playerObject != nullptr) { if (message.getIgnore()) { @@ -284,7 +284,7 @@ void CommunityManager::handleMessage(ChatOnGetIgnoreList const &message) PlayerObject *playerObject = getPlayerObject(message.getCharacter()); - if (playerObject != NULL) + if (playerObject != nullptr) { typedef std::vector StringVector; StringVector ignoreList; diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp index cc5f64d9..03a9061f 100755 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp @@ -528,10 +528,10 @@ void ConfigServerGame::install(void) // GCW score decay time(s) data->gcwScoreDecayTime.clear(); int index = 0; - char const * dayOfWeek = NULL; - char const * hour = NULL; - char const * minute = NULL; - char const * second = NULL; + char const * dayOfWeek = nullptr; + char const * hour = nullptr; + char const * minute = nullptr; + char const * second = nullptr; do { dayOfWeek = ConfigFile::getKeyString("GameServer", "gcwScoreDecayTimeDayOfWeek", index, 0); diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h index 20465d94..0426f519 100755 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h @@ -87,7 +87,7 @@ class ConfigServerGame int scriptWatcherInterruptTime; // time in ms (after scriptWatcherWarnTime) before we abort a script int scriptStackErrorLimit; // depth of stack error we assume to be a legit error int scriptStackErrorLevel; // how we handle a stack error: 0=recover, 1=javacore, 2=fatal - bool disableObjvarNullCheck; // flag to disable the check for a null object when get/setting objvars + bool disableObjvarNullCheck; // flag to disable the check for a nullptr object when get/setting objvars // throttle to limit how universe data is sent from // the universe game server to the other game servers; diff --git a/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp b/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp index 2fa62423..fdd5c6f2 100755 --- a/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp +++ b/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp @@ -68,7 +68,7 @@ namespace ContainerInterfaceNamespace if (creature->getBank() == lastContainer) { - //-- if player is passed in non-null, the found creature must match it + //-- if player is passed in non-nullptr, the found creature must match it if (player && player != creature) return false; @@ -340,8 +340,8 @@ namespace ContainerInterfaceNamespace { // This item is not contained by anything! // This means it is in the world! - // Return null for the source container, but succeed. - sourceContainer = NULL; + // Return nullptr for the source container, but succeed. + sourceContainer = nullptr; return true; } @@ -550,7 +550,7 @@ bool ContainerInterface::canTransferTo(ServerObject *destination, ServerObject & if (transfererCreatureObject->getObjVars().getItem("lotOverlimit.structure_id", lotOverlimitStructure) && lotOverlimitStructure.isValid()) { // determine the destination type - ServerObject const * topmostDestinationParent = NULL; + ServerObject const * topmostDestinationParent = nullptr; ServerObject const * destinationParent = destination; while (destinationParent) { @@ -734,8 +734,8 @@ bool ContainerInterface::transferItemToSlottedContainer(ServerObject &destinatio } } - ServerObject *sourceObject = NULL; - Container *sourceContainer = NULL; + ServerObject *sourceObject = nullptr; + Container *sourceContainer = nullptr; if (!sharedTransferBegin(item, sourceObject, sourceContainer, error)) return false; @@ -829,8 +829,8 @@ bool ContainerInterface::transferItemToVolumeContainer(ServerObject &destination { error = Container::CEC_Success; - ServerObject *sourceObject = NULL; - Container *sourceContainer = NULL; + ServerObject *sourceObject = nullptr; + Container *sourceContainer = nullptr; if (!sharedTransferBegin(item, sourceObject, sourceContainer, error)) return false; @@ -898,8 +898,8 @@ bool ContainerInterface::transferItemToCell(ServerObject &destination, ServerObj { error = Container::CEC_Success; - ServerObject *sourceObject = NULL; - Container *sourceContainer = NULL; + ServerObject *sourceObject = nullptr; + Container *sourceContainer = nullptr; //check source & item if (!sharedTransferBegin(item, sourceObject, sourceContainer, error)) @@ -980,13 +980,13 @@ bool ContainerInterface::transferItemToWorld(ServerObject &item, Transform const return false; } - if (!canTransferTo(NULL, item, transferer, error)) + if (!canTransferTo(nullptr, item, transferer, error)) { return false; } - ServerObject *sourceObject = NULL; - Container *sourceContainer = NULL; + ServerObject *sourceObject = nullptr; + Container *sourceContainer = nullptr; if (!sharedTransferBegin(item, sourceObject, sourceContainer, error)) { @@ -1009,8 +1009,8 @@ bool ContainerInterface::transferItemToWorld(ServerObject &item, Transform const item.setTransform_o2p(pos); - item.onContainerTransferComplete(sourceObject, NULL); - handleTransferScripts(item, sourceObject, NULL, transferer, error); + item.onContainerTransferComplete(sourceObject, nullptr); + handleTransferScripts(item, sourceObject, nullptr, transferer, error); return true; } @@ -1084,7 +1084,7 @@ Object *ContainerInterface::getContainedByObject(Object &obj) ContainedByProperty * const containedBy = getContainedByProperty(obj); if (containedBy) return containedBy->getContainedBy(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1094,7 +1094,7 @@ Object const *ContainerInterface::getContainedByObject(Object const &obj) ContainedByProperty const * const containedBy = getContainedByProperty(obj); if (containedBy) return containedBy->getContainedBy(); - return NULL; + return nullptr; } // ----------------------------------------------------------------------- @@ -1180,7 +1180,7 @@ Object const *ContainerInterface::getTopmostContainer(Object const &obj) // ----------------------------------------------------------------------- // Returns the object if it is in the world, or the first parent of the object -// that is in the world. This returns null, if the none of the parents of the object are in the world. +// that is in the world. This returns nullptr, if the none of the parents of the object are in the world. Object *ContainerInterface::getFirstParentInWorld(Object &obj) { @@ -1193,20 +1193,20 @@ Object *ContainerInterface::getFirstParentInWorld(Object &obj) if (!containedBy) { WARNING_STRICT_FATAL(true, ("All objects should have a containedby property")); - return NULL; + return nullptr; } // Is my containedBy property empty? If so I am topmost but am not in the world Object *currentContainer = containedBy->getContainedBy(); if (!currentContainer) { - return NULL; + return nullptr; } - // Does my parent expose contents? If it does, then return NULL since I have been removed from the world. + // Does my parent expose contents? If it does, then return nullptr since I have been removed from the world. if (!getContainer(*currentContainer) || getContainer(*currentContainer)->isContentItemExposedWith(*currentContainer)) { - return NULL; + return nullptr; } // Is my parent in the world? If so, he is topmost @@ -1218,7 +1218,7 @@ Object *ContainerInterface::getFirstParentInWorld(Object &obj) if (!containedBy) { WARNING_STRICT_FATAL(true, ("All objects should have a containedby property")); - return (currentContainer->isInWorld()) ? currentContainer : NULL; + return (currentContainer->isInWorld()) ? currentContainer : nullptr; } // Iterate from here. @@ -1236,12 +1236,12 @@ Object *ContainerInterface::getFirstParentInWorld(Object &obj) if (!containedBy) { WARNING_STRICT_FATAL(true, ("All objects should have a containedby property")); - return NULL; + return nullptr; } nextContainer = containedBy->getContainedBy(); } - return currentContainer->isInWorld() ? currentContainer : NULL; + return currentContainer->isInWorld() ? currentContainer : nullptr; } // ----------------------------------------------------------------------- @@ -1388,7 +1388,7 @@ bool ContainerInterface::onObjectDestroy(ServerObject& item) // currently only c return false; } - handleTransferScripts(item, parentObject, NULL, NULL, error); + handleTransferScripts(item, parentObject, nullptr, nullptr, error); } } return true; diff --git a/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp index 5a1c4b15..7fc312fa 100755 --- a/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp @@ -101,7 +101,7 @@ void FormManagerServer::handleCreateObjectData(NetworkId const & actor, std::str Transform tr; tr.setPosition_p(position); ServerObject * const newObject = ServerWorld::createNewObject(crc, tr, cell, false); - if (newObject == NULL) + if (newObject == nullptr) return; if (cellId == NetworkId::cms_invalid) @@ -114,7 +114,7 @@ void FormManagerServer::handleCreateObjectData(NetworkId const & actor, std::str { //tell script to create the object in it's own special manner (since the datatable requests that) Object * const obj = NetworkIdManager::getObjectById(actor); - ServerObject * const serverObj = obj ? obj->asServerObject() : NULL; + ServerObject * const serverObj = obj ? obj->asServerObject() : nullptr; if(serverObj) { std::vector keys; @@ -151,11 +151,11 @@ void FormManagerServer::handleEditObjectData(NetworkId const & actor, NetworkId return; Object * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; + ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; if(actorServerObj) { Object * const objectToEditObj = NetworkIdManager::getObjectById(objectToEdit); - ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : NULL; + ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : nullptr; if(objectToEditServerObj) { //get matching form @@ -207,11 +207,11 @@ void FormManagerServer::handleEditObjectData(NetworkId const & actor, NetworkId void FormManagerServer::requestEditObjectDataForClient(NetworkId const & actor, NetworkId const & objectToEdit) { Object * const actorObj = NetworkIdManager::getObjectById(actor); - ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL; + ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : nullptr; if(actorServerObj) { Object * const objectToEditObj = NetworkIdManager::getObjectById(objectToEdit); - ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : NULL; + ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : nullptr; if(objectToEditServerObj) { //get matching form @@ -277,8 +277,8 @@ void FormManagerServer::sendEditObjectDataToClient(NetworkId const & client, Net return; Object * const playerObject = NetworkIdManager::getObjectById(client); - ServerObject * const playerServer = playerObject ? playerObject->asServerObject() : NULL; - CreatureObject * const playerCreature = playerServer ? playerServer->asCreatureObject() : NULL; + ServerObject * const playerServer = playerObject ? playerObject->asServerObject() : nullptr; + CreatureObject * const playerCreature = playerServer ? playerServer->asCreatureObject() : nullptr; if(playerCreature) { diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index 865b1078..30af19ef 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -317,11 +317,11 @@ namespace GameServerNamespace bool getConfigSetting(const char *section, const char *key, int & value) { const ConfigFile::Section * sec = ConfigFile::getSection(section); - if (sec == NULL) + if (sec == nullptr) return false; const ConfigFile::Key * ky = sec->findKey(key); - if (ky == NULL) + if (ky == nullptr) return false; value = ky->getAsInt(ky->getCount()-1, value); @@ -753,7 +753,7 @@ Client * GameServer::getClient(const NetworkId& networkId) { return i->second; } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -837,7 +837,7 @@ void GameServer::loadTerrain () terrainObject->setDebugName("terrain"); Appearance * const appearance = AppearanceTemplateList::createAppearance(terrainFileName); - if (appearance != NULL) { + if (appearance != nullptr) { terrainObject->setAppearance(appearance); } else { DEBUG_WARNING(true, ("FIX ME: Appearance template for GameServer::loadTerrain missing for %s.", terrainFileName)); @@ -866,7 +866,7 @@ void GameServer::shutdown() m_centralService = 0; m_planetServerConnection = 0; - if (m_customerServiceServerConnection != NULL) + if (m_customerServiceServerConnection != nullptr) { m_customerServiceServerConnection->disconnect(); } @@ -909,7 +909,7 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M DEBUG_REPORT_LOG(true, ("GameServer: Creating customer service server connection @ (%s:%d)\n", address.getValue().first.c_str(), address.getValue().second)); - if (m_customerServiceServerConnection != NULL) + if (m_customerServiceServerConnection != nullptr) { m_customerServiceServerConnection->disconnect(); } @@ -949,7 +949,7 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M std::vector const & baselines = m.getData(); - ServerObject * lastObject = NULL; + ServerObject * lastObject = nullptr; for (std::vector::const_iterator i=baselines.begin(); i!=baselines.end(); ++i) { @@ -1286,7 +1286,7 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M if (topmostContainer != object) { - WARNING(true, ("Denying authority transfer for (%s) from game server (%lu) to game server (%lu) because it is contained by (%s)", object->getDebugInformation().c_str(), GameServer::getInstance().getProcessId(), t.getProcess(), (topmostContainer ? topmostContainer->getDebugInformation().c_str() : "NULL"))); + WARNING(true, ("Denying authority transfer for (%s) from game server (%lu) to game server (%lu) because it is contained by (%s)", object->getDebugInformation().c_str(), GameServer::getInstance().getProcessId(), t.getProcess(), (topmostContainer ? topmostContainer->getDebugInformation().c_str() : "nullptr"))); allowed = false; @@ -1425,11 +1425,11 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M bool appended = false; ServerObject * const target = safe_cast(NetworkIdManager::getObjectById(c.getNetworkId())); - if (target != NULL) + if (target != nullptr) { // valid target, get its controller ServerController * const controller = safe_cast(target->getController()); - if (controller != NULL) + if (controller != nullptr) { uint32 flags = c.getFlags(); if(flags & GameControllerMessageFlags::DEST_AUTH_SERVER) @@ -1473,7 +1473,7 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M ri = static_cast(message).getByteStream().begin(); EndBaselinesMessage const t(ri); ServerObject * const object = ServerWorld::findUninitializedObjectByNetworkId(t.getId()); - if (object != NULL) + if (object != nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Received EndBaselinesMessage for %s\n", t.getId().getValueString().c_str())); ServerController * const controller = dynamic_cast(object->getController()); @@ -1778,7 +1778,7 @@ void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const M } else { - LOG("mounts-bug", ("GS::SceneTransferMessage: server id=[%d],rider id=[%s] has RidingMount state but getMountedCreature() returns NULL.", static_cast(getProcessId()), obj->getNetworkId().getValueString().c_str())); + LOG("mounts-bug", ("GS::SceneTransferMessage: server id=[%d],rider id=[%s] has RidingMount state but getMountedCreature() returns nullptr.", static_cast(getProcessId()), obj->getNetworkId().getValueString().c_str())); objAsCreature->emergencyDismountForRider(); } } @@ -2297,7 +2297,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const if (creatureObj->isAuthoritative()) { AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObj->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { continue; } @@ -2359,7 +2359,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const #endif std::string time = FormattedString<1024>().sprintf("(%3d,%5dms) %30s.%-2lu (%3lu) on %35s:%-7d (%lu) ", ObjectTracker::getNumPlayers(), static_cast(Clock::frameTime()*1000), ServerWorld::getSceneId().c_str(), m_preloadAreaId, m_processId, hostName.c_str(), Os::getProcessId(), ServerClock::getInstance().getGameTimeSeconds()); - time += CalendarTime::convertEpochToTimeStringGMT(::time(NULL)); + time += CalendarTime::convertEpochToTimeStringGMT(::time(nullptr)); GenericValueTypeMessage > > rsctr( "ReportSystemClockTimeResponse", std::make_pair(msg.getValue().first, std::make_pair(time, msg.getValue().second))); @@ -2378,7 +2378,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const ri = static_cast(message).getByteStream().begin(); GenericValueTypeMessage > const msg(ri); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); std::string time = FormattedString<1024>().sprintf("%30s.%-2lu (%3lu) (%lu) (%ld, ", ServerWorld::getSceneId().c_str(), m_preloadAreaId, m_processId, ServerClock::getInstance().getGameTimeSeconds(), timeNow); time += CalendarTime::convertEpochToTimeStringGMT(timeNow); time += ")"; @@ -2404,7 +2404,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const } else { - time += " (terrainObject is NULL)"; + time += " (terrainObject is nullptr)"; } GenericValueTypeMessage > > rptr( @@ -2596,7 +2596,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const bool removeCurrentCitizenDeleted; bool removeCurrentCitizenInactive; bool hasDeclaredResidence; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); bool const citizenInactivePackupActive = (ConfigServerGame::getCityCitizenshipInactivePackupStartTimeEpoch() <= timeNow); std::map, CitizenInfo> const & allCitizens = CityInterface::getAllCitizensInfo(); for (std::map >::iterator iterCityId = s_clusterStartupResidenceStructureListByCity.begin(); iterCityId != s_clusterStartupResidenceStructureListByCity.end(); ++iterCityId) @@ -2614,7 +2614,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const if (currentCityMayor.isValid()) currentCityMayorCitizenInfo = CityInterface::getCitizenInfo(iterCityId->first, currentCityMayor); else - currentCityMayorCitizenInfo = NULL; + currentCityMayorCitizenInfo = nullptr; if (currentCityMayorCitizenInfo) currentCityMayorName = currentCityMayorCitizenInfo->m_citizenName; @@ -2958,7 +2958,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const ScriptDictionaryPtr dictionary; responseObject->getScriptObject()->makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(responseObject->getNetworkId(), "foundObject", dictionary->getSerializedData(), 0, false); @@ -3140,11 +3140,11 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject != NULL) + if (creatureObject != nullptr) { Controller * const controller = creatureObject->getController(); - if (controller != NULL) + if (controller != nullptr) { DEBUG_LOG("debug_ai", ("GameServer::receiveMessage() Received AiCreatureStateMessage for networkId(%s) movementType(%s)", networkId.getValueString().c_str(), AiMovementBase::getMovementString(movement.getMovementType()))); @@ -3211,7 +3211,7 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const Archive::ReadIterator ri = static_cast(message).getByteStream().begin(); PlayedTimeAccumMessage const ptam(ri); Object * obj = NetworkIdManager::getObjectById(ptam.getNetworkId()); - if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asCreatureObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr && obj->asServerObject()->asCreatureObject() != nullptr) { CreatureObject * target = obj->asServerObject()->asCreatureObject(); PlayerObject *targetPlayer = target->asPlayerObject(); @@ -3260,13 +3260,13 @@ void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const // get the attacker Object * obj = NetworkIdManager::getObjectById(msg.getSource()); - if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asCreatureObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr && obj->asServerObject()->asCreatureObject() != nullptr) { CreatureObject * attacker = obj->asServerObject()->asCreatureObject(); // get the target obj = NetworkIdManager::getObjectById(msg.getTarget()); - if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asTangibleObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr && obj->asServerObject()->asTangibleObject() != nullptr) { TangibleObject * defender = obj->asServerObject()->asTangibleObject(); if (attacker->isAuthoritative()) @@ -3597,7 +3597,7 @@ bool GameServer::isPlanetEnabledForCluster(std::string const &sceneName) const void GameServerNamespace::broadCastHyperspaceOnWarp(ServerObject const * const owner) { - // warpingClient can be NULL if the owner is AI + // warpingClient can be nullptr if the owner is AI Client const * const warpingClient = owner->getClient(); typedef std::map > DistributionList; @@ -4098,13 +4098,13 @@ void GameServer::sendToConnectionServers(GameNetworkMessage const &message) void GameServer::sendToCustomerServiceServer(GameNetworkMessage const &message) { - if (m_customerServiceServerConnection != NULL) + if (m_customerServiceServerConnection != nullptr) { m_customerServiceServerConnection->send(message, true); } else { - REPORT_LOG(true, ("GameServer::sendToCustomerServiceServer() ERROR: Unable to send to NULL customer service server connection\n")); + REPORT_LOG(true, ("GameServer::sendToCustomerServiceServer() ERROR: Unable to send to nullptr customer service server connection\n")); } } @@ -4112,12 +4112,12 @@ void GameServer::sendToCustomerServiceServer(GameNetworkMessage const &message) void GameServer::clearCustomerServiceServerConnection() { - if (m_customerServiceServerConnection != NULL) + if (m_customerServiceServerConnection != nullptr) { m_customerServiceServerConnection->disconnect(); } - m_customerServiceServerConnection = NULL; + m_customerServiceServerConnection = nullptr; } // ---------------------------------------------------------------------- @@ -4600,7 +4600,7 @@ void GameServer::handleCharacterCreateNameVerification(const VerifyNameResponse { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); Object* appearanceInventory = itemId.getObject(); - if(appearanceInventory == NULL) + if(appearanceInventory == nullptr) { WARNING(true, ("Player %s has lost their appearance inventory", newCharacterObject->getNetworkId().getValueString().c_str())); appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *newCharacterObject, slot, false); @@ -4663,7 +4663,7 @@ void GameServer::handleVerifyAndLockNameVerification(const VerifyNameResponse &v params.addParam(errorText.c_str(), "reason"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(vrn.getCharacterId(), "renameCharacterNameValidationFail", dictionary->getSerializedData(), 0, false); @@ -4943,7 +4943,7 @@ bool GameServer::addPendingLoadRequest(NetworkId const & id) if (s_pendingLoadRequests.find(id) != s_pendingLoadRequests.end()) return false; - s_pendingLoadRequests[id] = (unsigned int)::time(NULL); + s_pendingLoadRequests[id] = (unsigned int)::time(nullptr); return true; } @@ -5113,11 +5113,11 @@ void GameServerNamespace::loadRetroactiveCtsHistory() { int index = 0; - char const * pszCtsDataFromConfig = NULL; + char const * pszCtsDataFromConfig = nullptr; do { - pszCtsDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactiveCtsHistory", index++, NULL); - if (pszCtsDataFromConfig != NULL) + pszCtsDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactiveCtsHistory", index++, nullptr); + if (pszCtsDataFromConfig != nullptr) { ctsDataFromConfig.push_back(pszCtsDataFromConfig); } @@ -5196,7 +5196,7 @@ void GameServerNamespace::loadRetroactiveCtsHistory() else { ctsDataFromConfigTokens.clear(); - if ((Unicode::tokenize(Unicode::narrowToWide(*iterCtsDataFromConfig), ctsDataFromConfigTokens, &ctsDataFromConfigDelimiter, NULL)) && (ctsDataFromConfigTokens.size() == 7)) + if ((Unicode::tokenize(Unicode::narrowToWide(*iterCtsDataFromConfig), ctsDataFromConfigTokens, &ctsDataFromConfigDelimiter, nullptr)) && (ctsDataFromConfigTokens.size() == 7)) { // sanity check ctsDataFromConfigParsedData = FormattedString<2048>().sprintf("%s|%s|%s|%s|%s|%s|%s", Unicode::wideToNarrow(ctsDataFromConfigTokens[0]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[1]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[2]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[3]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[4]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[5]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[6]).c_str()); @@ -5225,7 +5225,7 @@ void GameServerNamespace::loadRetroactiveCtsHistory() FATAL(((sourceCharacterInfo.sourceCharacterBornDate > 0) && (sourceCharacterInfo.sourceCharacterBornDate < 907)), ("source character (%s, %s) has born date (%d) < 907", sourceCharacterInfo.sourceCluster.c_str(), sourceCharacterInfo.sourceCharacterId.getValueString().c_str(), sourceCharacterInfo.sourceCharacterBornDate)); FATAL((sourceCharacterInfo.sourceCharacterBornDate > currentBornDate), ("source character (%s, %s) has born date (%d) > current born date (%d)", sourceCharacterInfo.sourceCluster.c_str(), sourceCharacterInfo.sourceCharacterId.getValueString().c_str(), sourceCharacterInfo.sourceCharacterBornDate, currentBornDate)); - std::map > * clusterCtsHistory = NULL; + std::map > * clusterCtsHistory = nullptr; #ifdef _DEBUG IGNORE_RETURN(allCtsSourceCluster.insert(sourceCharacterInfo.sourceCluster)); clusterCtsHistory = &(s_retroactiveCtsHistoryList[targetCluster]); @@ -5381,11 +5381,11 @@ void GameServerNamespace::loadRetroactivePlayerCityCreationTime() { int index = 0; - char const * pszPlayerCityCreationTimeDataFromConfig = NULL; + char const * pszPlayerCityCreationTimeDataFromConfig = nullptr; do { - pszPlayerCityCreationTimeDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactivePlayerCityCreationTime", index++, NULL); - if (pszPlayerCityCreationTimeDataFromConfig != NULL) + pszPlayerCityCreationTimeDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactivePlayerCityCreationTime", index++, nullptr); + if (pszPlayerCityCreationTimeDataFromConfig != nullptr) { playerCityCreationTimeDataFromConfig.push_back(pszPlayerCityCreationTimeDataFromConfig); } @@ -5427,7 +5427,7 @@ void GameServerNamespace::loadRetroactivePlayerCityCreationTime() else { playerCityCreationTimeDataFromConfigTokens.clear(); - if ((Unicode::tokenize(Unicode::narrowToWide(*iterPlayerCityCreationTimeDataFromConfig), playerCityCreationTimeDataFromConfigTokens, &playerCityCreationTimeDataFromConfigDelimiter, NULL)) && (playerCityCreationTimeDataFromConfigTokens.size() == 3)) + if ((Unicode::tokenize(Unicode::narrowToWide(*iterPlayerCityCreationTimeDataFromConfig), playerCityCreationTimeDataFromConfigTokens, &playerCityCreationTimeDataFromConfigDelimiter, nullptr)) && (playerCityCreationTimeDataFromConfigTokens.size() == 3)) { // sanity check playerCityCreationTimeDataFromConfigParsedData = FormattedString<2048>().sprintf("%s|%s|%s", Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[0]).c_str(), Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[1]).c_str(), Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[2]).c_str()); @@ -5449,7 +5449,7 @@ void GameServerNamespace::loadRetroactivePlayerCityCreationTime() ++iterPlayerCityCreationTimeDataFromConfig; } - std::map * clusterPlayerCityCreationTimeHistory = NULL; + std::map * clusterPlayerCityCreationTimeHistory = nullptr; #ifdef _DEBUG clusterPlayerCityCreationTimeHistory = &(s_retroactivePlayerCityCreationTime[cluster]); #else @@ -5475,7 +5475,7 @@ void GameServerNamespace::loadRetroactivePlayerCityCreationTime() bool GameServerNamespace::checkAndSetOutstandingRequestSceneTransfer(ServerObject & object) { - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); // don't send multiple RequestSceneTransfer message if (object.getObjVars().hasItem(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER) && (object.getObjVars().getType(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER) == DynamicVariable::INT)) @@ -5846,7 +5846,7 @@ void GameServerNamespace::handleAccountFeatureIdResponse(AccountFeatureIdRespons std::string GameServer::getRetroactiveCtsHistory(std::string const & clusterName, NetworkId const & characterId) { std::string result; - std::map > const * clusterCtsHistory = NULL; + std::map > const * clusterCtsHistory = nullptr; #ifdef _DEBUG std::map > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(clusterName); @@ -5901,7 +5901,7 @@ void GameServer::setRetroactiveCtsHistory(CreatureObject & player) if (!playerObject->isAuthoritative()) return; - std::map > const * clusterCtsHistory = NULL; + std::map > const * clusterCtsHistory = nullptr; #ifdef _DEBUG std::map > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(GameServer::getInstance().getClusterName()); @@ -5990,7 +5990,7 @@ std::vector > const *> const static std::vector > const *> returnValue; returnValue.clear(); - std::map > const * clusterCtsHistory = NULL; + std::map > const * clusterCtsHistory = nullptr; #ifdef _DEBUG std::map > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(GameServer::getInstance().getClusterName()); @@ -6028,7 +6028,7 @@ std::vector > const *> const time_t GameServer::getRetroactivePlayerCityCreationTime(std::string const & clusterName, int cityId) { - std::map const * clusterPlayerCityCreationTimeHistory = NULL; + std::map const * clusterPlayerCityCreationTimeHistory = nullptr; #ifdef _DEBUG std::map >::const_iterator const iterFindCluster = s_retroactivePlayerCityCreationTime.find(clusterName); diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.h b/engine/server/library/serverGame/src/shared/core/GameServer.h index c3036761..2723090a 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.h +++ b/engine/server/library/serverGame/src/shared/core/GameServer.h @@ -92,10 +92,10 @@ public: uint32 getProcessId () const; uint32 getPreloadAreaId () const; virtual void receiveMessage (const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message); - bool requestSceneWarp (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, const char * scriptCallback = NULL, bool forceLoadScreen = false); - bool requestSceneWarp (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, const char * scriptCallback = NULL, bool forceLoadScreen = false); - bool requestSceneWarpDelayed (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, float delayTime, const char * scriptCallback = NULL, bool forceLoadScreen = false); - bool requestSceneWarpDelayed (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, float delayTime, const char * scriptCallback = NULL, bool forceLoadScreen = false); + bool requestSceneWarp (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, const char * scriptCallback = nullptr, bool forceLoadScreen = false); + bool requestSceneWarp (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, const char * scriptCallback = nullptr, bool forceLoadScreen = false); + bool requestSceneWarpDelayed (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, float delayTime, const char * scriptCallback = nullptr, bool forceLoadScreen = false); + bool requestSceneWarpDelayed (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, float delayTime, const char * scriptCallback = nullptr, bool forceLoadScreen = false); static void run (); void sendToCentralServer (GameNetworkMessage const &message); diff --git a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp index a96e6cfa..4e645492 100755 --- a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp +++ b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp @@ -20,7 +20,7 @@ // ====================================================================== -InstantDeleteList::ListType *InstantDeleteList::ms_theList = NULL; +InstantDeleteList::ListType *InstantDeleteList::ms_theList = nullptr; // ====================================================================== @@ -47,7 +47,7 @@ void InstantDeleteList::install() void InstantDeleteList::remove() { delete ms_theList; - ms_theList = NULL; + ms_theList = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp index 77454c88..5d49ac3a 100755 --- a/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp @@ -87,7 +87,7 @@ void LogoutTracker::add(NetworkId const &networkId) } // set the callback - getScheduler().setCallback(handleLogoutCallback, NULL, ConfigServerGame::getUnsafeLogoutTimeMs()); + getScheduler().setCallback(handleLogoutCallback, nullptr, ConfigServerGame::getUnsafeLogoutTimeMs()); } // ---------------------------------------------------------------------- @@ -223,7 +223,7 @@ ServerObject *LogoutTracker::findPendingCharacterSave(const NetworkId &character return obj; } else - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp index 005a6260..847b6ff6 100755 --- a/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp +++ b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp @@ -88,7 +88,7 @@ namespace MessageToQueueNamespace typedef std::set SchedulerItemsType; typedef std::vector FrameMessagesType; - MessageToQueue * ms_instance=NULL; + MessageToQueue * ms_instance=nullptr; LastKnownLocationsType ms_lastKnownLocations; ObjectLocatorsType ms_objectLocators; SchedulerItemsType ms_schedulerItems; @@ -134,7 +134,7 @@ void MessageToQueue::install() void MessageToQueue::remove() { delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 6366130f..65453d39 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -27,7 +27,7 @@ // ====================================================================== -NameManager *NameManager::ms_instance = NULL; +NameManager *NameManager::ms_instance = nullptr; // ====================================================================== @@ -45,14 +45,14 @@ void NameManager::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- NameManager::NameManager() : m_nameGenerators (new NameGeneratorMapType), - m_reservedNames (NULL), + m_reservedNames (nullptr), m_nameToIdMap (new NameToIdMapType), m_idToCharacterDataMap(new IdToCharacterDataMapType) { @@ -72,20 +72,20 @@ NameManager::~NameManager() delete i->second; } delete m_nameGenerators; - m_nameGenerators = NULL; + m_nameGenerators = nullptr; delete m_reservedNames; - m_reservedNames = NULL; + m_reservedNames = nullptr; delete m_nameToIdMap; - m_nameToIdMap = NULL; + m_nameToIdMap = nullptr; delete m_idToCharacterDataMap; - m_idToCharacterDataMap = NULL; + m_idToCharacterDataMap = nullptr; } // ---------------------------------------------------------------------- const NameGenerator & NameManager::getNameGenerator(const std::string &directory, const std::string &nameTable) const { - NameGenerator *generator=NULL; + NameGenerator *generator=nullptr; NOT_NULL(m_nameGenerators); NameGeneratorMapType::const_iterator i=m_nameGenerators->find(NameTableIdentifier(directory,nameTable)); if (i==m_nameGenerators->end()) @@ -204,7 +204,7 @@ void NameManager::addPlayer(const NetworkId &id, uint32 stationId, const std::st { createTime = static_cast(getPlayerCreateTime(id)); if (createTime <= 0) - createTime = ::time(NULL); + createTime = ::time(nullptr); } characterData.createTime = createTime; @@ -212,7 +212,7 @@ void NameManager::addPlayer(const NetworkId &id, uint32 stationId, const std::st { lastLoginTime = static_cast(getPlayerLastLoginTime(id)); if (lastLoginTime <= 0) - lastLoginTime = ::time(NULL); + lastLoginTime = ::time(nullptr); } characterData.lastLoginTime = lastLoginTime; @@ -382,7 +382,7 @@ void NameManager::getPlayerWithLastLoginTimeAfterDistribution(std::map >::iterator iter = result.begin(); iter != result.end(); ++iter) iter->second.second = 0; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i) { int const lastLoginTimeSecondsAgo = std::max(static_cast(0), static_cast(timeNow - static_cast(i->second.lastLoginTime))); @@ -439,7 +439,7 @@ void NameManager::getPlayerWithCreateTimeAfterDistribution(std::map >::iterator iter = result.begin(); iter != result.end(); ++iter) iter->second.second = 0; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i) { int const createTimeSecondsAgo = std::max(static_cast(0), static_cast(timeNow - static_cast(i->second.createTime))); diff --git a/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp index 4388ad2a..98fdebc8 100755 --- a/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp +++ b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp @@ -257,10 +257,10 @@ void NewbieTutorial::getNonFreeObjectsForDeletion(const Container* const contain { const CachedNetworkId & itemId = *i; ServerObject * item = safe_cast(itemId.getObject()); - if (item != NULL) + if (item != nullptr) { TangibleObject *itemTangible = item->asTangibleObject(); - if (itemTangible != NULL) + if (itemTangible != nullptr) { const char *templateName = itemTangible->getSharedTemplateName(); if (!FileManifest::contains(templateName)) @@ -273,7 +273,7 @@ void NewbieTutorial::getNonFreeObjectsForDeletion(const Container* const contain { // see if the item is a container and go through its contents const Container * const itemContainer = ContainerInterface::getContainer(*item); - if (itemContainer != NULL) + if (itemContainer != nullptr) getNonFreeObjectsForDeletion(itemContainer, objectsToDelete, character); } } diff --git a/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp b/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp index bc457bbd..e3c56b3e 100755 --- a/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp +++ b/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp @@ -81,7 +81,7 @@ NpcConversation::NpcConversation(TangibleObject & player, TangibleObject & npc, NpcConversation::~NpcConversation() { TangibleObject * const player = safe_cast(m_player.getObject()); - if (player != NULL) + if (player != nullptr) { MessageQueueStopNpcConversation * const message = new MessageQueueStopNpcConversation; @@ -110,13 +110,13 @@ void NpcConversation::sendMessage(const Response & npcMessage, const Unicode::St TangibleObject * const player = safe_cast(m_player.getObject()); TangibleObject * const npc = safe_cast(m_npc.getObject()); - if (player == NULL) + if (player == nullptr) { - if (npc != NULL) + if (npc != nullptr) npc->removeConversation(m_player); return; } - if (npc == NULL) + if (npc == nullptr) { player->endNpcConversation(); return; @@ -216,13 +216,13 @@ void NpcConversation::sendResponses() const int count = static_cast(m_responses->size()); - if (player == NULL) + if (player == nullptr) { - if (npc != NULL) + if (npc != nullptr) npc->removeConversation(m_player); return; } - if (npc == NULL) + if (npc == nullptr) { player->endNpcConversation(); return; diff --git a/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp b/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp index 78fe2d74..95bc6594 100755 --- a/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp @@ -353,14 +353,14 @@ void ObserveTracker::onObjectContainerChanged(ServerObject &obj) bool isObservedWith = (newContainer->getContainerProperty() ? newContainer->getContainerProperty()->isContentItemObservedWith(obj) : false); CellProperty * newContainerCell = newContainer->getCellProperty(); ServerObject const * newContainerContainer = safe_cast(ContainerInterface::getContainedByObject(*newContainer)); - if (newContainerCell == NULL || newContainerContainer != NULL) + if (newContainerCell == nullptr || newContainerContainer != nullptr) { std::set const &newObservers = newContainer->getObservers(); for (std::set::const_iterator i = newObservers.begin(); i != newObservers.end(); ++i) { if (isObservedWith || (*i)->getOpenedContainers().count(newContainer) || - (newContainerCell != NULL && shouldObserveCellContentsDueToClientContainmentChain(**i, *newContainerContainer))) + (newContainerCell != nullptr && shouldObserveCellContentsDueToClientContainmentChain(**i, *newContainerContainer))) { IGNORE_RETURN(observe(**i, obj)); } diff --git a/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp index 9b2d5d2e..62cc2fb3 100755 --- a/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp @@ -122,7 +122,7 @@ bool PlayerCreationManagerServer::setupPlayer(CreatureObject & obj, const std::s else { //Attach insurance variables here: - if (item->asTangibleObject() != NULL) + if (item->asTangibleObject() != nullptr) item->asTangibleObject()->setUninsurable(true); } } @@ -204,7 +204,7 @@ bool PlayerCreationManagerServer::setupPlayer(CreatureObject & obj, const std::s for (size_t i = 0; i < numSkills; ++i) { const SkillObject * skill = SkillManager::getInstance().getSkill(bounty_skills[i]); - if (skill != NULL) + if (skill != nullptr) obj.grantSkill(*skill); } } diff --git a/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp index 5d95b59b..a28ee96b 100755 --- a/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp @@ -122,7 +122,7 @@ bool PositionUpdateTracker::shouldSendPositionUpdate(ServerObject const &obj) return false; ServerObject const *containedByObj = safe_cast(ContainerInterface::getContainedByObject(obj)); - CreatureObject const *creatureContainer = (containedByObj ? containedByObj->asCreatureObject() : NULL); + CreatureObject const *creatureContainer = (containedByObj ? containedByObj->asCreatureObject() : nullptr); bool const objectIsRidingMount = (creatureContainer && creatureContainer->isMountable()); if (containedByObj && !isContainerConsideredPersisted(obj, *containedByObj) && !objectIsRidingMount) @@ -204,7 +204,7 @@ void PositionUpdateTracker::sendPositionUpdate(ServerObject &obj) else { ServerObject const * const container = safe_cast(ContainerInterface::getContainedByObject(obj)); - CreatureObject const * const creatureContainer = (container ? container->asCreatureObject() : NULL); + CreatureObject const * const creatureContainer = (container ? container->asCreatureObject() : nullptr); if (creatureContainer && creatureContainer->isMountable()) { // Riders of mounts persist at the location of the mount diff --git a/engine/server/library/serverGame/src/shared/core/RegexList.cpp b/engine/server/library/serverGame/src/shared/core/RegexList.cpp index 5244818e..29c7ae32 100755 --- a/engine/server/library/serverGame/src/shared/core/RegexList.cpp +++ b/engine/server/library/serverGame/src/shared/core/RegexList.cpp @@ -55,7 +55,7 @@ RegexList::Entry::Entry(char const *pattern, bool matchWords, char const *reason char const *errorString = 0; int errorOffset = 0; - m_pcre = pcre_compile(pattern, 0, &errorString, &errorOffset, NULL); + m_pcre = pcre_compile(pattern, 0, &errorString, &errorOffset, nullptr); WARNING(!m_pcre, ("failed to compile regex pattern [%s] into a pcre regex.", pattern)); } @@ -175,7 +175,7 @@ bool RegexList::doesStringMatch(const Unicode::String &name, std::string &ruleDe std::vector::iterator nameIter; for (nameIter = names.begin(); nameIter != names.end(); ++nameIter) { - int const returnCode = pcre_exec(compiledRegex, NULL, nameIter->c_str(), nameIter->length(), 0, 0, captureData, dataElementCount); + int const returnCode = pcre_exec(compiledRegex, nullptr, nameIter->c_str(), nameIter->length(), 0, 0, captureData, dataElementCount); if (returnCode >= 0) { ruleDescription = entry->getReason(); @@ -187,7 +187,7 @@ bool RegexList::doesStringMatch(const Unicode::String &name, std::string &ruleDe } else { - int const returnCode = pcre_exec(compiledRegex, NULL, testName.c_str(), testName.length(), 0, 0, captureData, dataElementCount); + int const returnCode = pcre_exec(compiledRegex, nullptr, testName.c_str(), testName.length(), 0, 0, captureData, dataElementCount); if (returnCode >= 0) { ruleDescription = entry->getReason(); diff --git a/engine/server/library/serverGame/src/shared/core/ReportManager.cpp b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp index 4bac637e..b73e89ff 100755 --- a/engine/server/library/serverGame/src/shared/core/ReportManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp @@ -247,7 +247,7 @@ void ReportManager::handleMessage(ChatOnRequestLog const &chatOnRequestLog) CreatureObject * const reportingCreatureObject = CreatureObject::asCreatureObject(NetworkIdManager::getObjectById(reportData.m_reportingNetworkId)); PlayerObject * const reportingPlayerObject = PlayerCreatureController::getPlayerObject(reportingCreatureObject); - if (reportingPlayerObject != NULL) + if (reportingPlayerObject != nullptr) { // Make sure the chat log does not have any extra data in it @@ -297,7 +297,7 @@ void ReportManager::handleMessage(ChatOnRequestLog const &chatOnRequestLog) } if ( !foundHarassingPlayer - && (reportingCreatureObject != NULL)) + && (reportingCreatureObject != nullptr)) { // No harassing player match @@ -345,7 +345,7 @@ void ReportManager::handleMessage(ChatOnRequestLog const &chatOnRequestLog) target.str = reportData.m_harassingName; prosePackage.target = target; - if (reportingCreatureObject != NULL) + if (reportingCreatureObject != nullptr) { Chat::sendSystemMessage(*reportingCreatureObject, prosePackage); } diff --git a/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp index 5a7c12b8..5c25017b 100755 --- a/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp +++ b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp @@ -113,7 +113,7 @@ SceneData * SceneGlobalDataNamespace::getSceneDataByName(std::string const & sce if (i!=ms_SceneDataItems.end()) return i->second; else - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp index 829055b8..fcf18e02 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp @@ -58,7 +58,7 @@ void ServerBuffBuilderManager::remove() ms_installed = false; delete ms_callback; - ms_callback = NULL; + ms_callback = nullptr; } //----------------------------------------------------------------------------- @@ -73,12 +73,12 @@ bool ServerBuffBuilderManager::makeChanges(SharedBuffBuilderManager::Session con NetworkId const & recipientId = session.recipientId; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : NULL; + ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : nullptr; NetworkId const & bufferId = session.bufferId; Object * const bufferObj = NetworkIdManager::getObjectById(bufferId); - ServerObject * const bufferServerObj = bufferObj ? bufferObj->asServerObject() : NULL; - CreatureObject * const buffer = bufferServerObj ? bufferServerObj->asCreatureObject() : NULL; + ServerObject * const bufferServerObj = bufferObj ? bufferObj->asServerObject() : nullptr; + CreatureObject * const buffer = bufferServerObj ? bufferServerObj->asCreatureObject() : nullptr; if(buffer && recipient) { sendSessionToScript(session, session.bufferId, static_cast(Scripting::TRIG_BUFF_BUILDER_COMPLETED)); @@ -93,11 +93,11 @@ void ServerBuffBuilderManager::sendSessionToScriptForValidation(SharedBuffBuilde NetworkId const & bufferId = session.bufferId; NetworkId const & recipientId = session.recipientId; Object const * const bufferObj = NetworkIdManager::getObjectById(bufferId); - ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : NULL; - CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : NULL; + ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : nullptr; + CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : nullptr; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL; + ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : nullptr; if(buffer && recipient) { sendSessionToScript(session, session.bufferId, static_cast(Scripting::TRIG_BUFF_BUILDER_VALIDATE)); @@ -109,7 +109,7 @@ void ServerBuffBuilderManager::sendSessionToScriptForValidation(SharedBuffBuilde void ServerBuffBuilderManager::sendSessionToScript(SharedBuffBuilderManager::Session const & session, NetworkId const & objectToTriggerId, int const trigger) { Object * const objectToTrigger = NetworkIdManager::getObjectById(objectToTriggerId); - ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : NULL; + ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : nullptr; if(serverObjectToTrigger) { GameScriptObject * const scriptObject = serverObjectToTrigger->getScriptObject(); @@ -144,7 +144,7 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network { //send the cancel message to the buffer Object * const bufferObject = NetworkIdManager::getObjectById(bufferId); - Controller * const bufferController = bufferObject ? bufferObject->getController() : NULL; + Controller * const bufferController = bufferObject ? bufferObject->getController() : nullptr; if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); @@ -157,7 +157,7 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network //send the cancel message to the recipient Object * const recipientObject = NetworkIdManager::getObjectById(recipientId); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController && bufferController != recipientController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); @@ -169,7 +169,7 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network } //send cancel trigger to buffer player - ServerObject * const bufferServerObject = bufferObject ? bufferObject->asServerObject() : NULL; + ServerObject * const bufferServerObject = bufferObject ? bufferObject->asServerObject() : nullptr; if(bufferServerObject) { GameScriptObject * const scriptObject = bufferServerObject->getScriptObject(); @@ -181,7 +181,7 @@ void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, Network } //send cancel trigger to recipient player - ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : NULL; + ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : nullptr; if(recipientServerObject && recipientServerObject != bufferServerObject) { GameScriptObject * const scriptObject = recipientServerObject->getScriptObject(); diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp index f371ee83..e38943e1 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp @@ -81,8 +81,8 @@ namespace ServerBuildoutManagerNamespace struct ServerEventAreaInfo { ServerEventAreaInfo(): - buildOut(NULL), - loadedObject(NULL) + buildOut(nullptr), + loadedObject(nullptr) { } @@ -892,7 +892,7 @@ void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInf ServerEventMap::iterator searchIter = s_eventObjects.find(buildoutRow.m_eventRequired); if(searchIter != s_eventObjects.end()) { - ServerEventAreaInfo newEventObj(&buildoutRow, NULL); + ServerEventAreaInfo newEventObj(&buildoutRow, nullptr); (*searchIter).second.push_back(newEventObj); } else @@ -947,7 +947,7 @@ void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInf newObject->setAuthority(); - if (newObject->asTangibleObject() != NULL) + if (newObject->asTangibleObject() != nullptr) newObject->asTangibleObject()->initializeVisibility(); // @@ -1033,7 +1033,7 @@ void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInf { GameScriptObject * const gso = newObject->getScriptObject(); - if (NULL != gso) + if (nullptr != gso) { std::string const &scripts = buildoutRow.m_scripts; unsigned int pos = 0; @@ -1077,7 +1077,7 @@ void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInf if ( controllerObjectId.isValid() ) { ServerObject * const controllerObject = safe_cast(NetworkIdManager::getObjectById(controllerObjectId)); - if (NULL != controllerObject) + if (nullptr != controllerObject) { GameScriptObject * const script = controllerObject->getScriptObject(); @@ -1092,7 +1092,7 @@ void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInf { if (registerWithController) { - if (NULL != script) + if (nullptr != script) { ScriptParams p; p.addParam(obj->getNetworkId()); @@ -1279,7 +1279,7 @@ void ServerBuildoutManager::onEventStarted(std::string const & eventName) newObject->setAuthority(); - if (newObject->asTangibleObject() != NULL) + if (newObject->asTangibleObject() != nullptr) newObject->asTangibleObject()->initializeVisibility(); // @@ -1369,7 +1369,7 @@ void ServerBuildoutManager::onEventStarted(std::string const & eventName) { GameScriptObject * const gso = newObject->getScriptObject(); - if (NULL != gso) + if (nullptr != gso) { std::string const &scripts = buildoutRow.m_scripts; unsigned int pos = 0; @@ -1407,7 +1407,7 @@ void ServerBuildoutManager::onEventStarted(std::string const & eventName) if ( controllerObjectId.isValid() ) { ServerObject * const controllerObject = safe_cast(NetworkIdManager::getObjectById(controllerObjectId)); - if (NULL != controllerObject) + if (nullptr != controllerObject) { GameScriptObject * const script = controllerObject->getScriptObject(); @@ -1422,7 +1422,7 @@ void ServerBuildoutManager::onEventStarted(std::string const & eventName) { if (registerWithController) { - if (NULL != script) + if (nullptr != script) { ScriptParams p; p.addParam(obj->getNetworkId()); @@ -1483,7 +1483,7 @@ void ServerBuildoutManager::onEventStopped(std::string const & eventName) object->unload(); - (*objIter).loadedObject = NULL; + (*objIter).loadedObject = nullptr; } } } diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp index fe976e69..2fd9b849 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp @@ -56,8 +56,8 @@ namespace ServerImageDesignerManagerNamespace { NetworkId const & nid = payload.first; Object * const o = NetworkIdManager::getObjectById(nid); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const creature = so ? so->asCreatureObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const creature = so ? so->asCreatureObject() : nullptr; if (creature) { ObjectTemplate const * const tmp = creature->getSharedTemplate(); @@ -157,7 +157,7 @@ void ServerImageDesignerManager::remove() ms_genderSpeciesToAllowBald.clear(); delete ms_callback; - ms_callback = NULL; + ms_callback = nullptr; } //----------------------------------------------------------------------------- @@ -172,12 +172,12 @@ bool ServerImageDesignerManager::makeChanges(SharedImageDesignerManager::Session NetworkId const & recipientId = session.recipientId; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : NULL; + ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : nullptr; NetworkId const & designerId = session.designerId; Object * const designerObj = NetworkIdManager::getObjectById(designerId); - ServerObject * const designerServerObj = designerObj ? designerObj->asServerObject() : NULL; - CreatureObject * const designer = designerServerObj ? designerServerObj->asCreatureObject() : NULL; + ServerObject * const designerServerObj = designerObj ? designerObj->asServerObject() : nullptr; + CreatureObject * const designer = designerServerObj ? designerServerObj->asCreatureObject() : nullptr; if(designer && recipient) { @@ -332,8 +332,8 @@ bool ServerImageDesignerManager::makeChanges(SharedImageDesignerManager::Session SlotId const slot = SlotIdManager::findSlotId (ConstCharCrcLowerString (cms_hairSlotName)); Container::ContainerErrorCode tmp = Container::CEC_Success; Object * const originalHairObject = slotted->getObjectInSlot(slot, tmp).getObject(); - ServerObject * const originalHairServerObject = originalHairObject ? originalHairObject->asServerObject() : NULL; - TangibleObject * const orignalHair = originalHairServerObject ? originalHairServerObject->asTangibleObject() : NULL; + ServerObject * const originalHairServerObject = originalHairObject ? originalHairObject->asServerObject() : nullptr; + TangibleObject * const orignalHair = originalHairServerObject ? originalHairServerObject->asTangibleObject() : nullptr; std::string originalHairCustomizationData; if(orignalHair) { @@ -434,8 +434,8 @@ SharedImageDesignerManager::SkillMods ServerImageDesignerManager::getSkillModsFo } Object const * const o = NetworkIdManager::getObjectById(designerId); - ServerObject const * const so = o ? o->asServerObject() : NULL; - CreatureObject const * const designer = so ? so->asCreatureObject() : NULL; + ServerObject const * const so = o ? o->asServerObject() : nullptr; + CreatureObject const * const designer = so ? so->asCreatureObject() : nullptr; if(designer) { skillMods.bodySkillMod = designer->getModValue(SharedImageDesignerManager::cms_bodySkillModName); @@ -466,7 +466,7 @@ void ServerImageDesignerManager::updateGradualCustomizations(CreatureObject * ta //do this one immediately SlotId const slot = SlotIdManager::findSlotId (ConstCharCrcLowerString (cms_hairCustomizationName.c_str())); ServerObject * const hair = ServerWorld::createNewObject(i->second.templateName, *target, slot, true); - TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL; + TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : nullptr; if(tangibleHair) { //first set hair color to colors from old hair (if any) @@ -503,11 +503,11 @@ void ServerImageDesignerManager::sendSessionToScriptForValidation(SharedImageDes NetworkId const & designerId = session.designerId; NetworkId const & recipientId = session.recipientId; Object const * const designerObj = NetworkIdManager::getObjectById(designerId); - ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : NULL; - CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : NULL; + ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : nullptr; + CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : nullptr; Object * const recipientObj = NetworkIdManager::getObjectById(recipientId); - ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL; - CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL; + ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : nullptr; + CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : nullptr; if(designer && recipient) { sendSessionToScript(session, session.designerId, static_cast(Scripting::TRIG_IMAGE_DESIGN_VALIDATE)); @@ -519,7 +519,7 @@ void ServerImageDesignerManager::sendSessionToScriptForValidation(SharedImageDes void ServerImageDesignerManager::sendSessionToScript(SharedImageDesignerManager::Session const & session, NetworkId const & objectToTriggerId, int const trigger) { Object * const objectToTrigger = NetworkIdManager::getObjectById(objectToTriggerId); - ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : NULL; + ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : nullptr; if(serverObjectToTrigger) { GameScriptObject * const scriptObject = serverObjectToTrigger->getScriptObject(); @@ -571,11 +571,11 @@ CustomizationData * ServerImageDesignerManager::fetchCustomizationDataForCustomi if(customization.isVarHairColor) { ServerObject * const hair = creature.getHair(); - TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL; + TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : nullptr; if(tangibleHair) objectToQuery = tangibleHair; else - return NULL; + return nullptr; } return objectToQuery->fetchCustomizationData(); } @@ -586,7 +586,7 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net { //send the cancel message to the designer Object * const designerObject = NetworkIdManager::getObjectById(designerId); - Controller * const designerController = designerObject ? designerObject->getController() : NULL; + Controller * const designerController = designerObject ? designerObject->getController() : nullptr; if(designerController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); @@ -599,7 +599,7 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net //send the cancel message to the recipient Object * const recipientObject = NetworkIdManager::getObjectById(recipientId); - Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL; + Controller * const recipientController = recipientObject ? recipientObject->getController() : nullptr; if(recipientController && designerController != recipientController) { ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage(); @@ -611,7 +611,7 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net } //send cancel trigger to designer player - ServerObject * const designerServerObject = designerObject ? designerObject->asServerObject() : NULL; + ServerObject * const designerServerObject = designerObject ? designerObject->asServerObject() : nullptr; if(designerServerObject) { GameScriptObject * const scriptObject = designerServerObject->getScriptObject(); @@ -623,7 +623,7 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net } //send cancel trigger to recipient player - ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : NULL; + ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : nullptr; if(recipientServerObject && recipientServerObject != designerServerObject) { GameScriptObject * const scriptObject = recipientServerObject->getScriptObject(); @@ -644,8 +644,8 @@ void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, Net std::map ServerImageDesignerManager::getHairCustomizations(SharedImageDesignerManager::Session const & session) { Object * const o = NetworkIdManager::getObjectById(session.recipientId); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const recipient = so ? so->asCreatureObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const recipient = so ? so->asCreatureObject() : nullptr; CustomizationManager::Customization customization; bool result = false; std::map hairCustomizations; diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp index f94b1eee..be9ccc62 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp @@ -105,7 +105,7 @@ int ServerUIManager::createPage(const std::string& pageName, const ServerObject& return pageId; ServerUIPage * const serverUIPage = ServerUIManager::getPage(pageId); - if (serverUIPage != NULL) + if (serverUIPage != nullptr) { serverUIPage->setCallback(callbackFunction); return pageId; @@ -153,7 +153,7 @@ ServerUIPage* ServerUIManager::getPage(int pageId) { std::map::const_iterator iterFind = m_pages.find(pageId); if (iterFind == m_pages.end()) - return NULL; + return nullptr; else return iterFind->second; } @@ -163,7 +163,7 @@ ServerUIPage* ServerUIManager::getPage(int pageId) bool ServerUIManager::showPage(int pageId) { ServerUIPage * const page = getPage(pageId); - if (page != NULL) + if (page != nullptr) return showPage(*page); WARNING(true, ("ServerUIManager::showPage(%d) invalid page", pageId)); @@ -175,14 +175,14 @@ bool ServerUIManager::showPage(int pageId) bool ServerUIManager::showPage(ServerUIPage & page) { Client * const client = page.getClient(); - if (client == NULL) + if (client == nullptr) { -// WARNING(true, ("ServerUIManager::showPage attempt to show page on null client")); +// WARNING(true, ("ServerUIManager::showPage attempt to show page on nullptr client")); return false; } ServerObject const * const characterObject = client->getCharacterObject(); - if (characterObject == NULL) + if (characterObject == nullptr) { WARNING(true, ("ServerUIManager::showPage attempt to show page to client with no character object")); return false; @@ -219,11 +219,11 @@ bool ServerUIManager::closePage(int pageId) { //send close_page message const ServerUIPage * const page = getPage(pageId); - if(page == NULL) + if(page == nullptr) return false; Client * const client = page->getClient(); - if(client == NULL) + if(client == nullptr) return false; SuiForceClosePage msg; @@ -239,7 +239,7 @@ bool ServerUIManager::removePage(int pageId) { //send close_page message const ServerUIPage * const page = getPage(pageId); - if(page == NULL) + if(page == nullptr) return false; NetworkId const & primaryControlledObject = page->getPrimaryControlledObject(); @@ -275,11 +275,11 @@ void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message int const pageId = suiEventNotification.getPageId(); ServerUIPage const * const page = getPage(pageId); - if (page == NULL) + if (page == nullptr) return; Client * const client = page->getClient(); - if (client == NULL) + if (client == nullptr) { removePage(pageId); return; @@ -287,9 +287,9 @@ void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message ServerObject * const characterObject = client->getCharacterObject(); - if (characterObject == NULL) + if (characterObject == nullptr) { - WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for null character object")); + WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for nullptr character object")); removePage(pageId); return; } @@ -300,15 +300,15 @@ void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message ServerObject * const ownerObject = ServerWorld::findObjectByNetworkId(suiPageDataServer.getOwnerId()); - if (ownerObject == NULL) + if (ownerObject == nullptr) { - WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for null owner object")); + WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for nullptr owner object")); removePage(pageId); return; } GameScriptObject * const gso = ownerObject->getScriptObject(); - if (gso == NULL) + if (gso == nullptr) { WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for owner object with no scripts")); removePage(pageId); @@ -318,7 +318,7 @@ void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message int const eventIndex = suiEventNotification.getSubscribedEventIndex(); SuiCommand const * const command = suiPageData.findSubscribeToEventCommandByIndex(eventIndex); - if (command == NULL) + if (command == nullptr) { WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification invalid notification index [%d]", eventIndex)); return; @@ -385,7 +385,7 @@ void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message ScriptDictionaryPtr sd; //it allocates sd, we have to clean it up later gso->makeScriptDictionary(sp, sd); - if(sd.get() == NULL) + if(sd.get() == nullptr) return; //call the script callback function diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp b/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp index 289f1ada..1fc5e64a 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp @@ -36,7 +36,7 @@ m_pageDataServer(pageDataServer) ServerUIPage::~ServerUIPage() { delete m_pageDataServer; - m_pageDataServer = NULL; + m_pageDataServer = nullptr; } //----------------------------------------------------------------------- @@ -52,19 +52,19 @@ Client* ServerUIPage::getClient() const if(!object) { WARNING(true, ("ServerUIPage PrimaryControlledObject doesn't exist")); - return NULL; + return nullptr; } ServerObject *const serverObject = object->asServerObject(); if(!serverObject) { WARNING(true, ("ServerUIPage PrimaryControlledObject isn't a server object")); - return NULL; + return nullptr; } Client * const result = serverObject->getClient(); if(!result) { WARNING(true, ("ServerUIPage PrimaryControlledObject has no client yet")); - return NULL; + return nullptr; } return result; } @@ -74,9 +74,9 @@ Client* ServerUIPage::getClient() const ServerObject* ServerUIPage::getOwner() const { Object * const object = NetworkIdManager::getObjectById(getPageDataServer().getOwnerId()); - if (object != NULL) + if (object != nullptr) return object->asServerObject(); - return NULL; + return nullptr; } //----------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp index 9729c039..29f8e60e 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp @@ -65,15 +65,15 @@ ServerUniverse::ServerUniverse() : m_universeProcess (0), m_nextCheckTimer (static_cast(ConfigServerGame::getUniverseCheckFrequencySeconds())), m_doImmediateCheck (false), - m_thisPlanet (NULL), - m_tatooinePlanet (NULL), + m_thisPlanet (nullptr), + m_tatooinePlanet (nullptr), m_planetNameMap (new PlanetNameMap), m_resourceTypeNameMap (new ResourceTypeNameMap), m_resourceTypeIdMap (new ResourceTypeIdMap), m_importedResourceTypeIdMap(new ResourceTypeIdMap), m_resourcesToSend (new ResourcesToSendType), - m_masterGuildObject (NULL), - m_masterCityObject (NULL), + m_masterGuildObject (nullptr), + m_masterCityObject (nullptr), m_theaterNameIdMap (new TheaterNameIdMap), m_theaterIdNameMap (new TheaterIdNameMap), m_populationList (new PopulationList), @@ -152,7 +152,7 @@ ResourceTypeObject *ServerUniverse::getResourceTypeByName(std::string const & na ResourceTypeObject * ServerUniverse::getResourceTypeById(NetworkId const & id) const { if (id==NetworkId::cms_invalid) - return NULL; + return nullptr; if (id.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId) { @@ -160,7 +160,7 @@ ResourceTypeObject * ServerUniverse::getResourceTypeById(NetworkId const & id) c if (i!=m_resourceTypeIdMap->end()) return (*i).second; else - return NULL; + return nullptr; } else { @@ -168,7 +168,7 @@ ResourceTypeObject * ServerUniverse::getResourceTypeById(NetworkId const & id) c if (i!=m_importedResourceTypeIdMap->end()) return (*i).second; else - return NULL; + return nullptr; } } @@ -177,13 +177,13 @@ ResourceTypeObject * ServerUniverse::getResourceTypeById(NetworkId const & id) c ResourceTypeObject * ServerUniverse::getImportedResourceTypeById(NetworkId const & id) const { if (id==NetworkId::cms_invalid) - return NULL; + return nullptr; ResourceTypeIdMap::const_iterator i=m_importedResourceTypeIdMap->find(id); if (i!=m_importedResourceTypeIdMap->end()) return (*i).second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -329,7 +329,7 @@ void ServerUniverse::createProxiesOnServer(std::vector const & remotePro LOG("UniverseLoading", ("Game Server %lu sent UniverseComplete to Game Servers %s.", GameServer::getInstance().getProcessId(), serverListAsString.c_str())); if (ConfigServerGame::getTimeoutToAckUniverseDataReceived() > 0) - m_timeUniverseDataSent = ::time(NULL); + m_timeUniverseDataSent = ::time(nullptr); } } else @@ -519,7 +519,7 @@ std::string ServerUniverse::generateRandomResourceName(const std::string &nameTa std::string newName(Unicode::wideToNarrow(NameManager::getInstance().generateRandomName("name_resource",nameTable))); // name generator always builds ASCII names, although it returns a Unicode string int failCount = 0; UNREF(failCount); // because of Windows release build - for(; getResourceTypeByName(newName) != NULL; newName = Unicode::wideToNarrow(NameManager::getInstance().generateRandomName("name_resource",nameTable))) // generate names until we find an unused one + for(; getResourceTypeByName(newName) != nullptr; newName = Unicode::wideToNarrow(NameManager::getInstance().generateRandomName("name_resource",nameTable))) // generate names until we find an unused one DEBUG_FATAL(++failCount > 100,("Failed to generate an unused resource name in 100 tries.\n")); return newName; @@ -725,7 +725,7 @@ void ServerUniverse::update(float frameTime) { if (!m_pendingUniverseLoadedAckList.empty()) { - time_t const nowTime = ::time(NULL); + time_t const nowTime = ::time(nullptr); int const secondsSinceUniverseDataSent = (int)(nowTime - m_timeUniverseDataSent); // don't wait forever for ack from another game server @@ -866,7 +866,7 @@ void ServerUniverse::handleAddResourceTypeMessage(AddResourceTypeMessage const & const NetworkId & ServerUniverse::findTheaterId(const std::string & name) { - if (m_theaterNameIdMap == NULL) + if (m_theaterNameIdMap == nullptr) return NetworkId::cms_invalid; TheaterNameIdMap::const_iterator result = m_theaterNameIdMap->find(name); @@ -882,7 +882,7 @@ const std::string & ServerUniverse::findTheaterName(const NetworkId & id) { static const std::string emptyString; - if (m_theaterIdNameMap == NULL) + if (m_theaterIdNameMap == nullptr) return emptyString; TheaterIdNameMap::const_iterator result = m_theaterIdNameMap->find(id); @@ -924,9 +924,9 @@ bool ServerUniverse::remoteSetTheater(const std::string & name, const NetworkId return false; } - if (m_theaterNameIdMap != NULL) + if (m_theaterNameIdMap != nullptr) m_theaterNameIdMap->insert(std::make_pair(name, id)); - if (m_theaterIdNameMap != NULL) + if (m_theaterIdNameMap != nullptr) m_theaterIdNameMap->insert(std::make_pair(id, name)); return true; } @@ -953,9 +953,9 @@ void ServerUniverse::remoteClearTheater(const std::string & name) { const NetworkId & id = findTheaterId(name); - if (m_theaterNameIdMap != NULL) + if (m_theaterNameIdMap != nullptr) m_theaterNameIdMap->erase(name); - if (m_theaterIdNameMap != NULL) + if (m_theaterIdNameMap != nullptr) m_theaterIdNameMap->erase(id); } diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp index fefa1117..3b76b5db 100755 --- a/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp @@ -415,7 +415,7 @@ class AuthoritativeNonPlayerCreatureFilter: public SpatialSubdivisionFilterisAuthoritative() && object->asCreatureObject() != NULL && !object->isPlayerControlled()); } + return (object->isAuthoritative() && object->asCreatureObject() != nullptr && !object->isPlayerControlled()); } }; class TriggerVolumeFilter: public SpatialSubdivisionFilter @@ -905,26 +905,26 @@ ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic ( bool persisted) { CreatureObject * const creature = dynamic_cast(creator.getObject()); - if (creature == NULL) - return NULL; + if (creature == nullptr) + return nullptr; PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) - return NULL; + if (player == nullptr) + return nullptr; const DraftSchematicObject * const draftSchematic = player->getCurrentDraftSchematic(); - if (draftSchematic == NULL) - return NULL; + if (draftSchematic == nullptr) + return nullptr; ManufactureSchematicObject * const manfSchematic = draftSchematic->createManufactureSchematic(creator); - if (manfSchematic == NULL) - return NULL; + if (manfSchematic == nullptr) + return nullptr; if (createNewObjectIntermediate(manfSchematic, container, slotId, - persisted) == NULL) + persisted) == nullptr) { delete manfSchematic; - return NULL; + return nullptr; } return manfSchematic; @@ -948,15 +948,15 @@ ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic ( { ManufactureSchematicObject * const manfSchematic = source.createManufactureSchematic(CachedNetworkId::cms_cachedInvalid); - if (manfSchematic == NULL) - return NULL; + if (manfSchematic == nullptr) + return nullptr; Transform transform; transform.setPosition_p(position); - if (createNewObjectIntermediate(manfSchematic, transform, 0, persisted) == NULL) + if (createNewObjectIntermediate(manfSchematic, transform, 0, persisted) == nullptr) { delete manfSchematic; - return NULL; + return nullptr; } return manfSchematic; @@ -980,11 +980,11 @@ ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic ( { ManufactureSchematicObject * const manfSchematic = source.createManufactureSchematic(CachedNetworkId::cms_cachedInvalid); - if (manfSchematic == NULL) - return NULL; + if (manfSchematic == nullptr) + return nullptr; - if (createNewObjectIntermediate(manfSchematic, container, persisted, false) == NULL) - return NULL; + if (createNewObjectIntermediate(manfSchematic, container, persisted, false) == nullptr) + return nullptr; return manfSchematic; } // ServerWorld::createNewManufacturingSchematic @@ -1008,11 +1008,11 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject *newObject, if (newObject->getNetworkId() == NetworkId::cms_invalid) { WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0.")); - return NULL; + return nullptr; } NetworkController *objectController = dynamic_cast(newObject->getController()); - if (objectController == NULL) + if (objectController == nullptr) objectController = dynamic_cast(newObject->createDefaultController()); NOT_NULL(objectController); @@ -1022,7 +1022,7 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject *newObject, if (!newObject->serverObjectInitializeFirstTimeObject(cell, transform)) { delete newObject; - return NULL; + return nullptr; } // prevent initial object data from being re-sent as deltas @@ -1057,11 +1057,11 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, if (newObject->getNetworkId() == NetworkId::cms_invalid) { WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0.")); - return NULL; + return nullptr; } NetworkController *objectController = dynamic_cast(newObject->getController()); - if (objectController == NULL) + if (objectController == nullptr) objectController = dynamic_cast(newObject->createDefaultController()); NOT_NULL(objectController); @@ -1073,10 +1073,10 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, // prevent initial object data from being re-sent as deltas newObject->clearDeltas(); Container::ContainerErrorCode tmp = Container::CEC_Success; - if (!ContainerInterface::transferItemToGeneralContainer(container, *newObject, NULL, tmp, allowOverload)) + if (!ContainerInterface::transferItemToGeneralContainer(container, *newObject, nullptr, tmp, allowOverload)) { IGNORE_RETURN(newObject->permanentlyDestroy(DeleteReasons::BadContainerTransfer)); - newObject = NULL; + newObject = nullptr; } else { @@ -1101,13 +1101,13 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, if (newObject->getNetworkId() == NetworkId::cms_invalid) { WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0.")); - return NULL; + return nullptr; } { PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermedate,getController"); NetworkController *objectController = dynamic_cast(newObject->getController()); - if (objectController == NULL) + if (objectController == nullptr) objectController = dynamic_cast(newObject->createDefaultController()); NOT_NULL(objectController); } @@ -1130,11 +1130,11 @@ ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, { PROFILER_AUTO_BLOCK_DEFINE("transferItem"); Container::ContainerErrorCode tmp = Container::CEC_Success; - if (!ContainerInterface::transferItemToSlottedContainer(container, *newObject, slotId, NULL, tmp)) + if (!ContainerInterface::transferItemToSlottedContainer(container, *newObject, slotId, nullptr, tmp)) { PROFILER_AUTO_BLOCK_DEFINE("failedTransfer"); IGNORE_RETURN(newObject->permanentlyDestroy(DeleteReasons::BadContainerTransfer)); - newObject = NULL; + newObject = nullptr; } else { @@ -1189,7 +1189,7 @@ ServerObject* ServerWorld::createProxyObject(uint32 templateCrc, const NetworkId if(newObject) { ServerController *objectController = dynamic_cast(newObject->getController()); - if (objectController == NULL) + if (objectController == nullptr) objectController = dynamic_cast(newObject->createDefaultController()); NOT_NULL(objectController); @@ -1455,10 +1455,10 @@ static void _isObjectInConeLoopSetup(const Object & coneCenterObject, const Loca // NOTE: all calculations are made within the object space of coneCenterObject. //-- Compute cone axis vector. - const ServerObject * cell = NULL; + const ServerObject * cell = nullptr; if (coneDirection.getCell() != NetworkId::cms_invalid) cell = safe_cast(NetworkIdManager::getObjectById(coneDirection.getCell())); - if (cell == NULL) + if (cell == nullptr) coneAxisVector = coneCenterObject.rotateTranslate_w2o(coneDirection.getCoordinates()); else { @@ -1984,7 +1984,7 @@ CellProperty const * ServerWorld::findCellAtLocation(const Vector & location_w) */ ServerObject *ServerWorld::findClosestObjectInList(const Vector &location, const std::vector &candidates) { - if (candidates.empty()) return NULL; + if (candidates.empty()) return nullptr; typedef std::vector CandidatesType; @@ -2097,7 +2097,7 @@ void ServerWorld::install() data.installExtents = true; data.installCollisionWorld = true; - data.playEffect = NULL; + data.playEffect = nullptr; data.isPlayerHouse = &isPlayerHouseHook; data.serverSide = true; @@ -2187,7 +2187,7 @@ void ServerWorld::install() m_sceneId = new std::string(ConfigServerGame::getSceneID()); - Pvp::getScheduler().setCallback(Pvp::updateTimedFlags, NULL, ConfigServerGame::getPvpUpdateTimeMs()); + Pvp::getScheduler().setCallback(Pvp::updateTimedFlags, nullptr, ConfigServerGame::getPvpUpdateTimeMs()); NebulaManagerServer::loadScene(*m_sceneId); @@ -2420,7 +2420,7 @@ void ServerWorld::triggerMovingTriggers(ServerObject &movingObject, Vector const clcount++; } - if (object != NULL) + if (object != nullptr) t->moveTriggerVolume(*object, start, end); } DEBUG_REPORT_LOG(ms_logTriggerStats, (" Creature count: %d Client count: %d\n", crcount, clcount)); @@ -2559,8 +2559,8 @@ void ServerWorld::remove() gs_pendingConcludeVector.clear(); - CollisionWorld::setNearWarpWarningCallback(NULL); - CollisionWorld::setFarWarpWarningCallback(NULL); + CollisionWorld::setNearWarpWarningCallback(nullptr); + CollisionWorld::setFarWarpWarningCallback(nullptr); Pvp::remove(); @@ -2629,7 +2629,7 @@ void ServerWorld::removeObjectFromGame(const ServerObject& object) void ServerWorld::removeTangibleObject(ServerObject *object) { PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::removeTangibleObject"); - DEBUG_WARNING(!object, ("removeTangibleObject() was called with a NULL object parameter, this is probably not what the program intended to do")); + DEBUG_WARNING(!object, ("removeTangibleObject() was called with a nullptr object parameter, this is probably not what the program intended to do")); if (!object) return; @@ -2643,7 +2643,7 @@ void ServerWorld::removeTangibleObject(ServerObject *object) // if the object is being destroyed, the trigger has already gone off // player creatures aren't destroyed before being removed, so it's safe to invoke // the trigger here - if (object->isAuthoritative() && (object->getScriptObject() != NULL) && !object->isBeingDestroyed()) + if (object->isAuthoritative() && (object->getScriptObject() != nullptr) && !object->isBeingDestroyed()) { ScriptParams params; IGNORE_RETURN(object->getScriptObject()->trigAllScripts(Scripting::TRIG_REMOVING_FROM_WORLD, params)); @@ -2897,7 +2897,7 @@ void ServerWorld::update(real time) for(concludeIter = gs_pendingConcludeVector.begin(); concludeIter != gs_pendingConcludeVector.end(); ++concludeIter) { ServerObject *o = (*concludeIter)->asServerObject(); - WARNING_STRICT_FATAL(!o, ("NULL object in conclude list!")); + WARNING_STRICT_FATAL(!o, ("nullptr object in conclude list!")); if (o) { if (o->isInitialized()) diff --git a/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp b/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp index a8dadf30..7a047ac5 100755 --- a/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp +++ b/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp @@ -65,8 +65,8 @@ void SetupServerGame::install() PositionUpdateTracker::install(); LogoutTracker::install(); AuthTransferTracker::install(); - NonCriticalTaskQueue::install(static_cast(NULL)); - SurveySystem::install(static_cast(NULL)); + NonCriticalTaskQueue::install(static_cast(nullptr)); + SurveySystem::install(static_cast(nullptr)); CreatureObject::install(); NameManager::install(); MessageToQueue::install(); diff --git a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp index 8202f8d1..9da3852f 100755 --- a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp @@ -26,8 +26,8 @@ int const MAX_ATTRIBS = 2000; void StaticLootItemManager::sendDataToClient(NetworkId const & playerId, std::string const & staticItemName) { Object * const o = NetworkIdManager::getObjectById(playerId); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const co = so ? so->asCreatureObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const co = so ? so->asCreatureObject() : nullptr; if(co) { @@ -45,8 +45,8 @@ void StaticLootItemManager::sendDataToClient(NetworkId const & playerId, std::st void StaticLootItemManager::getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data) { Object * const o = NetworkIdManager::getObjectById(playerId); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const co = so ? so->asCreatureObject() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const co = so ? so->asCreatureObject() : nullptr; if(co) { GameScriptObject * const gso = const_cast(co->getScriptObject()); diff --git a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp index c9bb11a0..fcc97af2 100755 --- a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp @@ -312,7 +312,7 @@ RewardEvent * VeteranRewardManagerNamespace::getRewardEventByName(std::string co if (i!=ms_rewardEvents.end()) return i->second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -323,7 +323,7 @@ RewardItem * VeteranRewardManagerNamespace::getRewardItemByName(std::string cons if (i!=ms_rewardItems.end()) return i->second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -389,7 +389,7 @@ void VeteranRewardManager::getTriggeredEventsIds(CreatureObject const & playerCr if (((*i)->getAccountFeatureId() > 0) && (*i)->getConsumeAccountFeatureId()) { std::vector rewardItems; - getAvailableRewardItemsForEvent(playerCreature, (*i)->getId(), rewardItems, NULL); + getAvailableRewardItemsForEvent(playerCreature, (*i)->getId(), rewardItems, nullptr); if (rewardItems.empty()) continue; @@ -512,7 +512,7 @@ bool VeteranRewardManager::claimRewards(CreatureObject const & playerCreature, s } std::vector possibleRewardItems; - getAvailableRewardItemsForEvent(playerCreature, rewardEventName, possibleRewardItems, NULL); + getAvailableRewardItemsForEvent(playerCreature, rewardEventName, possibleRewardItems, nullptr); if (possibleRewardItems.empty()) { if (debugMessage) @@ -589,7 +589,7 @@ void VeteranRewardManager::handleClaimRewardsReply(StationId stationId, NetworkI static std::vector const emptyMessageData; ServerObject * const so = safe_cast(NetworkIdManager::getObjectById(player)); - CreatureObject * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject * const playerCreature = so ? so->asCreatureObject() : nullptr; if (!playerCreature) return; // player has vanished -- reward claim will be handled by the recovery code at the next login if (!playerCreature->isAuthoritative()) @@ -628,7 +628,7 @@ void VeteranRewardManager::handleClaimRewardsReply(StationId stationId, NetworkI // Check that the requested item can be claimed with this event std::vector possibleRewardItems; - getAvailableRewardItemsForEvent(*playerCreature, rewardEvent, possibleRewardItems, NULL); + getAvailableRewardItemsForEvent(*playerCreature, rewardEvent, possibleRewardItems, nullptr); bool found = false; for (std::vector::const_iterator j=possibleRewardItems.begin(); j!=possibleRewardItems.end(); ++j) @@ -704,7 +704,7 @@ void VeteranRewardManager::handleClaimRewardsReply(StationId stationId, NetworkI params.addParam(item->getCanTradeIn(), "canTradeIn"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantSucceeded",dictionary->getSerializedData(),0,false); @@ -808,11 +808,11 @@ time_t VeteranRewardManagerNamespace::yyyymmddToTime(int const yyyy, int const m FATAL(((mm < 1) || (mm > 12)),("Data bug: Reward event date (%d / %d / %d) - month %d specified for a reward event must be between 1 - 12.",mm,dd,yyyy,mm)); FATAL(((dd < 1) || (dd > 31)),("Data bug: Reward event date (%d / %d / %d) - day %d specified for a reward event must be between 1 - 31.",mm,dd,yyyy,dd)); - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * const timeinfo = ::localtime(&rawtime); if (!timeinfo) { - FATAL(true,(":localtime() returns NULL")); + FATAL(true,(":localtime() returns nullptr")); return 0; } @@ -848,7 +848,7 @@ void VeteranRewardManager::getRewardChoicesTags(CreatureObject const & playerCre std::vector rewardItems; - getAvailableRewardItemsForEvent(playerCreature, eventName, rewardItems, NULL); + getAvailableRewardItemsForEvent(playerCreature, eventName, rewardItems, nullptr); for (std::vector::const_iterator i=rewardItems.begin(); i!=rewardItems.end(); ++i) { rewardTagsUnicode.push_back(Unicode::narrowToWide(*i)); @@ -866,7 +866,7 @@ StringId const * VeteranRewardManager::getEventAnnouncement(std::string const & { return &(event->getAnnouncement()); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -880,7 +880,7 @@ StringId const * VeteranRewardManager::getEventDescription(std::string const & e { return &(event->getDescription()); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -894,7 +894,7 @@ std::string const * VeteranRewardManager::getEventUrl(std::string const & eventN { return &(event->getUrl()); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1147,7 +1147,7 @@ void VeteranRewardManager::tcgRedemption(CreatureObject const & playerCreature, // the redemption int const redemptionTimeout = 300; // 5 minutes; item.removeObjVarItem(ms_tcgRedemptionInProgressObjvar); - item.setObjVarItem(ms_tcgRedemptionInProgressObjvar, static_cast(::time(NULL) + redemptionTimeout)); // 5 minutes + item.setObjVarItem(ms_tcgRedemptionInProgressObjvar, static_cast(::time(nullptr) + redemptionTimeout)); // 5 minutes // send off request to adjust the account feature Id AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), PlayerObject::getAccountDescription(&playerCreature), playerPlayer->getStationId(), item.getNetworkId(), ServerObject::getLogDescription(&item), PlatformGameCode::SWGTCG, static_cast(featureId), adjustment); @@ -1169,7 +1169,7 @@ bool VeteranRewardManager::checkForTcgRedemptionInProgress(ServerObject const & int redemptionTimeout; IGNORE_RETURN(item.getObjVars().getItem(ms_tcgRedemptionInProgressObjvar, redemptionTimeout)); - time_t const currentTime = ::time(NULL); + time_t const currentTime = ::time(nullptr); if (redemptionTimeout > currentTime) { // item should be in top level inventory; get the player object the item is in @@ -1308,7 +1308,7 @@ bool VeteranRewardManager::tradeInReward(CreatureObject const & playerCreature, if (itemClaimTime > 0) { time_t timeRedeem = itemClaimTime + static_cast(ConfigServerGame::getVeteranRewardTradeInWaitPeriodSeconds()); - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); // see if the item has its own trade-in wait period if (itemObjvar.hasItem("rewardTradeInWaitPeriod") && (itemObjvar.getType("rewardTradeInWaitPeriod") == DynamicVariable::INT)) @@ -1337,7 +1337,7 @@ bool VeteranRewardManager::tradeInReward(CreatureObject const & playerCreature, // the trade in int const redemptionTimeout = 300; // 5 minutes; item.removeObjVarItem(ms_tradeInInProgressObjvar); - item.setObjVarItem(ms_tradeInInProgressObjvar, static_cast(::time(NULL) + redemptionTimeout)); // 5 minutes + item.setObjVarItem(ms_tradeInInProgressObjvar, static_cast(::time(nullptr) + redemptionTimeout)); // 5 minutes // send off request to adjust the account feature Id AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), PlayerObject::getAccountDescription(&playerCreature), playerPlayer->getStationId(), item.getNetworkId(), ServerObject::getLogDescription(&item), PlatformGameCode::SWG, static_cast(featureId), 1); @@ -1361,7 +1361,7 @@ bool VeteranRewardManager::checkForTradeInInProgress(ServerObject const & item) int redemptionTimeout; IGNORE_RETURN(item.getObjVars().getItem(ms_tradeInInProgressObjvar, redemptionTimeout)); - time_t const currentTime = ::time(NULL); + time_t const currentTime = ::time(nullptr); if (redemptionTimeout > currentTime) { // item should be in top level inventory; get the player object the item is in @@ -1742,7 +1742,7 @@ RewardEvent::RewardEvent(DataTable const & dataTable, int row) : m_id(dataTable.getStringValue("id",row)), m_specificItems(buildVectorFromString(dataTable.getStringValue("Items",row))), m_includeItemsFrom(buildVectorFromString(dataTable.getStringValue("Include Items From",row))), - m_allItems(NULL), + m_allItems(nullptr), m_category(dataTable.getIntValue("Category", row)), m_featureBitRewardExclusionMask(dataTable.getIntValue("Feature Bit Reward Exclusion Mask", row)), m_accountFlags(static_cast(dataTable.getIntValue("Account Flags",row))), @@ -1839,7 +1839,7 @@ bool RewardEvent::hasPlayerTriggered(CreatureObject const & playerCreature) cons if (m_startDate != 0 || m_endDate != 0) { - time_t currentTime = time(NULL); + time_t currentTime = time(nullptr); if ((m_startDate != 0 && currentTime < m_startDate) || (m_endDate != 0 && currentTime > m_endDate)) return false; diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp index f30669aa..7f8f07c8 100755 --- a/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp +++ b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp @@ -43,11 +43,11 @@ namespace GuildInterfaceNamespace bool s_needEnemiesRebuild; // dictionary containing the table showing all active guild wars with at least 1 kill - ScriptParams * s_activeGuildWars = NULL; + ScriptParams * s_activeGuildWars = nullptr; bool s_activeGuildWarsNeedRebuild = true; // dictionary containing the table showing the 100 most recently ended guild wars with at least 1 kill - ScriptParams * s_inactiveGuildWars = NULL; + ScriptParams * s_inactiveGuildWars = nullptr; int s_inactiveGuildWarsMostRecentUpdateIndex = 0; typedef std::map PendingChannelAddList; //using a map to make it easier to prevent redundant entries @@ -99,7 +99,7 @@ namespace GuildInterfaceNamespace const char * makeCopyOfString(const char * rhs) { - char * lhs = NULL; + char * lhs = nullptr; if (rhs) { lhs = new char[strlen(rhs) + 1]; @@ -245,7 +245,7 @@ std::pair const *GuildInterface::hasDeclaredWarAgainst(int actorGui } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -662,7 +662,7 @@ ScriptParams const *GuildInterface::getMasterGuildWarTableDictionary() } delete s_activeGuildWars; - s_activeGuildWars = NULL; + s_activeGuildWars = nullptr; // build the table if (!guildMutuallyAtWarWithKillSummary.empty()) @@ -810,9 +810,9 @@ void GuildInterface::updateInactiveGuildWarTrackingInfo(GuildObject &masterGuild // guild with higher kill count appears first if (guildAKillCount > guildBKillCount) - IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, ::time(NULL)))); + IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, ::time(nullptr)))); else - IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, ::time(NULL)))); + IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, ::time(nullptr)))); IGNORE_RETURN(masterGuildObject.setObjVarItem(s_objvarInactiveGuildWarsMostRecentIndex, nextIndex)); } @@ -869,7 +869,7 @@ ScriptParams const *GuildInterface::getInactiveGuildWarTableDictionary() if (!objVars.getItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), currentIndex), guildWarData)) break; - if (!Unicode::tokenize(guildWarData, tokens, &delimiters, NULL) || (tokens.size() != 7)) + if (!Unicode::tokenize(guildWarData, tokens, &delimiters, nullptr) || (tokens.size() != 7)) break; scriptParamsGuildAName->push_back(new Unicode::String(tokens[0])); @@ -891,7 +891,7 @@ ScriptParams const *GuildInterface::getInactiveGuildWarTableDictionary() } delete s_inactiveGuildWars; - s_inactiveGuildWars = NULL; + s_inactiveGuildWars = nullptr; if (!scriptParamsGuildAName->empty()) { @@ -1120,7 +1120,7 @@ void GuildInterface::updateGuildWarKillTracking(CreatureObject const &killer, Cr && hasDeclaredWarAgainst(killer.getGuildId(), victim.getGuildId()) && hasDeclaredWarAgainst(victim.getGuildId(), killer.getGuildId())) { - ServerUniverse::getInstance().getMasterGuildObject()->modifyGuildWarKillTracking(killer.getGuildId(), victim.getGuildId(), 1, static_cast(::time(NULL))); + ServerUniverse::getInstance().getMasterGuildObject()->modifyGuildWarKillTracking(killer.getGuildId(), victim.getGuildId(), 1, static_cast(::time(nullptr))); } } diff --git a/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp index 96c0d19b..170181d6 100755 --- a/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp +++ b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp @@ -239,7 +239,7 @@ void GameServerMetricsData::updateData() "Max: %s requested load on %s which has been pending for %s. Limit = %d.", id.getValueString().c_str(), CalendarTime::convertEpochToTimeStringLocal(oldestPendingLoadRequestTime).c_str(), - CalendarTime::convertSecondsToMS((int)::time(NULL) - oldestPendingLoadRequestTime).c_str(), + CalendarTime::convertSecondsToMS((int)::time(nullptr) - oldestPendingLoadRequestTime).c_str(), GameServer::getPendingLoadRequestLimit() ); else diff --git a/engine/server/library/serverGame/src/shared/network/Chat.cpp b/engine/server/library/serverGame/src/shared/network/Chat.cpp index 209ee89d..fede9920 100755 --- a/engine/server/library/serverGame/src/shared/network/Chat.cpp +++ b/engine/server/library/serverGame/src/shared/network/Chat.cpp @@ -64,7 +64,7 @@ using namespace ChatNamespace; //----------------------------------------------------------------------- -Chat *Chat::m_instance = NULL; +Chat *Chat::m_instance = nullptr; Chat::Chat () : diff --git a/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp index b6af7d42..f47cfe43 100755 --- a/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp +++ b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp @@ -194,7 +194,7 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) } } else - LOG("CustomerService", ("CharacterTransfer: character object was NULL so unable to check if bank is loaded")); + LOG("CustomerService", ("CharacterTransfer: character object was nullptr so unable to check if bank is loaded")); } @@ -224,10 +224,10 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) } } else - LOG("CustomerService", ("CharacterTransfer: bank container object was NULL for getBankContainer call")); + LOG("CustomerService", ("CharacterTransfer: bank container object was nullptr for getBankContainer call")); } else - LOG("CustomerService", ("CharacterTransfer: character object was NULL so unable to check if bank is loaded")); + LOG("CustomerService", ("CharacterTransfer: character object was nullptr so unable to check if bank is loaded")); } else if (m.isType("RequestTransferData")) { @@ -237,7 +237,7 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) CreatureObject * const character = dynamic_cast(NetworkIdManager::getObjectById(requestTransferData.getValue().getCharacterId())); PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(character); time_t characterCreateTime = -1; - FreeCtsDataTable::FreeCtsInfo const * freeCtsInfo = NULL; + FreeCtsDataTable::FreeCtsInfo const * freeCtsInfo = nullptr; bool freeCtsBypassTimeRestriction = false; if (character && playerObject) { @@ -292,7 +292,7 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) for (CreatureObject::SkillList::const_iterator i = skills.begin(); i != skills.end(); ++i) { const SkillObject * profession = (*i)->findProfessionForSkill(); - if (profession != NULL) + if (profession != nullptr) professionName = profession->getSkillName(); } } @@ -414,7 +414,7 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) unsigned int result = CHATRESULT_SUCCESS; ServerObject const * const o = ServerWorld::findObjectByNetworkId(cervreq.getValue().first.first); - CreatureObject const * const co = (o ? o->asCreatureObject() : NULL); + CreatureObject const * const co = (o ? o->asCreatureObject() : nullptr); if (co) { result = Chat::isAllowedToEnterRoom(*co, cervreq.getValue().first.second); @@ -440,7 +440,7 @@ void ConnectionServerConnection::onReceive (const Archive::ByteStream & message) bool success = false; ServerObject const * const o = ServerWorld::findObjectByNetworkId(cqrvreq.getValue().first.first); - CreatureObject const * const co = (o ? o->asCreatureObject() : NULL); + CreatureObject const * const co = (o ? o->asCreatureObject() : nullptr); if (co) { success = (CHATRESULT_SUCCESS == Chat::isAllowedToEnterRoom(*co, cqrvreq.getValue().first.second)); diff --git a/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp index 456ec031..cb1df8fd 100755 --- a/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp +++ b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp @@ -58,12 +58,12 @@ void CustomerServiceServerConnection::onReceive(const Archive::ByteStream & mess ChatRequestLog chatRequestLog(ri); Object * const reportingObject = NetworkIdManager::getObjectById(NetworkId(Unicode::wideToNarrow(chatRequestLog.getPlayer()))); - if ( (reportingObject != NULL) + if ( (reportingObject != nullptr) && reportingObject->isAuthoritative()) { PlayerObject const * const reportingPlayerObject = PlayerCreatureController::getPlayerObject(CreatureObject::asCreatureObject(reportingObject)); - if (reportingPlayerObject != NULL) + if (reportingPlayerObject != nullptr) { PlayerObject::ChatLog const &reportingPlayerChatLog = reportingPlayerObject->getChatLog(); PlayerObject::ChatLog::const_iterator iterReportingPlayerChatLog = reportingPlayerChatLog.begin(); diff --git a/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp index bf76972f..d66d70fb 100755 --- a/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp +++ b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp @@ -31,7 +31,7 @@ GameServerMessageArchive::~GameServerMessageArchive() void GameServerMessageArchive::install() { - if (getInstance() == NULL) + if (getInstance() == nullptr) { setInstance(new GameServerMessageArchive); ExitChain::add(GameServerMessageArchive::remove, "GameServerMessageArchive::remove"); diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp index ed2eb7de..cdc6289f 100755 --- a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp @@ -140,7 +140,7 @@ using namespace BuildingObjectNamespace; // ====================================================================== -const SharedObjectTemplate * BuildingObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * BuildingObject::m_defaultSharedTemplate = nullptr; // ====================================================================== @@ -380,13 +380,13 @@ const SharedObjectTemplate * BuildingObject::getDefaultSharedTemplate(void) cons { static const ConstCharCrcLowerString templateName("object/building/base/shared_building_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "BuildingObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -399,10 +399,10 @@ static const ConstCharCrcLowerString templateName("object/building/base/shared_b */ void BuildingObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // BuildingObject::removeDefaultTemplate @@ -432,7 +432,7 @@ void BuildingObject::expelObject(ServerObject &who) if (controller) { CellProperty *parentCell = getParentCell(); - ServerObject *destinationCellObject = NULL; + ServerObject *destinationCellObject = nullptr; if (!parentCell->isWorldCell()) destinationCellObject = safe_cast(&parentCell->getOwner()); @@ -902,7 +902,7 @@ void BuildingObject::changeTeleportDestination(Vector & position, float & yaw) c { DataTable * respawnTable = DataTableManager::getTable(CLONE_RESPAWN_TABLE, true); - if (respawnTable != NULL) + if (respawnTable != nullptr) { int row = respawnTable->searchColumnString(0, getTemplateName()); if (row >= 0) diff --git a/engine/server/library/serverGame/src/shared/object/CellObject.cpp b/engine/server/library/serverGame/src/shared/object/CellObject.cpp index b2c6f994..e0211aa5 100755 --- a/engine/server/library/serverGame/src/shared/object/CellObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CellObject.cpp @@ -39,7 +39,7 @@ #include -const SharedObjectTemplate * CellObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * CellObject::m_defaultSharedTemplate = nullptr; // ====================================================================== @@ -99,13 +99,13 @@ const SharedObjectTemplate * CellObject::getDefaultSharedTemplate(void) const { static const ConstCharCrcLowerString templateName("object/cell/base/shared_cell_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "CellObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -118,10 +118,10 @@ static const ConstCharCrcLowerString templateName("object/cell/base/shared_cell_ */ void CellObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // CellObject::removeDefaultTemplate @@ -161,7 +161,7 @@ void CellObject::endBaselines() } Object *container = ContainerInterface::getContainedByObject(*this); - PortalProperty *portalProperty = NULL; + PortalProperty *portalProperty = nullptr; if (container) { portalProperty = container->getPortalProperty(); @@ -531,31 +531,31 @@ bool CellObject::isAllowed(CreatureObject const &who) const bool CellObject::getClosestPathNodePos( const ServerObject & object, Vector & outPos ) const { - const PathNode * closestNode = NULL; + const PathNode * closestNode = nullptr; float closestDistance = 0; const Vector objectPos = object.getPosition_w(); const CellProperty * cell = ContainerInterface::getCell(*this); - if (cell != NULL) + if (cell != nullptr) { const Floor * floor = cell->getFloor(); - if (floor != NULL) + if (floor != nullptr) { const FloorMesh * mesh = floor->getFloorMesh(); - if (mesh != NULL) + if (mesh != nullptr) { const PathGraph * path = safe_cast(mesh->getPathGraph()); - if (path != NULL) + if (path != nullptr) { int nodeCount = path->getNodeCount(); for (int i = 0; i < nodeCount; ++i) { const PathNode * node = path->getNode(i); - if (node != NULL) + if (node != nullptr) { float distance = objectPos.magnitudeBetweenSquared( rotateTranslate_p2w(node->getPosition_p())); - if (closestNode == NULL || distance < closestDistance) + if (closestNode == nullptr || distance < closestDistance) { closestNode = node; closestDistance = distance; @@ -567,9 +567,9 @@ bool CellObject::getClosestPathNodePos( const ServerObject & object, Vector & ou } } - if (closestNode != NULL) + if (closestNode != nullptr) outPos = closestNode->getPosition_p(); - return closestNode != NULL; + return closestNode != nullptr; } // ---------------------------------------------------------------------- @@ -648,7 +648,7 @@ void CellObject::onContainerLostItem(ServerObject * destination, ServerObject& i obj->getScriptObject()->trigAllScripts(Scripting::TRIG_LOST_ITEM, params); BuildingObject * const b_obj = getOwnerBuilding(); - if (b_obj && item.isPlayerControlled() && destination == NULL) + if (b_obj && item.isPlayerControlled() && destination == nullptr) { b_obj->lostPlayer(item); } @@ -772,8 +772,8 @@ CellObject * CellObject::getCellObject(NetworkId const & networkId) CellObject * CellObject::asCellObject(Object * object) { - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; - CellObject * const cellObject = (serverObject != NULL) ? serverObject->asCellObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + CellObject * const cellObject = (serverObject != nullptr) ? serverObject->asCellObject() : nullptr; return cellObject; } @@ -782,8 +782,8 @@ CellObject * CellObject::asCellObject(Object * object) CellObject const * CellObject::asCellObject(Object const * object) { - ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL; - CellObject const * const cellObject = (serverObject != NULL) ? serverObject->asCellObject() : NULL; + ServerObject const * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + CellObject const * const cellObject = (serverObject != nullptr) ? serverObject->asCellObject() : nullptr; return cellObject; } diff --git a/engine/server/library/serverGame/src/shared/object/CityObject.cpp b/engine/server/library/serverGame/src/shared/object/CityObject.cpp index f8fd1778..da741dbf 100755 --- a/engine/server/library/serverGame/src/shared/object/CityObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CityObject.cpp @@ -130,9 +130,9 @@ void CityObject::setupUniverse() // build the city info from data read in from DB // disable notification while building the initial list - m_citizensInfo.setOnErase(NULL, NULL); - m_citizensInfo.setOnInsert(NULL, NULL); - m_citizensInfo.setOnSet(NULL, NULL); + m_citizensInfo.setOnErase(nullptr, nullptr); + m_citizensInfo.setOnInsert(nullptr, nullptr); + m_citizensInfo.setOnSet(nullptr, nullptr); // build cities std::map tempCities; @@ -462,7 +462,7 @@ int CityObject::createCity(std::string const &cityName, NetworkId const &cityHal incomeTax, propertyTax, salesTax, travelLoc, travelCost, travelInterplanetary, cloneLoc, cloneRespawn, cloneRespawnCell, cloneId); - ci.setCityCreationTime(static_cast(::time(NULL))); + ci.setCityCreationTime(static_cast(::time(nullptr))); m_citiesInfo.set(cityId, ci); std::string citySpec; @@ -1724,7 +1724,7 @@ CitizenInfo const * CityObject::getCitizenSpec(int cityId, NetworkId const &citi } result.clear(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1739,7 +1739,7 @@ CityStructureInfo const * CityObject::getCityStructureSpec(int cityId, NetworkId } result.clear(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1975,7 +1975,7 @@ CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citiz if (iterFind != m_citizensInfo.end()) return &(iterFind->second); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2008,7 +2008,7 @@ CityStructureInfo const *CityObject::getCityStructureInfo(int cityId, NetworkId if (iterFind != m_structuresInfo.end()) return &(iterFind->second); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2071,7 +2071,7 @@ PgcRatingInfo const * CityObject::getPgcRating(NetworkId const &chroniclerId) co if (iterFind != m_pgcRatingInfo.end()) return &(iterFind->second); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2141,7 +2141,7 @@ void CityObject::adjustPgcRating(NetworkId const &chroniclerId, std::string cons m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId)); } - updatedPgcRating.m_lastRatingTime = static_cast(::time(NULL)); + updatedPgcRating.m_lastRatingTime = static_cast(::time(nullptr)); std::string updatedPgcRatingSpec; CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec); diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index 336f2058..73803c0a 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -189,7 +189,7 @@ //---------------------------------------------------------------------- // static CreatureObject vars -const SharedObjectTemplate * CreatureObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * CreatureObject::m_defaultSharedTemplate = nullptr; //---------------------------------------------------------------------- @@ -661,9 +661,9 @@ float MonitoredCreatureMovement::operator-(MonitoredCreatureMovement const &othe CreatureObject::CreatureObject(const ServerCreatureObjectTemplate* newTemplate) : TangibleObject(newTemplate), - m_commandQueue(NULL), + m_commandQueue(nullptr), m_isStatic(false), - m_shield(NULL), + m_shield(nullptr), m_regenerationTime(0), m_attributes(Attributes::NumberOfAttributes), m_maxAttributes(Attributes::NumberOfAttributes), @@ -942,7 +942,7 @@ CreatureObject::~CreatureObject() trade->cancelTrade(*this); } // AICreatureController * aiController = AICreatureController::asAiCreatureController(controller); -// if (aiController != NULL) +// if (aiController != nullptr) // { // aiController->stop(); // } @@ -1083,15 +1083,15 @@ const SharedObjectTemplate * CreatureObject::getDefaultSharedTemplate() const { static const ConstCharCrcLowerString templateName("object/creature/base/shared_creature_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - DEBUG_WARNING(m_defaultSharedTemplate == NULL, ("Cannot create " + DEBUG_WARNING(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "CreatureObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -1104,10 +1104,10 @@ static const ConstCharCrcLowerString templateName("object/creature/base/shared_c */ void CreatureObject::removeDefaultTemplate() { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // CreatureObject::removeDefaultTemplate @@ -1192,7 +1192,7 @@ void CreatureObject::runSpawnQueue() ScriptParams params; ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(id, "spawn_Trigger", dictionary->getSerializedData(), 0, false); @@ -1263,7 +1263,7 @@ bool CreatureObject::assignMission(MissionObject * missionObject) } Container::ContainerErrorCode tmp = Container::CEC_Success; - result = ContainerInterface::transferItemToGeneralContainer(*datapad, *missionObject, NULL, tmp); + result = ContainerInterface::transferItemToGeneralContainer(*datapad, *missionObject, nullptr, tmp); if(result) { missionObject->setMissionHolderId(getNetworkId()); @@ -1725,7 +1725,7 @@ void CreatureObject::forwardServerObjectSpecificBaselines() const TangibleObject::forwardServerObjectSpecificBaselines(); Property const * const property = getProperty(SlowDownProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) { SlowDownProperty const * const slowdownProperty = safe_cast(property); @@ -1736,7 +1736,7 @@ void CreatureObject::forwardServerObjectSpecificBaselines() const // if we are an ai creature, have our controller send our current ai state AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(getController()); - if (aiCreatureController != NULL) + if (aiCreatureController != nullptr) { aiCreatureController->forwardServerObjectSpecificBaselines(); } @@ -1749,7 +1749,7 @@ void CreatureObject::sendObjectSpecificBaselinesToClient(Client const &client) c TangibleObject::sendObjectSpecificBaselinesToClient(client); Property const * const property = getProperty(SlowDownProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) { SlowDownProperty const * const slowdownProperty = safe_cast(property); @@ -1778,7 +1778,7 @@ void CreatureObject::initializeFirstTimeObject() // set the current weapon WeaponObject * weapon = getReadiedWeapon(); - if (weapon != NULL) + if (weapon != nullptr) setCurrentWeapon(*weapon); #ifdef _DEBUG @@ -1835,7 +1835,7 @@ void CreatureObject::onLoadedFromDatabase() { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); Object* appearanceInventory = itemId.getObject(); - if(appearanceInventory == NULL) + if(appearanceInventory == nullptr) { WARNING(true, ("Player %s has lost their appearance inventory", getNetworkId().getValueString().c_str())); appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *this, slot, false); @@ -1941,7 +1941,7 @@ void CreatureObject::onLoadedFromDatabase() if (i.getValue(ctsTransactionDetail)) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4)) + if (Unicode::tokenize(ctsTransactionDetail, tokens, nullptr, nullptr) && (tokens.size() >= 4)) { int const transferTime = atoi(Unicode::wideToNarrow(tokens[0]).c_str()); if ((earliestTransferTime == -1) || (transferTime < earliestTransferTime)) @@ -1978,7 +1978,7 @@ void CreatureObject::onLoadedFromDatabase() } // set "born on " collection slot and clear all the other "born on " collection slots; - // this still needs to be run even if collectionSlot is NULL in order to forcefully clear all of the + // this still needs to be run even if collectionSlot is nullptr in order to forcefully clear all of the // other "born on " collection slots, since we are reusing deleted/no longer used collection // slot bits, and those bits may be left in a set state at the time they were deleted/no longer used std::vector const & slots = CollectionsDataTable::getSlotsInCollection("born_on_collection"); @@ -2064,7 +2064,7 @@ void CreatureObject::onLoadedFromDatabase() std::vector > skillModBonuses; std::vector > attribBonuses; Container const * const equipment = ContainerInterface::getContainer(*this); - if (equipment != NULL) + if (equipment != nullptr) { for (ContainerConstIterator i(equipment->begin()); i != equipment->end(); ++i) { @@ -2072,7 +2072,7 @@ void CreatureObject::onLoadedFromDatabase() if (so) { TangibleObject const * const equippedItem = so->asTangibleObject(); - if (equippedItem != NULL) + if (equippedItem != nullptr) { equippedItem->getSkillModBonuses(skillModBonuses); int bonusCount = skillModBonuses.size(); @@ -2110,7 +2110,7 @@ void CreatureObject::onLoadedFromDatabase() setDefaultAlterTime(defaultAlterTime); CreatureController * controller = getCreatureController(); - if (controller != NULL) + if (controller != nullptr) controller->updateHibernate(); } } @@ -2379,7 +2379,7 @@ void CreatureObject::endBaselines() void CreatureObject::checkAndRestoreRequiredSlots() { SlottedContainer * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { WARNING_STRICT_FATAL(true, ("This creature is not slotted!")); return; @@ -2422,7 +2422,7 @@ void CreatureObject::checkAndRestoreRequiredSlots() { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); Object* inventory = itemId.getObject(); - if (inventory == NULL) + if (inventory == nullptr) { WARNING(true, ("Player %s has lost their inventory", getNetworkId().getValueString().c_str())); inventory = ServerWorld::createNewObject(s_inventoryTemplate, *this, slot, false); @@ -2438,7 +2438,7 @@ void CreatureObject::checkAndRestoreRequiredSlots() { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); Object* datapad = itemId.getObject(); - if (datapad == NULL) + if (datapad == nullptr) { WARNING(true, ("Player %s has lost their datapad", getNetworkId().getValueString().c_str())); datapad = ServerWorld::createNewObject(s_datapadTemplate, *this, slot, false); @@ -2454,7 +2454,7 @@ void CreatureObject::checkAndRestoreRequiredSlots() { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); ServerObject* missionBag = safe_cast(itemId.getObject()); - if (missionBag == NULL) + if (missionBag == nullptr) { WARNING(true, ("Player %s has lost their mission bag", getNetworkId().getValueString().c_str())); missionBag = ServerWorld::createNewObject(s_missionBagTemplate, *this, slot, false); @@ -2472,7 +2472,7 @@ void CreatureObject::checkAndRestoreRequiredSlots() { Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp); ServerObject* bank = safe_cast(itemId.getObject()); - if (bank == NULL) + if (bank == nullptr) { WARNING(true, ("Player %s has lost their bank", getNetworkId().getValueString().c_str())); bank = ServerWorld::createNewObject(s_bankTemplate, *this, slot, false); @@ -2502,7 +2502,7 @@ void CreatureObject::onRemovingFromWorld() { // if we are crafting, end the crafting session PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL && player->isCrafting()) + if (player != nullptr && player->isCrafting()) player->stopCrafting(false); // exit all notify regions @@ -2541,7 +2541,7 @@ void CreatureObject::addToWorld() Object::addToWorld(); updateTriggerVolumes(); - if (getScriptObject() != NULL) + if (getScriptObject() != nullptr) getScriptObject()->setOwnerIsLoaded(); ContainedByProperty * const containedByProperty = getContainedByProperty(); @@ -2607,7 +2607,7 @@ void CreatureObject::setupSkillData() clearCommands(); PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->clearSchematics(); } @@ -2679,7 +2679,7 @@ void CreatureObject::setupSkillData() DynamicVariableList::NestedList::const_iterator i(schematics.begin()); for (; i != schematics.end(); ++i) { - grantSchematic(strtoul(i.getName().c_str(), NULL, 10), true); + grantSchematic(strtoul(i.getName().c_str(), nullptr, 10), true); } } @@ -2711,7 +2711,7 @@ Controller* CreatureObject::createDefaultController () AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(controller); - if (aiCreatureController != NULL) + if (aiCreatureController != nullptr) { aiCreatureController->addServerNpAutoDeltaVariables(m_serverPackage_np); } @@ -2758,7 +2758,7 @@ void CreatureObject::setAuthServerProcessId(uint32 processId) if (oldProcess != getAuthServerProcessId()) { // we can't trade if we are on different servers, so cancel it - if (getCreatureController()->getSecureTrade() != NULL) + if (getCreatureController()->getSecureTrade() != nullptr) { getCreatureController()->getSecureTrade()->cancelTrade(*this); } @@ -2786,7 +2786,7 @@ float CreatureObject::alter(float time) // If the player is trading, cancel the trade. // We need to force the issue to catch edge cases. ServerSecureTrade * const secureTradeObject = getCreatureController()->getSecureTrade(); - if (secureTradeObject != NULL) + if (secureTradeObject != nullptr) { secureTradeObject->cancelTrade(*this); } @@ -2854,7 +2854,7 @@ float CreatureObject::alter(float time) if (playerObject->getIsUnsticking() && getPositionChanged()) { - Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_cancelled, NULL); + Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_cancelled, nullptr); playerObject->setIsUnsticking(false); } } @@ -2862,13 +2862,13 @@ float CreatureObject::alter(float time) if (!ServerWorld::isSpaceScene()) { // if we're in a conversation, end it if we move too far from the npc - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter::npcConvCheck"); bool endConversation = false; // check the distance to the npc ServerObject const * const npc = safe_cast(m_npcConversation->getNPC().getObject()); - if (npc != NULL) + if (npc != nullptr) { float distance = findPosition_w().magnitudeBetween(npc->findPosition_w()); distance -= getRadius(); @@ -2894,7 +2894,7 @@ float CreatureObject::alter(float time) // see if we are performing a slow down effect Property * property = getProperty(SlowDownProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) { // has it expired? SlowDownProperty * slowdown = safe_cast(property); @@ -2909,7 +2909,7 @@ float CreatureObject::alter(float time) // area, and and tell them they are moving on our effect "hill" during their next alter // (player creatures are handled on the player's client) Object * target = slowdown->getTarget().getObject(); - if (target != NULL) + if (target != nullptr) { std::vector found; ServerWorld::findAuthoritativeNonPlayerCreaturesInCone(*this, *target, slowdown->getConeLength(), slowdown->getConeAngle(), found); @@ -2974,14 +2974,14 @@ bool CreatureObject::canDestroy() const // turn off our default weapon so it won't prevent us from getting // destroyed WeaponObject * defaultWeapon = getDefaultWeapon(); - if (defaultWeapon != NULL) + if (defaultWeapon != nullptr) defaultWeapon->setAsDefaultWeapon(false); bool result = TangibleObject::canDestroy(); if (!result) { // we're not being destroyed, turn our default weapon back on - if (defaultWeapon != NULL) + if (defaultWeapon != nullptr) defaultWeapon->setAsDefaultWeapon(true); } @@ -3007,22 +3007,22 @@ void CreatureObject::initializeDefaultWeapon() FATAL(!isAuthoritative(), ("CreatureObject::initializeDefaultWeapon: obj %s, while nonauth", getDebugInformation().c_str())); ServerCreatureObjectTemplate const * const myTemplate = safe_cast(getObjectTemplate()); - if (myTemplate != NULL) + if (myTemplate != nullptr) { ServerWeaponObjectTemplate const *weaponTemplate = myTemplate->getDefaultWeapon(); - if (weaponTemplate == NULL) + if (weaponTemplate == nullptr) { WARNING(true, ("Creature template %s has no valid default weapon!", getTemplateName())); // try to use the fallback weapon weaponTemplate = dynamic_cast(ObjectTemplateList::fetch(ConfigServerGame::getFallbackDefaultWeapon())); - FATAL(weaponTemplate == NULL, ("CreatureObject::initializeFirstTimeObject fallback weapon template %s is bad!", ConfigServerGame::getFallbackDefaultWeapon())); + FATAL(weaponTemplate == nullptr, ("CreatureObject::initializeFirstTimeObject fallback weapon template %s is bad!", ConfigServerGame::getFallbackDefaultWeapon())); } WeaponObject * const weapon = safe_cast(ServerWorld::createNewObject(*weaponTemplate, *this, s_defaultWeaponSlotId, false)); - if (weapon != NULL) + if (weapon != nullptr) { weapon->setAsDefaultWeapon(true); } @@ -3044,7 +3044,7 @@ bool CreatureObject::swapDefaultWeapons(WeaponObject &newDefaultWeapon, ServerOb FATAL(!newDefaultWeapon.isAuthoritative(), ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, while newDefaultWeapon nonauth", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str())); FATAL(!weaponContainer.isAuthoritative(), ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, while weaponContainer nonauth", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str())); - // There is a window here where the default weapon can be null, so we + // There is a window here where the default weapon can be nullptr, so we // set a flag that it's ok until we've finished the transfer. FATAL(s_allowNullDefaultWeapon, ("CreatureObject::swapDefaultWeapons has been recursively called!")); @@ -3080,12 +3080,12 @@ bool CreatureObject::swapDefaultWeapons(WeaponObject &newDefaultWeapon, ServerOb WeaponObject *CreatureObject::getDefaultWeapon() const { SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { - return NULL; + return nullptr; } - WeaponObject * defaultWeapon = NULL; + WeaponObject * defaultWeapon = nullptr; Container::ContainerErrorCode error; Container::ContainedItem itemId = container->getObjectInSlot(s_defaultWeaponSlotId, error); if (error == Container::CEC_Success) @@ -3097,7 +3097,7 @@ WeaponObject *CreatureObject::getDefaultWeapon() const if (so) defaultWeapon = so->asWeaponObject(); } - FATAL(!s_allowNullDefaultWeapon && defaultWeapon == NULL, ("CreatureObject::getDefaultWeapon, weapon is NULL! Object in default slot is %s", itemId.getValueString().c_str())); + FATAL(!s_allowNullDefaultWeapon && defaultWeapon == nullptr, ("CreatureObject::getDefaultWeapon, weapon is nullptr! Object in default slot is %s", itemId.getValueString().c_str())); } return defaultWeapon; } @@ -3376,7 +3376,7 @@ void CreatureObject::updateSlopeMovement(const std::string & modName) recomputeSlopeModPercent(); // if I'm modifiying the group slope mod and I'm a group leader, // update my group's speed - else if (modName == GROUP_SLOPE_MOD && getGroup() != NULL && + else if (modName == GROUP_SLOPE_MOD && getGroup() != nullptr && getGroup()->getGroupLeaderId() == getNetworkId()) { const GroupObject::GroupMemberVector & members = getGroup()->getGroupMembers(); @@ -3385,7 +3385,7 @@ void CreatureObject::updateSlopeMovement(const std::string & modName) { CreatureObject * member = safe_cast( NetworkIdManager::getObjectById((*iter).first)); - if (member != NULL) + if (member != nullptr) member->recomputeSlopeModPercent(); } } @@ -3581,7 +3581,7 @@ int CreatureObject::getExperiencePoints(const std::string & experienceType) cons if (isPlayerControlled()) { const PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->getExperiencePoints(experienceType); } return 0; @@ -3595,7 +3595,7 @@ const std::map & CreatureObject::getExperiencePoints() const if(isPlayerControlled()) { const PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if(playerObject != NULL) + if(playerObject != nullptr) { return playerObject->getExperiencePoints(); } @@ -3617,7 +3617,7 @@ const int CreatureObject::grantExperiencePoints(const std::string & experienceTy if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) { int const amountGranted = playerObject->grantExperiencePoints(experienceType, amount); @@ -3770,7 +3770,7 @@ void CreatureObject::revokeSkill(const SkillObject & oldSkill, bool silent) PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if ((playerObject != NULL) && + if ((playerObject != nullptr) && (oldSkill.getSkillName() == playerObject->getTitle())) { StringId message("shared", "skill_title_removed"); @@ -3809,7 +3809,7 @@ const bool CreatureObject::grantSchematicGroup(const std::string & groupNameWith if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->grantSchematicGroup(groupNameWithModifier, fromSkill); } return false; @@ -3829,7 +3829,7 @@ const bool CreatureObject::grantSchematic(uint32 schematicCrc, bool fromSkill) if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->grantSchematic(schematicCrc, fromSkill); } return false; @@ -3849,7 +3849,7 @@ const bool CreatureObject::revokeSchematic(uint32 schematicCrc, bool fromSkill) if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->revokeSchematic(schematicCrc, fromSkill); } return false; @@ -3869,7 +3869,7 @@ const bool CreatureObject::hasSchematic(uint32 schematicCrc) if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->hasSchematic(schematicCrc); } return false; @@ -3909,7 +3909,7 @@ void CreatureObject::setInCombat(bool inCombat) PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL && player->isCrafting()) + if (player != nullptr && player->isCrafting()) { player->stopCrafting(false); } @@ -4274,10 +4274,10 @@ static const int internalTagBufLen = strlen(internalTagBuf); mod.value, m_attributes[mod.attrib] + mod.value); DEBUG_REPORT_LOG (true, ("%s", debugBuffer)); - if (attacker != NULL) + if (attacker != nullptr) { Client *client = attacker->getClient(); - if (client != NULL) + if (client != nullptr) ConsoleMgr::broadcastString(debugBuffer, client); } } @@ -4359,8 +4359,8 @@ static const int internalTagBufLen = strlen(internalTagBuf); else { const char * modName = AttribModNameManager::getInstance().getAttribModName(mod.tag); - if (modName == NULL) - modName = ""; + if (modName == nullptr) + modName = ""; WARNING(true, ("Creature %s received a mod %s with invalid " "attack(%.2f) or duration(%.2f)", getNetworkId().getValueString().c_str(), modName, mod.attack, @@ -4438,7 +4438,7 @@ void CreatureObject::removeAttributeModifier (const std::string & modName) if (AttribMod::isSkillMod(m.mod)) { const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill); - if (skillModName != NULL) + if (skillModName != nullptr) addModValue(skillModName, -m.maxVal, true); else { @@ -4569,7 +4569,7 @@ void CreatureObject::removeAllAttributeAndSkillmodMods () if (AttribMod::isSkillMod(m.mod)) { const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill); - if (skillModName != NULL) + if (skillModName != nullptr) addModValue(skillModName, -m.maxVal, true); } // if the mod is visible, we need to tell the player it's being @@ -4582,7 +4582,7 @@ void CreatureObject::removeAllAttributeAndSkillmodMods () if (m.mod.flags & AttribMod::AMF_triggerOnDone) { const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag); - if (modName != NULL) + if (modName != nullptr) { ScriptParams params; params.addParam(modName); @@ -4624,7 +4624,7 @@ void CreatureObject::removeAllAttributeAndSkillmodMods () * * @param modName the mod to look for * - * @return the mod, or NULL if there is no mod with that name attached to us + * @return the mod, or nullptr if there is no mod with that name attached to us */ const AttribMod::AttribMod * CreatureObject::getAttributeModifier( const std::string & modName) const @@ -4642,7 +4642,7 @@ const AttribMod::AttribMod * CreatureObject::getAttributeModifier( if (found != m_attributeModList.end()) return &((*found).second.mod); } - return NULL; + return nullptr; } // CreatureObject::getAttributeModifier //----------------------------------------------------------------------- @@ -4666,7 +4666,7 @@ const std::map & CreatureObject::getAttributeModifiers() co */ void CreatureObject::sendTimedModData(uint32 id, float time, bool updateCache/* = true*/) { - if (isPlayerControlled() && getController() != NULL && id != 0) + if (isPlayerControlled() && getController() != nullptr && id != 0) { MessageQueueGenericValueType > * const msg = new MessageQueueGenericValueType >( @@ -4707,7 +4707,7 @@ void CreatureObject::sendTimedModData(uint32 id, float time, bool updateCache/* */ void CreatureObject::sendCancelTimedMod(uint32 id) { - if (isPlayerControlled() && getController() != NULL && id != 0) + if (isPlayerControlled() && getController() != nullptr && id != 0) { MessageQueueGenericValueType * const msg = new MessageQueueGenericValueType(id); @@ -4764,7 +4764,7 @@ void CreatureObject::applyDamage(const CombatEngineData::DamageData &damageData) // if the attacker is a player and we are not, and we are incapped/dead, // don't allow additional damage - if (attacker != NULL && attacker->isPlayerControlled() && !isPlayerControlled() && + if (attacker != nullptr && attacker->isPlayerControlled() && !isPlayerControlled() && (isIncapacitated() || isDead())) { return; @@ -5018,7 +5018,7 @@ void CreatureObject::decayAttributes(float time) if (AttribMod::isSkillMod(m.mod)) { const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill); - if (skillModName != NULL) + if (skillModName != nullptr) { addModValue(skillModName, -m.maxVal, true); @@ -5051,7 +5051,7 @@ void CreatureObject::decayAttributes(float time) { // tell scripts the mod has ended const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag); - if (modName != NULL) + if (modName != nullptr) { ScriptParams params; params.addParam(modName); @@ -5112,7 +5112,7 @@ void CreatureObject::decayAttributes(float time) // add the skillmod mod as if it were from a skill, // which makes it temporary const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill); - if (skillModName != NULL) + if (skillModName != nullptr) addModValue(skillModName, delta, true); else { @@ -6014,7 +6014,7 @@ static const std::map,int> npcSchematics; if (isPlayerControlled()) { PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) return playerObject->getDraftSchematics(); } return npcSchematics; @@ -6032,11 +6032,11 @@ static const std::map,int> npcSchematics; bool CreatureObject::isIngredientInInventory(const Object & ingredient) const { const ServerObject * inventory = getInventory(); - if (inventory == NULL) + if (inventory == nullptr) return false; const Object * container = ContainerInterface::getContainedByObject(ingredient); - while (container != NULL) + while (container != nullptr) { if (inventory->getNetworkId() == container->getNetworkId() || getNetworkId() == container->getNetworkId()) @@ -6057,7 +6057,7 @@ bool CreatureObject::isIngredientInInventory(const Object & ingredient) const */ void CreatureObject::disableSchematicFiltering() { - if (getClient() == NULL || !getClient()->isGod()) + if (getClient() == nullptr || !getClient()->isGod()) return; setObjVarItem(OBJVAR_DISABLE_SCHEMATIC_FILTER, 1); @@ -6071,7 +6071,7 @@ void CreatureObject::disableSchematicFiltering() */ void CreatureObject::enableSchematicFiltering() { - if (getClient() == NULL || !getClient()->isGod()) + if (getClient() == nullptr || !getClient()->isGod()) return; removeObjVarItem(OBJVAR_DISABLE_SCHEMATIC_FILTER); @@ -6087,7 +6087,7 @@ void CreatureObject::enableSchematicFiltering() */ bool CreatureObject::isSchematicFilteringEnabled() { - if (getClient() == NULL || !getClient()->isGod()) + if (getClient() == nullptr || !getClient()->isGod()) return true; return (!getObjVars().hasItem(OBJVAR_DISABLE_SCHEMATIC_FILTER)); @@ -6103,17 +6103,17 @@ bool CreatureObject::isSchematicFilteringEnabled() void CreatureObject::getManufactureSchematics(std::vector & schematics) { const ServerObject * datapad = getDatapad(); - if (datapad == NULL) + if (datapad == nullptr) return; const VolumeContainer * container = ContainerInterface::getVolumeContainer(*datapad); - if (container == NULL) + if (container == nullptr) return; for (ContainerConstIterator iter = container->begin(); iter != container->end(); ++iter) { const ManufactureSchematicObject * schematic = dynamic_cast((*iter).getObject()); - if (schematic != NULL) + if (schematic != nullptr) schematics.push_back(schematic); } } // CreatureObject::getManufactureSchematics(unfiltered) @@ -6130,17 +6130,17 @@ void CreatureObject::getManufactureSchematics(std::vector & schematics, uint32 craftingTypes) { const ServerObject * datapad = getDatapad(); - if (datapad == NULL) + if (datapad == nullptr) return; const VolumeContainer * container = ContainerInterface::getVolumeContainer(*datapad); - if (container == NULL) + if (container == nullptr) return; for (ContainerConstIterator iter = container->begin(); iter != container->end(); ++iter) { const ManufactureSchematicObject * schematic = dynamic_cast((*iter).getObject()); - if (schematic != NULL && ((schematic->getCategory() & craftingTypes) != 0)) + if (schematic != nullptr && ((schematic->getCategory() & craftingTypes) != 0)) schematics.push_back(schematic); } } // CreatureObject::getManufactureSchematics(filtered) @@ -6278,7 +6278,7 @@ void CreatureObject::setIncapacitated(bool flag, const NetworkId & attackerId) // if we are crafting, end the crafting session PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL && player->isCrafting()) + if (player != nullptr && player->isCrafting()) player->stopCrafting(false); if (isInNpcConversation()) @@ -6299,7 +6299,7 @@ void CreatureObject::setIncapacitated(bool flag, const NetworkId & attackerId) // invoke incapacitation script on who incapacitated us ServerObject * attacker = safe_cast( NetworkIdManager::getObjectById(attackerId)); - if (attacker != NULL) + if (attacker != nullptr) { params.clear(); params.addParam(getNetworkId()); @@ -6308,7 +6308,7 @@ void CreatureObject::setIncapacitated(bool flag, const NetworkId & attackerId) TangibleObject * const tangibleAttacker = attacker->asTangibleObject(); - if (tangibleAttacker != NULL) + if (tangibleAttacker != nullptr) { tangibleAttacker->verifyHateList(); } @@ -6335,7 +6335,7 @@ void CreatureObject::setIncapacitated(bool flag, const NetworkId & attackerId) setPosture(Postures::Upright); } // if we are a player, send us our new posture - if ((getController() != NULL) && !isInCombat()) + if ((getController() != nullptr) && !isInCombat()) { getController()->appendMessage( CM_setPosture, @@ -6466,7 +6466,7 @@ void CreatureObject::updateMovementInfo() rider->requestMovementInfoUpdate(); else { - LOG("mounts-bug", ("CreatureObject::updateMovementInfo(): server id=[%d],mount id=[%s],has MountedCreature state but getMountingRider() returns null.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str())); + LOG("mounts-bug", ("CreatureObject::updateMovementInfo(): server id=[%d],mount id=[%s],has MountedCreature state but getMountingRider() returns nullptr.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str())); detachAllRiders(); } } @@ -6538,7 +6538,7 @@ void CreatureObject::setPosture(Postures::Enumerator newPosture, bool isClientIm // guaranteed to be the authoritative object, this is an invalid thing to do. requestMovementInfoUpdate(); - if (getScriptObject() != NULL) + if (getScriptObject() != nullptr) { ScriptParams params; params.addParam(oldPosture); @@ -6950,13 +6950,13 @@ bool CreatureObject::onContainerAboutToTransfer(ServerObject * destination, Serv int CreatureObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer) { TangibleObject const * const object = item.asTangibleObject(); - if (object != NULL) + if (object != nullptr) { // See if this item is equippable const char *sharedTemplateName = item.getSharedTemplateName(); if (!isAppearanceEquippable(sharedTemplateName)) { - if (getClient() != NULL) + if (getClient() != nullptr) { StringId message("shared", "item_not_equippable"); Unicode::String outOfBand; @@ -6984,7 +6984,7 @@ int CreatureObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* void CreatureObject::onContainerLostItem(ServerObject *destination, ServerObject &item, ServerObject *transferer) { TangibleObject const * const tangibleObject = item.asTangibleObject(); - if (tangibleObject == NULL) + if (tangibleObject == nullptr) return; // check if the object applies skill mod bonuses when equipped @@ -7026,12 +7026,12 @@ void CreatureObject::onContainerLostItem(ServerObject *destination, ServerObject // if the item is a weapon, make our current weapon our default weapon WeaponObject const * const weaponObject = tangibleObject->asWeaponObject(); - if (weaponObject != NULL && getDefaultWeapon() != NULL) + if (weaponObject != nullptr && getDefaultWeapon() != nullptr) setCurrentWeapon(*getDefaultWeapon()); // check if the object is our shield if (tangibleObject == m_shield) - m_shield = NULL; + m_shield = nullptr; //Update wearbles data SlottedContainmentProperty* scp = ContainerInterface::getSlottedContainmentProperty(item); @@ -7060,7 +7060,7 @@ void CreatureObject::onContainerLostItem(ServerObject *destination, ServerObject void CreatureObject::onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer) { TangibleObject * const tangibleObject = item.asTangibleObject(); - if (tangibleObject == NULL) + if (tangibleObject == nullptr) return; // check if the object applies skill mod bonuses when equipped @@ -7100,7 +7100,7 @@ void CreatureObject::onContainerGainItem(ServerObject& item, ServerObject* sourc // if the item is a weapon, make it our current weapon WeaponObject * const weaponObject = tangibleObject->asWeaponObject(); - if (weaponObject != NULL) + if (weaponObject != nullptr) setCurrentWeapon(*weaponObject); //Update wearables data @@ -7141,7 +7141,7 @@ void CreatureObject::onContainerGainItem(ServerObject& item, ServerObject* sourc ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tangibleObject->getClientSharedTemplateName()); if (clientSharedTemplateNameCrcString.isEmpty()) WARNING(true, ("Could not find crc for %s. Wearable will not be streamed to client", tangibleObject->getClientSharedTemplateName())); - else if (tangibleObject->asWeaponObject() != NULL) + else if (tangibleObject->asWeaponObject() != nullptr) { addPackedWearable(tangibleObject->getAppearanceData(), scp->getCurrentArrangement(), tangibleObject->getNetworkId(), clientSharedTemplateNameCrcString.getCrc(), tangibleObject->createSharedBaselinesMessage(), tangibleObject->createSharedNpBaselinesMessage()); @@ -7591,7 +7591,7 @@ void CreatureObject::onClientReady(Client *c) { time_t timeUnsquelch = static_cast(player->getSecondsUntilUnsquelched()); if (timeUnsquelch > 0) - timeUnsquelch += ::time(NULL); + timeUnsquelch += ::time(nullptr); GenericValueTypeMessage, int>, std::pair > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(getNetworkId(), static_cast(timeUnsquelch)), player->getChatSpamTimeEndInterval()), std::make_pair(player->getChatSpamSpatialNumCharacters(), player->getChatSpamNonSpatialNumCharacters()))); Chat::sendToChatServer(chatStatistics); @@ -7926,7 +7926,7 @@ bool CreatureObject::makeDead(const NetworkId & killer, const NetworkId & corpse // if we are crafting, end the crafting session PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL && player->isCrafting()) + if (player != nullptr && player->isCrafting()) player->stopCrafting(false); // if we are in a conversation, end it @@ -7991,7 +7991,7 @@ bool CreatureObject::makeDead(const NetworkId & killer, const NetworkId & corpse if (AttribMod::isSkillMod(m.mod)) { const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill); - if (skillModName != NULL) + if (skillModName != nullptr) addModValue(skillModName, -m.maxVal, true); } // if the mod is visible, we need to tell the player it's being @@ -8004,7 +8004,7 @@ bool CreatureObject::makeDead(const NetworkId & killer, const NetworkId & corpse if (m.mod.flags & AttribMod::AMF_triggerOnDone) { const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag); - if (modName != NULL) + if (modName != nullptr) { ScriptParams params; params.addParam(modName); @@ -8149,7 +8149,7 @@ Object const * CreatureObject::getStandingOn() const } else { - return NULL; + return nullptr; } } @@ -8302,7 +8302,7 @@ bool CreatureObject::setSlopeModPercent(float percent) // get my skill mod int movementMod = getEnhancedModValue(SLOPE_MOD); - if (getGroup() != NULL) + if (getGroup() != nullptr) { // get my group leader skill mod const NetworkId & leaderId = getGroup()->getGroupLeaderId(); @@ -8310,7 +8310,7 @@ bool CreatureObject::setSlopeModPercent(float percent) { const CreatureObject * leader = safe_cast( NetworkIdManager::getObjectById(leaderId)); - if (leader != NULL) + if (leader != nullptr) { movementMod += leader->getEnhancedModValue(GROUP_SLOPE_MOD); } @@ -8519,7 +8519,7 @@ void CreatureObject::onBiographyRetrieved(const NetworkId &owner, const Unicode: CreatureController *creatureController = getCreatureController(); - if (creatureController != NULL) + if (creatureController != nullptr) { typedef std::pair Payload; @@ -8535,7 +8535,7 @@ void CreatureObject::onCharacterMatchRetrieved(MatchMakingCharacterResult const { CreatureController *creatureController = getCreatureController(); - if (creatureController != NULL) + if (creatureController != nullptr) { MessageQueueGenericValueType * const msg = new MessageQueueGenericValueType(results); @@ -8939,7 +8939,7 @@ bool CreatureObject::isAppearanceEquippable(const char *appearanceTemplateName) // Make sure this object has a valid appearance - if (appearanceTemplateName == NULL) + if (appearanceTemplateName == nullptr) { result = false; } @@ -9063,7 +9063,7 @@ void CreatureObject::updatePlanetServerInternal(const bool forceUpdate) const AICreatureController const * const aiCreatureController = dynamic_cast(getCreatureController()); Object const * const topmostContainer = ContainerInterface::getTopmostContainer(*this); - FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned NULL", getNetworkId().getValueString().c_str())); + FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned nullptr", getNetworkId().getValueString().c_str())); Vector const &position = topmostContainer->getPosition_p(); UpdateObjectOnPlanetMessage const msg( getNetworkId(), @@ -9265,7 +9265,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) // set objvar to indicate there's a pending rename request for this character, // and the time of the rename request, to enforce the 90 days wait between rename if (!getClient() || !getClient()->isGod()) - setObjVarItem("renameCharacterRequest.requestTime", static_cast(::time(NULL))); + setObjVarItem("renameCharacterRequest.requestTime", static_cast(::time(nullptr))); std::string const newName(message.getDataAsString()); if (getObjVars().hasItem("renameCharacterRequest.requestTime") && !newName.empty()) @@ -9306,7 +9306,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) if (!getObjVars().hasItem(OBJVAR_ADD_JEDI_ACK)) { PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL) + if (player != nullptr) { player->addJediToAccount(); MessageToQueue::getInstance().sendMessageToC(getNetworkId(), @@ -9461,7 +9461,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) MessageToQueue::cancelRecurringMessageTo(getNetworkId(), "C++WaitForPatrolPreload"); AICreatureController * const aiCreatureController = safe_cast(getController()); - if (aiCreatureController != NULL) + if (aiCreatureController != nullptr) { const std::string data = message.getDataAsString(); std::string::size_type locationStart = 0; @@ -9797,7 +9797,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 2)) { existingWarden = NetworkId(Unicode::wideToNarrow(tokens[0])); @@ -9874,7 +9874,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 2)) { existingWarden = NetworkId(Unicode::wideToNarrow(tokens[0])); @@ -9970,12 +9970,12 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) bool success = false; NetworkId actor, actorShip, group; std::string actorName; - GroupObject const * groupObject = NULL; + GroupObject const * groupObject = nullptr; StringId responseSid; Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 4)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 4)) { success = true; actor = NetworkId(Unicode::wideToNarrow(tokens[0])); @@ -9983,8 +9983,8 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) group = NetworkId(Unicode::wideToNarrow(tokens[2])); actorName = Unicode::wideToNarrow(tokens[3]); - ServerObject const * so = (group.isValid() ? safe_cast(NetworkIdManager::getObjectById(group)) : NULL); - groupObject = (so ? so->asGroupObject() : NULL); + ServerObject const * so = (group.isValid() ? safe_cast(NetworkIdManager::getObjectById(group)) : nullptr); + groupObject = (so ? so->asGroupObject() : nullptr); } if (success) @@ -10011,7 +10011,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) if (success) { GameScriptObject* const gso = getScriptObject(); - if (gso != NULL && gso->hasScript("ai.beast")) + if (gso != nullptr && gso->hasScript("ai.beast")) { responseSid = GroupStringId::SID_GROUP_BEASTS_CANT_JOIN; success = false; @@ -10092,7 +10092,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) } else if (message.getMethod() == "C++InviteToGroupRspTargetNotFound") { - Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_INVITE_NO_TARGET_SELF, NULL); + Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_INVITE_NO_TARGET_SELF, nullptr); } else if (message.getMethod() == "C++GroupOperationGenericRsp") { @@ -10101,7 +10101,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end()); Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(result), tokens, &delimiters, NULL)) && (tokens.size() == 3)) + if ((Unicode::tokenize(Unicode::narrowToWide(result), tokens, &delimiters, nullptr)) && (tokens.size() == 3)) { std::string const response(Unicode::wideToNarrow(tokens[0])); std::string const responseParmType(Unicode::wideToNarrow(tokens[1])); @@ -10138,7 +10138,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 2)) { success = true; actor = NetworkId(Unicode::wideToNarrow(tokens[0])); @@ -10194,7 +10194,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) } else if (message.getMethod() == "C++UninviteFromGroupRspTargetNotFound") { - Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_UNINVITE_NO_TARGET_SELF, NULL); + Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_UNINVITE_NO_TARGET_SELF, nullptr); } else if (message.getMethod() == "C++GroupJoinInviterInfoReq") { @@ -10250,7 +10250,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 10)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 10)) { success = true; existingGroupId = NetworkId(Unicode::wideToNarrow(tokens[0])); @@ -10265,17 +10265,17 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) inviterInCombat = (atoi(Unicode::wideToNarrow(tokens[9]).c_str()) != 0); } - GroupObject * existingGroup = NULL; + GroupObject * existingGroup = nullptr; if (success) { if (existingGroupId.isValid()) { ServerObject * so = safe_cast(NetworkIdManager::getObjectById(existingGroupId)); - existingGroup = (so ? so->asGroupObject() : NULL); + existingGroup = (so ? so->asGroupObject() : nullptr); if (!existingGroup) { success = false; - Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_EXISTING_GROUP_NOT_FOUND, NULL); + Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_EXISTING_GROUP_NOT_FOUND, nullptr); } } } @@ -10318,7 +10318,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) if (existingGroup && !GroupHelpers::roomInGroup(existingGroup, targets.size())) { success = false; - Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_JOIN_FULL, NULL); + Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_JOIN_FULL, nullptr); } } @@ -10390,7 +10390,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) } else if (message.getMethod() == "C++GroupJoinInviterInfoReqInviterNotFound") { - Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_MUST_BE_INVITED, NULL); + Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_MUST_BE_INVITED, nullptr); } else if (message.getMethod() == "C++LeaveGroupReq") { @@ -10417,7 +10417,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 5)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 5)) { // tell group member that the group pickup point has been created if (getClient()) @@ -10767,7 +10767,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailCannotCreateCharacter", dictionary->getSerializedData(), 0, false); @@ -10781,7 +10781,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailDestGalaxyUnavailable", dictionary->getSerializedData(), 0, false); @@ -10801,7 +10801,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailCannotCreateCharacter", dictionary->getSerializedData(), 0, false); @@ -10815,7 +10815,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailDestGalaxyUnavailable", dictionary->getSerializedData(), 0, false); @@ -10854,7 +10854,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getValue().first.c_str(), "reason"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailNameValidation", dictionary->getSerializedData(), 0, false); @@ -10868,7 +10868,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getValue().first.c_str(), "reason"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailNameValidation", dictionary->getSerializedData(), 0, false); @@ -10882,7 +10882,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateSuccess", dictionary->getSerializedData(), 0, false); @@ -10895,7 +10895,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateSuccess", dictionary->getSerializedData(), 0, false); @@ -10906,7 +10906,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) else if (message.getMethod() == "C++PickupAllRoomItemsIntoInventory") { // use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code - PlayerObject * playerObject = NULL; + PlayerObject * playerObject = nullptr; while (true) { playerObject = PlayerCreatureController::getPlayerObject(this); @@ -11148,7 +11148,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) else if (message.getMethod() == "C++DropAllInventoryItemsIntoRoom") { // use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code - PlayerObject * playerObject = NULL; + PlayerObject * playerObject = nullptr; while (true) { playerObject = PlayerCreatureController::getPlayerObject(this); @@ -11355,7 +11355,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) else if (message.getMethod() == "C++RestoreDecorationLayout") { // use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code - PlayerObject * playerObject = NULL; + PlayerObject * playerObject = nullptr; while (true) { playerObject = PlayerCreatureController::getPlayerObject(this); @@ -11681,7 +11681,7 @@ void CreatureObject::virtualOnReleaseAuthority() if(controller) { - if (getProperty(SlopeEffectProperty::getClassPropertyId()) != NULL) + if (getProperty(SlopeEffectProperty::getClassPropertyId()) != nullptr) removeProperty(SlopeEffectProperty::getClassPropertyId()); controller->setAuthority(false); } @@ -11693,7 +11693,7 @@ void CreatureObject::virtualOnLogout() { TangibleObject::virtualOnLogout(); PlayerObject * const player = PlayerCreatureController::getPlayerObject(this); - if (player != NULL) + if (player != nullptr) player->virtualOnLogout(); } @@ -11789,7 +11789,7 @@ void CreatureObject::packWearables() ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tang->getClientSharedTemplateName()); if (clientSharedTemplateNameCrcString.isEmpty()) WARNING(true, ("Could not find crc for [%s]. Wearable will not be streamed to client", tang->getClientSharedTemplateName())); - else if (so->asWeaponObject() != NULL) + else if (so->asWeaponObject() != nullptr) { addPackedWearable(tang->getAppearanceData(), scp->getCurrentArrangement(), tang->getNetworkId(), clientSharedTemplateNameCrcString.getCrc(), tang->createSharedBaselinesMessage(), tang->createSharedNpBaselinesMessage()); @@ -12048,7 +12048,7 @@ int CreatureObject::loadPackedHouses() ++hcdIter) { Object * const houseId = (*hcdIter).getObject(); - BuildingObject * const house = (houseId ? houseId->asServerObject()->asBuildingObject() : NULL); + BuildingObject * const house = (houseId ? houseId->asServerObject()->asBuildingObject() : nullptr); if (house && !house->getContentsLoaded()) { LOG("CustomerService", ("CharacterTransfer: starting packed house load (%s) for CTS character %s", house->getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(this).c_str())); @@ -12612,7 +12612,7 @@ void CreatureObject::unequipAllItems() Container::ContainerErrorCode errorCode = Container::CEC_Success; Container::ContainedItem inventoryContainedItem = equipmentContainer->getObjectInSlot(s_inventorySlotId, errorCode); Object *const inventoryObjectBase = inventoryContainedItem.getObject(); - ServerObject *const inventoryObject = inventoryObjectBase ? inventoryObjectBase->asServerObject() : NULL; + ServerObject *const inventoryObject = inventoryObjectBase ? inventoryObjectBase->asServerObject() : nullptr; if (!inventoryObject || (errorCode != Container::CEC_Success)) { WARNING(true, @@ -12629,7 +12629,7 @@ void CreatureObject::unequipAllItems() if (!inventoryContainer) { WARNING(true, - ("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d]: inventory object is NULL.", + ("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d]: inventory object is nullptr.", getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast(GameServer::getInstance().getProcessId()) @@ -12648,11 +12648,11 @@ void CreatureObject::unequipAllItems() // Get the equipment item. Container::ContainedItem containedItem = *it; Object *const objectBase = containedItem.getObject(); - ServerObject *const object = objectBase ? objectBase->asServerObject() : NULL; + ServerObject *const object = objectBase ? objectBase->asServerObject() : nullptr; if (!object) { WARNING(true, - ("null object in equipment container for object id=[%s]: equipment item id=[%s].", + ("nullptr object in equipment container for object id=[%s]: equipment item id=[%s].", getNetworkId().getValueString().c_str(), containedItem.getValueString().c_str() )); @@ -12686,7 +12686,7 @@ void CreatureObject::unequipAllItems() if (!object) continue; - ContainerInterface::transferItemToVolumeContainer(*inventoryObject, *object, NULL, errorCode); + ContainerInterface::transferItemToVolumeContainer(*inventoryObject, *object, nullptr, errorCode); WARNING(errorCode != Container::CEC_Success, ("unequipAllItems(): CreatureObject id=[%s] failed to transfer item id=[%s], template=[%s] from equipment to inventory container, container error code [%d].", getNetworkId().getValueString().c_str(), @@ -13322,18 +13322,18 @@ CreatureObject * CreatureObject::getCreatureObject(NetworkId const & networkId) CreatureObject const * CreatureObject::asCreatureObject(Object const * object) { - ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject const * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->asCreatureObject() : NULL; + return (serverObject != nullptr) ? serverObject->asCreatureObject() : nullptr; } // ---------------------------------------------------------------------- CreatureObject * CreatureObject::asCreatureObject(Object * object) { - ServerObject * serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->asCreatureObject() : NULL; + return (serverObject != nullptr) ? serverObject->asCreatureObject() : nullptr; } // ---------------------------------------------------------------------- @@ -13474,7 +13474,7 @@ void CreatureObject::pushedMe(const NetworkId & attackerId, UNREF(defenderPos); Vector offset(getPosition_w()); - if (attacker != NULL) + if (attacker != nullptr) offset -= attacker->getPosition_w(); else offset -= attackerPos; @@ -13489,14 +13489,14 @@ void CreatureObject::pushedMe(const NetworkId & attackerId, move_p(rotate_w2p(offset)); AICreatureController *controller = dynamic_cast(getController()); - if (controller != NULL) + if (controller != nullptr) { // we only need to do this for npcs, because we'll use the update from a player's client for players // we need to do this for npcs to prevent the ai from moving them back to their previous position const Vector newPos(getPosition_p()); float closestPortalT = 0.0f; const CellProperty * destinationCell = getParentCell()->getDestinationCell(oldPos, newPos, closestPortalT); - if (destinationCell == NULL || destinationCell == getParentCell()) + if (destinationCell == nullptr || destinationCell == getParentCell()) { // no cell change controller->warpTo(getParentCell(), newPos); @@ -13576,7 +13576,7 @@ bool CreatureObject::addSlowDownEffectProxy(const TangibleObject & defender, flo { // if we already are doing a slowdown, don't do another Property * property = getProperty(SlowDownProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) return false; property = new SlowDownProperty(*this, CachedNetworkId(defender), coneLength, coneAngle, slopeAngle, expireTime); @@ -13598,11 +13598,11 @@ void CreatureObject::removeSlowDownEffect() // tell all my proxies (client and server) to remove the effect Controller * const controller = getController(); if (controller) - controller->appendMessage(CM_removeSlowDownEffectProxy, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT | GameControllerMessageFlags::DEST_PROXY_SERVER); + controller->appendMessage(CM_removeSlowDownEffectProxy, 0, nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT | GameControllerMessageFlags::DEST_PROXY_SERVER); } else { - sendControllerMessageToAuthServer(CM_removeSlowDownEffect, NULL); + sendControllerMessageToAuthServer(CM_removeSlowDownEffect, nullptr); } } @@ -13613,7 +13613,7 @@ void CreatureObject::removeSlowDownEffect() */ void CreatureObject::removeSlowDownEffectProxy() { - if (getProperty(SlowDownProperty::getClassPropertyId()) != NULL) + if (getProperty(SlowDownProperty::getClassPropertyId()) != nullptr) removeProperty(SlowDownProperty::getClassPropertyId()); } @@ -13631,7 +13631,7 @@ void CreatureObject::addTerrainSlopeEffect(const Vector & normal) if (isAuthoritative() && !isPlayerControlled()) { Property * property = getProperty(SlopeEffectProperty::getClassPropertyId()); - if (property == NULL) + if (property == nullptr) { property = new SlopeEffectProperty(*this); addProperty(*property, true); @@ -13994,7 +13994,7 @@ void CreatureObject::setLevel(int level) else { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject == NULL) + if (playerObject == nullptr) { // this is an ai, so just set the level m_level = (int16) level; @@ -14014,7 +14014,7 @@ void CreatureObject::setLevel(int level) void CreatureObject::recalculateLevel() { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) { if (!isAuthoritative()) { @@ -14044,7 +14044,7 @@ void CreatureObject::recalculateLevel() void CreatureObject::setLevelData(int16 level, int levelXp, int health) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) { m_totalLevelXp = levelXp; @@ -14278,7 +14278,7 @@ bool CreatureObject::doesLocomotionInvalidateCommand(Command const &cmd) const CommandQueue * CreatureObject::getCommandQueue() const { - if (m_commandQueue == NULL) + if (m_commandQueue == nullptr) { m_commandQueue = CommandQueue::getCommandQueue(*const_cast(this)); } @@ -14667,7 +14667,7 @@ void CreatureObject::incrementKillMeter(int amount) if (isPlayerControlled()) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this); - if (playerObject != NULL) + if (playerObject != nullptr) { playerObject->incrementKillMeter(amount); } @@ -14812,7 +14812,7 @@ void CreatureObject::getLfgCharacterData(LfgCharacterData & lfgCharacterData) co Vector const creaturePosition = findPosition_w(); Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(planetObject->getName(), creaturePosition.x, creaturePosition.z); - if (region != NULL) + if (region != nullptr) lfgCharacterData.locationRegion = Unicode::wideToNarrow(region->getName()); // handle factional presence @@ -14853,7 +14853,7 @@ void CreatureObject::getLfgCharacterData(LfgCharacterData & lfgCharacterData) co { // is factional presence allowed while mounted? if (ConfigServerGame::getGcwFactionalPresenceMountedPct() <= 0) - playerOrMount = NULL; + playerOrMount = nullptr; } else { @@ -14863,7 +14863,7 @@ void CreatureObject::getLfgCharacterData(LfgCharacterData & lfgCharacterData) co if (playerOrMount) { CollisionProperty const * const collisionProperty = playerOrMount->getCollisionProperty(); - Footprint const * const footprint = (collisionProperty ? collisionProperty->getFootprint() : NULL); + Footprint const * const footprint = (collisionProperty ? collisionProperty->getFootprint() : nullptr); bool isOnSolidFloor = (footprint && footprint->isOnSolidFloor()); if (isOnSolidFloor) { @@ -14939,7 +14939,7 @@ void CreatureObject::getLfgCharacterData(LfgCharacterData & lfgCharacterData) co if (i.getValue(ctsTransactionDetail)) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4)) + if (Unicode::tokenize(ctsTransactionDetail, tokens, nullptr, nullptr) && (tokens.size() >= 4)) { IGNORE_RETURN(lfgCharacterData.ctsSourceGalaxy.insert(Unicode::wideToNarrow(tokens[1]))); } @@ -15094,7 +15094,7 @@ void CreatureObjectNamespace::restoreItemDecorationLayout(CreatureObject & decor // item is not currently in the target room, need to move it bool needToMoveItem = false; bool needToRotateItem = false; - Transform const * itemCurrentTransform = NULL; + Transform const * itemCurrentTransform = nullptr; if (itemContainingCell->getNetworkId() != cellSo->getNetworkId()) { needToMoveItem = true; @@ -15344,7 +15344,7 @@ void CreatureObject::addPackedAppearanceWearable(std::string const &appearanceDa } } //-- Add the new entry. - m_wearableAppearanceData.push_back(WearableEntry(appearanceData, arrangementIndex, networkId, sharedTemplateCrcValue, NULL, NULL)); + m_wearableAppearanceData.push_back(WearableEntry(appearanceData, arrangementIndex, networkId, sharedTemplateCrcValue, nullptr, nullptr)); } // ---------------------------------------------------------------------- @@ -15511,7 +15511,7 @@ void CreatureObject::saveDecorationLayout(ServerObject const & pobSourceObject, } snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.saveTime", saveSlotNumber); - playerObj->setObjVarItem(buffer1, static_cast(::time(NULL))); + playerObj->setObjVarItem(buffer1, static_cast(::time(nullptr))); snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.pobName", saveSlotNumber); playerObj->setObjVarItem(buffer1, containingPOB->getObjectNameStringId().localize()); @@ -15607,7 +15607,7 @@ void CreatureObject::restoreDecorationLayout(ServerObject const & pobTargetObjec } // don't allow another restore on the pob while one is still in progress - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int restoreDecorationOperationTimeout = 0; if (getObjVars().getItem("restoreDecorationOperation.timeout", restoreDecorationOperationTimeout) && (restoreDecorationOperationTimeout > timeNow)) { diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.h b/engine/server/library/serverGame/src/shared/object/CreatureObject.h index f2fb0607..a1fab43b 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.h +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.h @@ -194,7 +194,7 @@ public: virtual void onClientReady (Client *c); virtual void onClientAboutToLoad(); virtual void onLoadingScreenComplete(); - virtual bool canManipulateObject(ServerObject const &target, bool movingObject, bool doPermissionCheckOnItem, bool doPermissionCheckOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = NULL) const; + virtual bool canManipulateObject(ServerObject const &target, bool movingObject, bool doPermissionCheckOnItem, bool doPermissionCheckOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = nullptr) const; virtual void onRemovingFromWorld(); void addMembersToPackages(); @@ -330,7 +330,7 @@ public: void addAttributeModifier(const std::string & name, Attributes::Enumerator attrib, int value, float duration, float attackRate, float decayRate, int flags); void addSkillmodModifier(const std::string & name, const std::string & skill, int value, float duration, int flags); - int addAttributeModifier(const AttribMod::AttribMod & mod, ServerObject * attacker = NULL); + int addAttributeModifier(const AttribMod::AttribMod & mod, ServerObject * attacker = nullptr); bool hasAttribModifier(const std::string & modName) const; void removeAttributeModifier(const std::string & modName); void removeAttributeModifiers(Attributes::Enumerator attribute); @@ -747,7 +747,7 @@ private: void testIncapacitation(const NetworkId & attackerId); void initializeNewPlayer (); - void addPackedWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue, const BaselinesMessage * weaponSharedBaselines = NULL, const BaselinesMessage * weaponSharedNpBaselines = NULL); + void addPackedWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue, const BaselinesMessage * weaponSharedBaselines = nullptr, const BaselinesMessage * weaponSharedNpBaselines = nullptr); void addPackedAppearanceWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue); void packWearables(); void computeTotalAttributes (); diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp index 1b164c1e..a0367619 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp @@ -77,18 +77,18 @@ CreatureObject * CreatureObjectNamespace::realGetMountingRider(CreatureObject co { //-- Ensure mounts are enabled. if (!ConfigServerGame::getMountsEnabled()) - return NULL; + return nullptr; //-- Get the rider element from the slotted container. SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*mount); if (!slottedContainer) - return NULL; + return nullptr; //-- Check for a rider. Container::ContainerErrorCode errorCode = Container::CEC_Success; CachedNetworkId riderId = slottedContainer->getObjectInSlot(slot, errorCode); if (errorCode != Container::CEC_Success) - return NULL; + return nullptr; Object * const riderObject = riderId.getObject(); @@ -236,7 +236,7 @@ bool CreatureObjectNamespace::realDetachRider(CreatureObject * const mount, Slot { // Transfer rider to world. // @todo: -TRF- transfer to mount's cell if we allow mounts inside cells. - IGNORE_RETURN(ContainerInterface::transferItemToWorld(*rider, mount->getTransform_o2w(), NULL, errorCode)); + IGNORE_RETURN(ContainerInterface::transferItemToWorld(*rider, mount->getTransform_o2w(), nullptr, errorCode)); if (errorCode == Container::CEC_Success) { detachedRider = true; @@ -318,7 +318,7 @@ void CreatureObject::transferRiderPositionToMount() CreatureObject *const mountObject = getMountedCreature(); if (!mountObject) { - LOG("mounts-bug", ("CreatureObject::transferRiderPositionToMount(): server id=[%d],object id=[%s] has state RidingMount but getMountedCreature() returns NULL.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str())); + LOG("mounts-bug", ("CreatureObject::transferRiderPositionToMount(): server id=[%d],object id=[%s] has state RidingMount but getMountedCreature() returns nullptr.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str())); emergencyDismountForRider(); return; } @@ -397,7 +397,7 @@ void CreatureObject::alterAuthoritativeForMounts() } } else - LOG(cs_mountErrorChannelName, ("unexpected: rider object id=[%s],template=[%s] is reporting state States::RidingMount turned on but getMountedCreature() returned NULL.", getNetworkId().getValueString().c_str(), getObjectTemplateName())); + LOG(cs_mountErrorChannelName, ("unexpected: rider object id=[%s],template=[%s] is reporting state States::RidingMount turned on but getMountedCreature() returned nullptr.", getNetworkId().getValueString().c_str(), getObjectTemplateName())); } else if (getState(States::MountedCreature)) { @@ -484,7 +484,7 @@ void CreatureObject::alterAnyForMounts() if (isAuthoritative() && !getState(States::MountedCreature)) { WARNING(true, - ("mounts sanity check failure: game server id=[%d], mount id=[%s,%s], rider id=[%s,%s]: authoritative mount does not have MountedCreature state set but getMountingRider returned a non-NULL value.", + ("mounts sanity check failure: game server id=[%d], mount id=[%s,%s], rider id=[%s,%s]: authoritative mount does not have MountedCreature state set but getMountingRider returned a non-nullptr value.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), isAuthoritative() ? "authoritative" : "proxy", @@ -511,7 +511,7 @@ void CreatureObject::alterAnyForMounts() // Ensure we don't have the mounted creature state set (only do check on authoritative mount). WARNING(isAuthoritative() && getState(States::MountedCreature), - ("mounts sanity check failure: game server id=[%d], mount id=[%s,%s]: authoritative mount does have MountedCreature state set but getMountingRider() returned a NULL value.", + ("mounts sanity check failure: game server id=[%d], mount id=[%s,%s]: authoritative mount does have MountedCreature state set but getMountingRider() returned a nullptr value.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), isAuthoritative() ? "authoritative" : "proxy" @@ -550,7 +550,7 @@ void CreatureObject::alterAnyForMounts() if (isAuthoritative() && !getState(States::RidingMount)) { WARNING(true, - ("mounts sanity check failure: game server id=[%d], rider id=[%s,%s], mount id=[%s,%s]: authoritative rider does not have RidingMount state set but getMountedCreature() returned a non-NULL value.", + ("mounts sanity check failure: game server id=[%d], rider id=[%s,%s], mount id=[%s,%s]: authoritative rider does not have RidingMount state set but getMountedCreature() returned a non-nullptr value.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), isAuthoritative() ? "authoritative" : "proxy", @@ -576,7 +576,7 @@ void CreatureObject::alterAnyForMounts() { // Ensure we don't have the RidingMount state set (only do check on authoritative rider). WARNING(isAuthoritative() && getState(States::RidingMount), - ("mounts sanity check failure: game server id=[%d], rider id=[%s,%s]: authoritative rider does have RidingMount state set but getMountedCreature() returned a NULL value.", + ("mounts sanity check failure: game server id=[%d], rider id=[%s,%s]: authoritative rider does have RidingMount state set but getMountedCreature() returned a nullptr value.", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), isAuthoritative() ? "authoritative" : "proxy" @@ -599,13 +599,13 @@ bool CreatureObject::onContainerAboutToTransferForMounts(ServerObject const * de // (i.e. the container creature has not yet been set.) We must clear the RidingMount // state on a rider prior to intentionally dismounting the rider (see and use detachRider() // on the mount object. - bool const canChangeContainerNow = (getMountedCreature() == NULL); + bool const canChangeContainerNow = (getMountedCreature() == nullptr); if (!canChangeContainerNow) { LOG("mounts-bug", ("CO::onContainerAboutToTransferForMounts():server id=[%d],rider id=[%s] erroneously tried to transfer the player into object id=[%s].", static_cast(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), - (destination == NULL) ? "" : destination->getNetworkId().getValueString().c_str())); + (destination == nullptr) ? "" : destination->getNetworkId().getValueString().c_str())); } return canChangeContainerNow; } @@ -839,7 +839,7 @@ bool CreatureObject::detachAllRiders() if (!isAuthoritative()) { // add a plural message - sendControllerMessageToAuthServer(CM_detachAllRidersForMount, NULL); + sendControllerMessageToAuthServer(CM_detachAllRidersForMount, nullptr); return true; } @@ -988,9 +988,9 @@ bool CreatureObject::mountCreature(CreatureObject &mountObject) for (int i = 0; i < maxSlots; ++i) { - if (ContainerInterface::canTransferToSlot(mountObject, *this, s_riderSlotId[i], NULL, errorCode)) + if (ContainerInterface::canTransferToSlot(mountObject, *this, s_riderSlotId[i], nullptr, errorCode)) { - transferSuccess = ContainerInterface::transferItemToSlottedContainer(mountObject, *this, s_riderSlotId[i], NULL, errorCode); + transferSuccess = ContainerInterface::transferItemToSlottedContainer(mountObject, *this, s_riderSlotId[i], nullptr, errorCode); if ((transferSuccess) && (errorCode == Container::CEC_Success)) { @@ -1051,20 +1051,20 @@ CreatureObject *CreatureObject::getMountedCreature() { //-- Ensure mounts are enabled. if (!ConfigServerGame::getMountsEnabled()) - return NULL; + return nullptr; //-- Check this creature's container object. ServerObject *const container = safe_cast(ContainerInterface::getContainedByObject(*this)); if (!container) - return NULL; + return nullptr; //-- Check if the container is a creature. CreatureObject *const creatureContainer = container->asCreatureObject(); if (!creatureContainer) - return NULL; + return nullptr; //-- Ignore non-mountable creature objects. - CreatureObject *const mount = creatureContainer->isMountable() ? creatureContainer : NULL; + CreatureObject *const mount = creatureContainer->isMountable() ? creatureContainer : nullptr; return mount; } @@ -1096,7 +1096,7 @@ void CreatureObject::emergencyDismountForRider() //-- Pass request along to authoritative server if we're not it. if (!isAuthoritative()) { - sendControllerMessageToAuthServer(CM_emergencyDismountForRider, NULL); + sendControllerMessageToAuthServer(CM_emergencyDismountForRider, nullptr); return; } @@ -1116,7 +1116,7 @@ void CreatureObject::emergencyDismountForRider() //-- Transfer the rider to the world cell. Container::ContainerErrorCode errorCode = Container::CEC_Success; - bool const transferSucceeded = ContainerInterface::transferItemToWorld (*this, this->getTransform_o2w(), NULL, errorCode); + bool const transferSucceeded = ContainerInterface::transferItemToWorld (*this, this->getTransform_o2w(), nullptr, errorCode); WARNING(!transferSucceeded || (errorCode != Container::CEC_Success), ("Transfer to world failed, return value=[%s], error code=[%d].", transferSucceeded ? "true" : "false", static_cast(errorCode))); } diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp index 3f9de076..a72020be 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp @@ -71,7 +71,7 @@ bool CreatureObject::pilotShip(ServerObject &pilotSlotObject) SlotId const pilotSlotId = pilotSlotObject.asShipObject() ? ShipSlotIdManager::getShipPilotSlotId() : ShipSlotIdManager::getPobShipPilotSlotId(); Container::ContainerErrorCode errorCode = Container::CEC_Success; - bool const transferSuccess = ContainerInterface::transferItemToSlottedContainer(pilotSlotObject, *this, pilotSlotId, NULL, errorCode); + bool const transferSuccess = ContainerInterface::transferItemToSlottedContainer(pilotSlotObject, *this, pilotSlotId, nullptr, errorCode); DEBUG_FATAL(transferSuccess && (errorCode != Container::CEC_Success), ("pilotShip(): transferItemToSlottedContainer() returned success but container error code returned error %d.", static_cast(errorCode))); if (transferSuccess) @@ -199,7 +199,7 @@ void CreatureObject::getAllShipsInDatapad(std::vector & result) const for(ContainerConstIterator iter = datapadContainer->begin(); iter != datapadContainer->end(); ++iter) { Object const * const itemO = (*iter).getObject(); - ServerObject const * const itemSO = itemO ? itemO->asServerObject() : NULL; + ServerObject const * const itemSO = itemO ? itemO->asServerObject() : nullptr; if(itemSO && (itemSO->getGameObjectType() == SharedObjectTemplate::GOT_data_ship_control_device)) { Container const * const itemContainer = ContainerInterface::getContainer(*itemSO); @@ -211,8 +211,8 @@ void CreatureObject::getAllShipsInDatapad(std::vector & result) const for(ContainerConstIterator iter2 = itemContainer->begin(); iter2 != itemContainer->end(); ++iter2) { Object const * const o = (*iter2).getObject(); - ServerObject const * const so = o ? o->asServerObject() : NULL; - ShipObject const * const ship = so ? so->asShipObject() : NULL; + ServerObject const * const so = o ? o->asServerObject() : nullptr; + ShipObject const * const ship = so ? so->asShipObject() : nullptr; if(ship) { result.push_back(ship->getNetworkId()); diff --git a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp index 37ea045c..b0ec57ba 100755 --- a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp @@ -36,8 +36,8 @@ static const std::string REQUEST_RESOURCE_WEIGHTS_SCRIPT_METHOD("OnRequestResour // ====================================================================== // static members -DraftSchematicObject::SchematicMap * DraftSchematicObject::m_schematics = NULL; -const SharedObjectTemplate * DraftSchematicObject::m_defaultSharedTemplate = NULL; +DraftSchematicObject::SchematicMap * DraftSchematicObject::m_schematics = nullptr; +const SharedObjectTemplate * DraftSchematicObject::m_defaultSharedTemplate = nullptr; // ====================================================================== @@ -105,13 +105,13 @@ const SharedObjectTemplate * DraftSchematicObject::getDefaultSharedTemplate(void { static const ConstCharCrcLowerString templateName("object/draft_schematic/base/shared_draft_schematic_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "DraftSchematicObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -124,10 +124,10 @@ static const ConstCharCrcLowerString templateName("object/draft_schematic/base/s */ void DraftSchematicObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // DraftSchematicObject::removeDefaultTemplate @@ -141,21 +141,21 @@ void DraftSchematicObject::removeDefaultTemplate(void) */ void DraftSchematicObject::requestResourceWeights(ServerObject & requester, uint32 draftSchematicCrc) { - if (requester.getClient() == NULL) + if (requester.getClient() == nullptr) { WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid client for [%s]", requester.getNetworkId ().getValueString ().c_str ())); return; } const DraftSchematicObject * const schematic = getSchematic(draftSchematicCrc); - if (schematic == NULL) + if (schematic == nullptr) { WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid schematic [%lu] for [%s]", draftSchematicCrc, requester.getNetworkId ().getValueString ().c_str ())); return; } const ServerDraftSchematicObjectTemplate * const schematicTemplate = safe_cast(schematic->getObjectTemplate()); - if (schematicTemplate == NULL) + if (schematicTemplate == nullptr) { WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid schematic template [%lu] for [%s]", draftSchematicCrc, requester.getNetworkId ().getValueString ().c_str ())); return; @@ -167,7 +167,7 @@ void DraftSchematicObject::requestResourceWeights(ServerObject & requester, uint desiredAttribs.push_back((*i).first.getText().c_str()); } - std::vector attributes(MAX_ATTRIBUTES * 2, static_cast(NULL)); + std::vector attributes(MAX_ATTRIBUTES * 2, static_cast(nullptr)); std::vector slots(MAX_ATTRIBUTES * 2, 0); std::vector counts(MAX_ATTRIBUTES * 2, 0); std::vector weights(MAX_ATTRIBUTES * 2 * Crafting::RA_numResourceAttributes * 2, 0); @@ -198,7 +198,7 @@ void DraftSchematicObject::requestResourceWeights(ServerObject & requester, uint for (std::vector::const_iterator i(newAttributes.begin()); i != newAttributes.end(); ++i, ++attribCount) { - if (*i == NULL) + if (*i == nullptr) break; } } @@ -257,8 +257,8 @@ ManufactureSchematicObject * DraftSchematicObject::createManufactureSchematic( { Object * object = ServerManufactureSchematicObjectTemplate::createObject( "object/manufacture_schematic/generic_schematic.iff", *this); - if (object == NULL) - return NULL; + if (object == nullptr) + return nullptr; ManufactureSchematicObject * schematic = safe_cast(object); schematic->init(*this, creator); schematic->setNetworkId(ObjectIdManager::getInstance().getNewObjectId()); @@ -478,8 +478,8 @@ const DraftSchematicObject * DraftSchematicObject::getSchematic( const DraftSchematicObject * DraftSchematicObject::getSchematic(uint32 crc) { NOT_NULL(m_schematics); - if (m_schematics == NULL || crc == 0) - return NULL; + if (m_schematics == nullptr || crc == 0) + return nullptr; // see if the schematic is already loaded SchematicMap::iterator result = m_schematics->find(crc); @@ -491,30 +491,30 @@ const DraftSchematicObject * DraftSchematicObject::getSchematic(uint32 crc) if (name.isEmpty()) { WARNING(true, ("Unable to find template name for crc %u", crc)); - return NULL; + return nullptr; } // create a new schematic if (!TreeFile::exists(name.getString())) { WARNING(true, ("Draft schematic template %s file not found", name.getString())); - return NULL; + return nullptr; } const ObjectTemplate * objTemplate = ObjectTemplateList::fetch(name); - if (objTemplate == NULL) + if (objTemplate == nullptr) { WARNING(true, ("Can't create object template %s", name.getString())); - return NULL; + return nullptr; } const ServerDraftSchematicObjectTemplate * schematicTemplate = dynamic_cast(objTemplate); - if (schematicTemplate == NULL) + if (schematicTemplate == nullptr) { WARNING(true, ("Template %s is not a draft schematic", name.getString())); objTemplate->releaseReference(); - return NULL; + return nullptr; } const DraftSchematicObject * schematic = new DraftSchematicObject(schematicTemplate); @@ -531,7 +531,7 @@ const DraftSchematicObject * DraftSchematicObject::getSchematic(uint32 crc) */ void DraftSchematicObject::install() { - if (m_schematics == NULL) + if (m_schematics == nullptr) m_schematics = new SchematicMap(); } // DraftSchematicObject::install @@ -542,16 +542,16 @@ void DraftSchematicObject::install() */ void DraftSchematicObject::remove() { - if (m_schematics != NULL) + if (m_schematics != nullptr) { SchematicMap::iterator iter; for (iter = m_schematics->begin(); iter != m_schematics->end(); ++iter) { delete (*iter).second; - (*iter).second = NULL; + (*iter).second = nullptr; } delete m_schematics; - m_schematics = NULL; + m_schematics = nullptr; } } // DraftSchematicObject::remove diff --git a/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp index 77e6780b..66481dad 100755 --- a/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp @@ -58,7 +58,7 @@ static const StringId STRING_ID_CANT_SPLIT("system_msg", "cant_split_crate"); //---------------------------------------------------------------------- -const SharedObjectTemplate * FactoryObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * FactoryObject::m_defaultSharedTemplate = nullptr; //----------------------------------------------------------------------- @@ -176,7 +176,7 @@ void FactoryObject::onLoadedFromDatabase() if (getLoadContents() && getCount() > 0) { // verify that we have a contained object - if (getContainedObject() == NULL) + if (getContainedObject() == nullptr) { WARNING_STRICT_FATAL(true, ("Factory object %s has a count of %d, " "but no contained object! We are setting the count to 0.", @@ -197,11 +197,11 @@ const SharedObjectTemplate * FactoryObject::getDefaultSharedTemplate() const { static const ConstCharCrcLowerString templateName("object/factory/base/shared_factory_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast(ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create default shared object template %s", templateName.getString())); + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "FactoryObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -214,10 +214,10 @@ const SharedObjectTemplate * FactoryObject::getDefaultSharedTemplate() const */ void FactoryObject::removeDefaultTemplate() { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // FactoryObject::removeDefaultTemplate @@ -288,10 +288,10 @@ bool FactoryObject::isFactoryOk() const char errBuffer[BUFSIZE]; const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( getDraftSchematic()); - if (draft != NULL) + if (draft != nullptr) { // make sure we have an object instance defined - if (getCount() > 0 && getContainedObject() == NULL) + if (getCount() > 0 && getContainedObject() == nullptr) { sprintf(errBuffer, "not having a contained object instance"); factoryOk = false; @@ -307,16 +307,16 @@ bool FactoryObject::isFactoryOk() const { // send out logs/emails m_badFactoryLogged = true; - const ServerObject * owner = NULL; + const ServerObject * owner = nullptr; const Object * object = NetworkIdManager::getObjectById(getOwnerId()); - if (object != NULL) + if (object != nullptr) owner = object->asServerObject(); // log that the schematic can't be used LOG("CustomerService", ("Crafting: factory crate object %s " "owned by %s is unuseable due to %s", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(owner).c_str(), errBuffer)); - if (owner != NULL) + if (owner != nullptr) { // send mail to the owner telling them their schematic can't be used const static StringId message("system_msg", "crate_unuseable"); @@ -351,7 +351,7 @@ bool FactoryObject::canDestroy() const OutOfBandPackager::pack(pp, -1, oob); } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(*(owner->asServerObject()), Unicode::emptyString, oob); } @@ -367,14 +367,14 @@ bool FactoryObject::canDestroy() const void FactoryObject::onContainerTransfer(ServerObject * destination, ServerObject* transferer) { - if (inCraftingSession() && destination != NULL && + if (inCraftingSession() && destination != nullptr && destination->getNetworkId() != m_craftingSchematic.get()) { if (!isFactoryOk()) return; Object * schematic = m_craftingSchematic.get().getObject(); - if (schematic == NULL) + if (schematic == nullptr) { WARNING(true, ("FactoryObject::onContainerTransfer: could not get the schematic for factory %s", getNetworkId().getValueString().c_str())); return; @@ -387,13 +387,13 @@ void FactoryObject::onContainerTransfer(ServerObject * destination, // our components to reference if (m_craftingCount.get() != 0) { - FactoryObject * newFactory = NULL; + FactoryObject * newFactory = nullptr; if (getCount() > 1) { // make a new factory in the manf schematic newFactory = makeCopy(*(m_craftingSchematic.get().getObject()-> asServerObject()), 1); - if (newFactory != NULL) + if (newFactory != nullptr) { // NOTE: potential dupe here, but the player shouldn't be able to // remove the new factory without decreasing the component count @@ -403,26 +403,26 @@ void FactoryObject::onContainerTransfer(ServerObject * destination, // swap the contained item instances so that any current references // will point to a local object TangibleObject * myObject = const_cast(getContainedObject()); - if (myObject == NULL) + if (myObject == nullptr) { - WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned NULL", getNetworkId().getValueString().c_str())); + WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned nullptr", getNetworkId().getValueString().c_str())); return; } TangibleObject * newObject = const_cast(newFactory->getContainedObject()); - if (newObject == NULL) + if (newObject == nullptr) { - WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned NULL", newFactory->getNetworkId().getValueString().c_str())); + WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned nullptr", newFactory->getNetworkId().getValueString().c_str())); newFactory->permanentlyDestroy(DeleteReasons::SetupFailed); return; } Container::ContainerErrorCode error; - if (!ContainerInterface::transferItemToVolumeContainer (*newFactory, *myObject, NULL, error)) + if (!ContainerInterface::transferItemToVolumeContainer (*newFactory, *myObject, nullptr, error)) { WARNING(true, ("FactoryObject::onContainerTransfer: could not transfer factory %s to container %s", newFactory->getNetworkId().getValueString().c_str(), myObject->getNetworkId().getValueString().c_str())); newFactory->permanentlyDestroy(DeleteReasons::SetupFailed); return; } - if (!ContainerInterface::transferItemToVolumeContainer (*this, *newObject, NULL, error)) + if (!ContainerInterface::transferItemToVolumeContainer (*this, *newObject, nullptr, error)) { WARNING(true, ("FactoryObject::onContainerTransfer: could not transfer factory %s to container %s", getNetworkId().getValueString().c_str(), newObject->getNetworkId().getValueString().c_str())); return; @@ -434,7 +434,7 @@ void FactoryObject::onContainerTransfer(ServerObject * destination, // make a new factory with one item, but don't destroy ourself newFactory = makeCopy(*(m_craftingSchematic.get().getObject()-> asServerObject()), 1, false); - if (newFactory == NULL) + if (newFactory == nullptr) { WARNING(true, ("FactoryObject::onContainerTransfer: could not make a copy of factory %s", getNetworkId().getValueString().c_str())); return; @@ -448,9 +448,9 @@ void FactoryObject::onContainerTransfer(ServerObject * destination, // update the crafting status of ourself and the new factory ManufactureSchematicObject * schematic = safe_cast( m_craftingSchematic.get().getObject()); - if (schematic != NULL) + if (schematic != nullptr) { - if (newFactory != NULL) + if (newFactory != nullptr) { // set up the new factory to have the same crafting info // that we do @@ -525,7 +525,7 @@ bool FactoryObject::inCraftingSession() const return false; // make sure the crafting schematic id is a valid object - if (m_craftingSchematic.get().getObject() == NULL) + if (m_craftingSchematic.get().getObject() == nullptr) { WARNING_STRICT_FATAL(true, ("FactoryObject %s has a schematic id of %s " "that isn't a valid object!!!", getNetworkId().getValueString().c_str(), @@ -598,7 +598,7 @@ bool FactoryObject::addObject() if (getCount() == 0) { TangibleObject * object = manufactureObject(); - if (object != NULL) + if (object != nullptr) { setObjectName(object->getObjectName()); setComplexity(object->getComplexity()); @@ -615,7 +615,7 @@ bool FactoryObject::addObject() } const ServerObject * parent = safe_cast(ContainerInterface::getFirstParentInWorld(*this)); - if (parent != NULL) + if (parent != nullptr) LOG("CustomerService", ("Crafting:incrementing count of crate %s (owner %s) to %d", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(parent->getOwnerId()).c_str(), getCount())); else LOG("CustomerService", ("Crafting:incrementing count of crate %s to %d", getNetworkId().getValueString().c_str(), getCount())); @@ -645,7 +645,7 @@ bool FactoryObject::removeObject(ServerObject & destination) if (!isFactoryOk()) return false; - if (getCount() > 0 && ContainerInterface::getVolumeContainer(destination) != NULL) + if (getCount() > 0 && ContainerInterface::getVolumeContainer(destination) != nullptr) { if (!getLoadContents()) { @@ -665,7 +665,7 @@ bool FactoryObject::removeObject(ServerObject & destination) else { // new style factory - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (getCount() > 1) { object = manufactureObject(); @@ -686,7 +686,7 @@ bool FactoryObject::removeObject(ServerObject & destination) } const CachedNetworkId & id = *(container->begin()); Object * obj = id.getObject(); - if (obj != NULL && obj->asServerObject()->asTangibleObject() != NULL) + if (obj != nullptr && obj->asServerObject()->asTangibleObject() != nullptr) { object = obj->asServerObject()->asTangibleObject(); } @@ -706,15 +706,15 @@ bool FactoryObject::removeObject(ServerObject & destination) object = manufactureObject(); } } - if (object != NULL) + if (object != nullptr) { Container::ContainerErrorCode error; - if (ContainerInterface::transferItemToVolumeContainer(destination, *object, NULL, error)) + if (ContainerInterface::transferItemToVolumeContainer(destination, *object, nullptr, error)) { incrementCount(-1); const ServerObject * parent = safe_cast(ContainerInterface::getFirstParentInWorld(destination)); - if (parent != NULL) + if (parent != nullptr) LOG("CustomerService", ("Crafting:removed object %s from crate %s to container %s of player %s. Crate count = %d", object->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), destination.getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(parent->getNetworkId()).c_str(), getCount())); else LOG("CustomerService", ("Crafting:removed object %s from crate %s to container %s. Crate count = %d", object->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), destination.getNetworkId().getValueString().c_str(), getCount())); @@ -828,14 +828,14 @@ void FactoryObject::onContainedObjectLoaded(const NetworkId &oid) // check if the object is on our pending list ServerObject * destination = removeIdFromPendingList(oid); - if (destination != NULL) + if (destination != nullptr) { TangibleObject * item = safe_cast(NetworkIdManager::getObjectById( oid)); - if (item != NULL) + if (item != nullptr) { Container::ContainerErrorCode error = Container::CEC_Success; - if (ContainerInterface::transferItemToVolumeContainer(*destination, *item, NULL, error)) + if (ContainerInterface::transferItemToVolumeContainer(*destination, *item, nullptr, error)) { // if that was the last item of ours, delete ourself if (getCount() == 0 && getPendingListCount() == 0) @@ -849,7 +849,7 @@ void FactoryObject::onContainedObjectLoaded(const NetworkId &oid) item->unload(); // tell the owner something went wrong Object * owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { ContainerInterface::sendContainerMessageToClient(*safe_cast(owner), error); } @@ -873,35 +873,35 @@ void FactoryObject::onContainedObjectLoaded(const NetworkId &oid) * functionality of ManufactureSchematicObject::manufactureObject; if that * function changes, this one should too. * - * @return the new object, or NULL on error + * @return the new object, or nullptr on error */ TangibleObject * FactoryObject::manufactureObject() { if (!isFactoryOk()) - return NULL; + return nullptr; const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(getDraftSchematic()); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) { - return NULL; + return nullptr; } - if (draftSchematic->getCraftedObjectTemplate() == NULL) + if (draftSchematic->getCraftedObjectTemplate() == nullptr) { DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable object template!\n", draftSchematic->getTemplateName())); - return NULL; + return nullptr; } // create the item TangibleObject * const object = dynamic_cast( ServerWorld::createNewObject(*draftSchematic->getCraftedObjectTemplate(), *this, false)); - if (object == NULL) + if (object == nullptr) { DEBUG_WARNING(true, ("Player %s failed to create object for template " "%s.\n", getOwnerId().getValueString().c_str(), draftSchematic->getCraftedObjectTemplate()->getName())); - return NULL; + return nullptr; } if (!getAssignedObjectName().empty()) @@ -928,7 +928,7 @@ TangibleObject * FactoryObject::manufactureObject() // set the creator xp type from the schematic template const ServerObjectTemplate * schematicTemplate = safe_cast(draftSchematic->getObjectTemplate()); - if (schematicTemplate != NULL && schematicTemplate->getXpPointsCount() > 0) + if (schematicTemplate != nullptr && schematicTemplate->getXpPointsCount() > 0) { ServerObjectTemplate::Xp xpData; schematicTemplate->getXpPoints(xpData, 0); @@ -948,7 +948,7 @@ TangibleObject * FactoryObject::manufactureObject() if (result == SCRIPT_OVERRIDE) { object->permanentlyDestroy(DeleteReasons::Script); - return NULL; + return nullptr; } return object; @@ -968,10 +968,10 @@ const char * FactoryObject::getContainedTemplateName() const const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this); const CachedNetworkId & id = *(container->begin()); const Object * obj = id.getObject(); - if (obj != NULL && obj->asServerObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr) return obj->asServerObject()->getTemplateName(); } - return NULL; + return nullptr; } // FactoryObject::getContainedTemplateName // ---------------------------------------------------------------------- @@ -997,10 +997,10 @@ static std::string sharedTemplateName; const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this); const CachedNetworkId & id = *(container->begin()); const Object * obj = id.getObject(); - if (obj != NULL && obj->asServerObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr) return obj->asServerObject()->getSharedTemplateName(); } - return NULL; + return nullptr; } // FactoryObject::getContainedSharedTemplateName // ---------------------------------------------------------------------- @@ -1017,10 +1017,10 @@ const ObjectTemplate * FactoryObject::getContainedObjectTemplate() const const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this); const CachedNetworkId & id = *(container->begin()); const Object * obj = id.getObject(); - if (obj != NULL && obj->asServerObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr) return obj->asServerObject()->getObjectTemplate(); } - return NULL; + return nullptr; } // FactoryObject::getContainedObjectTemplate // ---------------------------------------------------------------------- @@ -1037,12 +1037,12 @@ const TangibleObject * FactoryObject::getContainedObject() const const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this); const CachedNetworkId & id = *(container->begin()); const Object * obj = id.getObject(); - if (obj != NULL && obj->asServerObject() != NULL) + if (obj != nullptr && obj->asServerObject() != nullptr) { return obj->asServerObject()->asTangibleObject(); } } - return NULL; + return nullptr; } // FactoryObject::getContainedObject // ---------------------------------------------------------------------- @@ -1109,7 +1109,7 @@ ServerObject * FactoryObject::removeIdFromPendingList(const NetworkId & id) NetworkId objectId; if (!pendingList.getItem(idString,objectId)) - return NULL; + return nullptr; ServerObject * const object = safe_cast(NetworkIdManager::getObjectById(objectId)); removeObjVarItem(pendingList.getContextName() + idString); @@ -1415,7 +1415,7 @@ FactoryObject * FactoryObject::makeCopy(ServerObject & destination, int count, bool destroySource) { if (!isFactoryOk()) - return NULL; + return nullptr; // don't allow making a copy if we are an old crate if (!getLoadContents()) @@ -1428,52 +1428,52 @@ FactoryObject * FactoryObject::makeCopy(ServerObject & destination, int count, OutOfBandPackager::pack(pp, -1, oob); } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(*(owner->asServerObject()), Unicode::emptyString, oob); } - return NULL; + return nullptr; } if (count <= 0) { WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s passed invalid " "count %d", getNetworkId().getValueString().c_str(), count)); - return NULL; + return nullptr; } if (count > getCount()) { WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s given count %d " "that is > than our count %d", getNetworkId().getValueString().c_str(), count, getCount())); - return NULL; + return nullptr; } VolumeContainer *destVolumeContainer = ContainerInterface::getVolumeContainer(destination); - if (destVolumeContainer == NULL) + if (destVolumeContainer == nullptr) { WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s passed " "destination %s that is not a volume container", getNetworkId().getValueString().c_str(), destination.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } // create the new factory - if (safe_cast(getObjectTemplate()) == NULL) + if (safe_cast(getObjectTemplate()) == nullptr) { WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy: %s has no object template!", getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } FactoryObject * newFactory = safe_cast(ServerWorld::createNewObject( *safe_cast(getObjectTemplate()), destination, false)); - if (newFactory == NULL) + if (newFactory == nullptr) { WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s could not create " "the new factory", getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } // copy our objvars and scripts to the new factory @@ -1523,11 +1523,11 @@ FactoryObject * FactoryObject::makeCopy(ServerObject & destination, int count, // move our contained object to the new factory, and delete ourself if // we aren't already being deleted const TangibleObject * object = FactoryObject::getContainedObject(); - if (object != NULL) + if (object != nullptr) { Container::ContainerErrorCode error; ContainerInterface::transferItemToVolumeContainer(*newFactory, - *const_cast(object), NULL, error); + *const_cast(object), nullptr, error); newFactory->setCount(count); setCount(0); if (destroySource && !isBeingDestroyed()) @@ -1545,7 +1545,7 @@ FactoryObject * FactoryObject::makeCopy(ServerObject & destination, int count, else { newFactory->permanentlyDestroy(DeleteReasons::SetupFailed); - newFactory = NULL; + newFactory = nullptr; } } return newFactory; @@ -1575,7 +1575,7 @@ void FactoryObject::getAttributes(AttributeVector & data) const { // new-style crate const ServerObject * const storedObject = getContainedObject(); - if (storedObject != NULL) + if (storedObject != nullptr) { data.reserve (data.size () + 2); diff --git a/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp index 50373712..60b827ca 100755 --- a/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp +++ b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp @@ -31,11 +31,11 @@ GroupIdObserver::~GroupIdObserver() if (m_group && m_creature->getGroup() != m_group) m_group->removeGroupMember(m_creature->getNetworkId()); - if (m_creature->getGroup() != NULL) + if (m_creature->getGroup() != nullptr) { PlayerObject *playerObject = PlayerCreatureController::getPlayerObject(m_creature); - if ((playerObject != NULL) && + if ((playerObject != nullptr) && playerObject->isLookingForGroup()) { playerObject->setLookingForGroup(false); diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp index 76390349..4c8d69e4 100755 --- a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp @@ -1412,7 +1412,7 @@ unsigned int GroupObject::getSecondsLeftOnGroupPickup() const std::pair const & groupPickupTimer = m_groupPickupTimer.get(); if ((groupPickupTimer.first > 0) && (groupPickupTimer.second > 0)) { - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); if (groupPickupTimer.second > timeNow) return (groupPickupTimer.second - (int)timeNow); } diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp index f0215358..0ee903a1 100755 --- a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp @@ -140,9 +140,9 @@ void GuildObject::setupUniverse() // build the guild and guild member info from data read in from DB // disable notification while building the initial list - m_membersInfo.setOnErase(NULL, NULL); - m_membersInfo.setOnInsert(NULL, NULL); - m_membersInfo.setOnSet(NULL, NULL); + m_membersInfo.setOnErase(nullptr, nullptr); + m_membersInfo.setOnInsert(nullptr, nullptr); + m_membersInfo.setOnSet(nullptr, nullptr); // build names { @@ -238,7 +238,7 @@ void GuildObject::setupUniverse() // update guild info members count GuildInfo & gi = guildInfoMembersCount[guildId]; GuildMemberInfo const * const existingGmi = getGuildMemberInfo(guildId, memberId); - updateGuildInfoMembersCount(gi, (existingGmi ? ((existingGmi->m_permissions == -1) ? &allAdministrativePermissions : &(existingGmi->m_permissions)) : NULL), ((permissions == -1) ? &allAdministrativePermissions : &permissions)); + updateGuildInfoMembersCount(gi, (existingGmi ? ((existingGmi->m_permissions == -1) ? &allAdministrativePermissions : &(existingGmi->m_permissions)) : nullptr), ((permissions == -1) ? &allAdministrativePermissions : &permissions)); if (existingGmi) { @@ -391,7 +391,7 @@ GuildInfo const * GuildObject::getGuildInfo(int guildId) const if (iterFind != m_guildsInfo.end()) return &(iterFind->second); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -402,7 +402,7 @@ GuildMemberInfo const * GuildObject::getGuildMemberInfo(int guildId, NetworkId c if (iterFind != m_membersInfo.end()) return &(iterFind->second); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -738,7 +738,7 @@ void GuildObject::removeGuildMember(int guildId, NetworkId const &memberId) m_members.erase(memberSpec); GuildInfo updatedGi(gi); - updateGuildInfoMembersCount(updatedGi, &(gmi->m_permissions), NULL); + updateGuildInfoMembersCount(updatedGi, &(gmi->m_permissions), nullptr); m_guildsInfo.set(guildId, updatedGi); std::map::const_iterator iterFind = m_fullMembers.find(memberId); @@ -771,7 +771,7 @@ void GuildObject::addGuildCreatorMember(int guildId, NetworkId const &memberId, if (realMemberName.empty() && existingGmi) realMemberName = existingGmi->m_name; - ServerObject const *so = NULL; + ServerObject const *so = nullptr; if (realMemberName.empty()) { so = ServerWorld::findObjectByNetworkId(memberId); @@ -848,7 +848,7 @@ void GuildObject::addGuildCreatorMember(int guildId, NetworkId const &memberId, m_members.insert(memberSpec); GuildInfo updatedGi(gi); - updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : NULL), &permissions); + updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : nullptr), &permissions); m_guildsInfo.set(guildId, updatedGi); if (existingGmi) @@ -883,7 +883,7 @@ void GuildObject::addGuildSponsorMember(int guildId, NetworkId const &memberId, if (realMemberName.empty() && existingGmi) realMemberName = existingGmi->m_name; - ServerObject const *so = NULL; + ServerObject const *so = nullptr; if (realMemberName.empty()) { so = ServerWorld::findObjectByNetworkId(memberId); @@ -958,7 +958,7 @@ void GuildObject::addGuildSponsorMember(int guildId, NetworkId const &memberId, m_members.insert(memberSpec); GuildInfo updatedGi(gi); - updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : NULL), &permissions); + updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : nullptr), &permissions); m_guildsInfo.set(guildId, updatedGi); if (existingGmi) @@ -1465,7 +1465,7 @@ void GuildObject::modifyGuildWarKillTracking(int killerGuildId, int victimGuildI } if (updateTime <= 0) - updateTime = static_cast(::time(NULL)); + updateTime = static_cast(::time(nullptr)); // queue up adjustments and periodically update the data std::pair, std::pair >::iterator, bool> result = m_guildWarKillTrackingAdjustment.insert(std::make_pair(std::make_pair(killerGuildId, victimGuildId), std::make_pair(adjustment, updateTime))); @@ -1635,7 +1635,7 @@ void GuildObject::setGuildFaction(int guildId, uint32 guildFaction) if (factionChange) { - int const timeLeftGuildFaction = static_cast(::time(NULL)); + int const timeLeftGuildFaction = static_cast(::time(nullptr)); std::string oldNameSpec, newNameSpec; GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, oldNameSpec); @@ -1723,7 +1723,7 @@ void GuildObject::setGuildGcwDefenderRegion(int guildId, std::string const &guil if ((gi->m_guildGcwDefenderRegion == guildGcwDefenderRegion) && (gi->m_timeJoinedGuildGcwDefenderRegion > 0)) timeJoinedGuildGcwDefenderRegion = gi->m_timeJoinedGuildGcwDefenderRegion; else - timeJoinedGuildGcwDefenderRegion = static_cast(::time(NULL)); + timeJoinedGuildGcwDefenderRegion = static_cast(::time(nullptr)); } } else if (gi->m_guildGcwDefenderRegion != guildGcwDefenderRegion) @@ -1732,13 +1732,13 @@ void GuildObject::setGuildGcwDefenderRegion(int guildId, std::string const &guil if (!guildGcwDefenderRegion.empty()) { - timeJoinedGuildGcwDefenderRegion = static_cast(::time(NULL)); + timeJoinedGuildGcwDefenderRegion = static_cast(::time(nullptr)); } else { // stop defending timeJoinedGuildGcwDefenderRegion = gi->m_timeJoinedGuildGcwDefenderRegion; - timeLeftGuildGcwDefenderRegion = static_cast(::time(NULL)); + timeLeftGuildGcwDefenderRegion = static_cast(::time(nullptr)); } } @@ -2052,7 +2052,7 @@ void GuildObject::depersistGcwImperialScorePercentile() // GCW category { - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int gcwImperialScorePercentile; std::map const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); for (std::map::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter) @@ -2154,7 +2154,7 @@ void GuildObject::updateGcwImperialScorePercentile(std::set const & if (m_gcwImperialScorePercentileThisGalaxy.empty()) depersistGcwImperialScorePercentile(); - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); GameScriptObject * const gameScriptObject = tatooine->getScriptObject(); int currentScorePercentile, newScorePercentile, newGroupCategoryScoreRaw, scoreCategoryGroupTotalPoints, deltaGroupCategoryScoreRaw; std::map, int>::const_iterator iterGroupCategoryScoreRaw; @@ -2515,8 +2515,8 @@ void GuildObjectNamespace::replaceSetIfNeeded(char const *label, Archive::AutoDe } // ---------------------------------------------------------------------- -// NULL oldPermissions means wasn't an existing guild member -// NULL newPermissions means will not be a guild member +// nullptr oldPermissions means wasn't an existing guild member +// nullptr newPermissions means will not be a guild member void GuildObjectNamespace::updateGuildInfoMembersCount(GuildInfo & gi, int const * const oldPermissions, int const * const newPermissions) { bool existingMember = false; @@ -2596,7 +2596,7 @@ void GuildObjectNamespace::updateGcwPercentileHistory(Archive::AutoDeltaMap(::time(NULL))), score); + history.set(std::make_pair(scoreName, static_cast(::time(nullptr))), score); int newCount = 1; Archive::AutoDeltaMap::const_iterator const iterHistoryCount = historyCount.find(scoreName); diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp index c8c7ad75..92f77f36 100755 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp @@ -67,7 +67,7 @@ HarvesterInstallationObject::HarvesterInstallationObject(const ServerHarvesterIn m_maxHopperAmount(newTemplate->getMaxHopperSize()), m_hopperResource(NetworkId::cms_invalid), m_hopperAmount(0.0f), - m_survey(NULL), + m_survey(nullptr), m_surveyTime(0) { //Installation objects have real time updated UI @@ -79,7 +79,7 @@ HarvesterInstallationObject::HarvesterInstallationObject(const ServerHarvesterIn HarvesterInstallationObject::~HarvesterInstallationObject() { delete m_survey; - m_survey = NULL; + m_survey = nullptr; // m_synchronizedUi deleted by superclass } @@ -397,7 +397,7 @@ std::vector const & HarvesterInstallationObject::get if (!m_survey || ServerClock::getInstance().getGameTimeSeconds() - m_surveyTime > (60*60)) { delete m_survey; - m_survey = NULL; + m_survey = nullptr; takeSurvey(); } @@ -728,7 +728,7 @@ void HarvesterInstallationObject::handleCMessageTo (const MessageToPayload &mess ResourceClassObject *HarvesterInstallationObject::getMasterClass() const { - ResourceClassObject *obj = NULL; + ResourceClassObject *obj = nullptr; const ServerHarvesterInstallationObjectTemplate *harvesterTemplate = dynamic_cast(getObjectTemplate()); if (harvesterTemplate) obj=ServerUniverse::getInstance().getResourceClassByName(harvesterTemplate->getMasterClassName()); @@ -855,7 +855,7 @@ NetworkId const &HarvesterInstallationObject::getSelectedResourceTypeId() const ResourcePoolObject const * HarvesterInstallationObject::getSelectedResourcePool() const { if (getSelectedResourceTypeId() == NetworkId::cms_invalid) - return NULL; + return nullptr; ResourceTypeObject const * const typeObject = ServerUniverse::getInstance().getResourceTypeById(getSelectedResourceTypeId()); if (typeObject) @@ -863,7 +863,7 @@ ResourcePoolObject const * HarvesterInstallationObject::getSelectedResourcePool( return typeObject->getPoolForCurrentPlanet(); } else - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h index 7616aba5..1ea65df3 100755 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h @@ -52,7 +52,7 @@ public: typedef std::pair HopperContentElement; typedef stdvector::fwd HopperContentsVector; - float getHopperContents(HopperContentsVector * data=NULL) const; + float getHopperContents(HopperContentsVector * data=nullptr) const; void getResourceData(ResourceDataVector & data); std::vector const & getSurveyTypes(); int getMaxExtractionRate() const; diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp index 2f5b622b..97ddeef9 100755 --- a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp @@ -45,7 +45,7 @@ static const std::string OBJVAR_ACCUMULATED_TIME("_installation.acclTime"); -const SharedObjectTemplate * InstallationObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * InstallationObject::m_defaultSharedTemplate = nullptr; namespace InstallationObjectNamespace { @@ -93,13 +93,13 @@ const SharedObjectTemplate * InstallationObject::getDefaultSharedTemplate(void) { static const ConstCharCrcLowerString templateName("object/installation/base/shared_installation_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "InstallationObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -112,10 +112,10 @@ static const ConstCharCrcLowerString templateName("object/installation/base/shar */ void InstallationObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // InstallationObject::removeDefaultTemplate diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp index 6d7b57c4..5d32403f 100755 --- a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp @@ -43,7 +43,7 @@ // ====================================================================== -const SharedObjectTemplate * IntangibleObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * IntangibleObject::m_defaultSharedTemplate = nullptr; uint32 IntangibleObject::ms_lastFrame = 0; uint32 IntangibleObject::ms_theaterTime = 0; @@ -82,7 +82,7 @@ IntangibleObject::IntangibleObject(const ServerIntangibleObjectTemplate* newTemp #endif { - WARNING_STRICT_FATAL(!getSharedTemplate(), ("Shared template for %s is NULL", getTemplateName())); + WARNING_STRICT_FATAL(!getSharedTemplate(), ("Shared template for %s is nullptr", getTemplateName())); addMembersToPackages(); ObjectTracker::addIntangible(); } @@ -105,13 +105,13 @@ const SharedObjectTemplate * IntangibleObject::getDefaultSharedTemplate(void) co { static const ConstCharCrcLowerString templateName("object/intangible/base/shared_intangible_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "IntangibleObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -124,10 +124,10 @@ static const ConstCharCrcLowerString templateName("object/intangible/base/shared */ void IntangibleObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // IntangibleObject::removeDefaultTemplate @@ -161,7 +161,7 @@ void IntangibleObject::onLoadedFromDatabase() if (flatten != 0) { TerrainGenerator::Layer * layer = TerrainModificationHelper::importLayer(THEATER_FLATTEN_LAYER.c_str()); - if (layer != NULL) + if (layer != nullptr) { setLayer(layer); } @@ -192,7 +192,7 @@ void IntangibleObject::onLoadedFromDatabase() void IntangibleObject::sendObjectSpecificBaselinesToClient(Client const &client) const { ServerObject::sendObjectSpecificBaselinesToClient(client); - if (getLayer() != NULL) + if (getLayer() != nullptr) { client.send(GenericValueTypeMessage >( "IsFlattenedTheaterMessage", std::make_pair(getNetworkId(), true)), true); @@ -235,9 +235,9 @@ size_t i; Transform tr; tr.setPosition_p(myPos+m_positions[i]); ServerObject * newObject = ServerWorld::createNewObject(m_crcs[i], tr, 0, false); - if (newObject != NULL) + if (newObject != nullptr) { - if (newObject->asTangibleObject() != NULL) + if (newObject->asTangibleObject() != nullptr) newObject->asTangibleObject()->setVisible(false); newObject->addToWorld(); m_objects.push_back(CachedNetworkId(*newObject)); @@ -300,7 +300,7 @@ size_t i; for (i = 0; i < count; ++i) { ServerObject * object = safe_cast(m_objects[i].getObject()); - if (object != NULL && object->asTangibleObject() != NULL) + if (object != nullptr && object->asTangibleObject() != nullptr) { const ServerObjectTemplate * objTemplate = safe_cast(object->getObjectTemplate()); for (size_t j = 0; j < objTemplate->getVisibleFlagsCount(); ++j) @@ -360,7 +360,7 @@ bool IntangibleObject::isVisibleOnClient (const Client & client) const { if (isTheater()) { - return getLayer() != NULL; + return getLayer() != nullptr; } return true; } @@ -388,7 +388,7 @@ void IntangibleObject::onPermanentlyDestroyed() for (size_t i = 0; i < count; ++i) { ServerObject * object = safe_cast(m_objects[i].getObject()); - if (object != NULL) + if (object != nullptr) object->permanentlyDestroy(DeleteReasons::Consumed); } if (!m_theaterName.get().empty()) @@ -439,7 +439,7 @@ bool IntangibleObject::persist() splitCount = 0; } ServerObject * o = safe_cast((*i).getObject()); - if (o != NULL) + if (o != nullptr) { o->persist(); splitObjects.back().push_back(*i); @@ -452,7 +452,7 @@ bool IntangibleObject::persist() if (m_player.get() != CachedNetworkId::cms_cachedInvalid) setObjVarItem(OBJVAR_THEATER_PLAYER, m_player.get()); setObjVarItem(OBJVAR_THEATER_NAME, m_theaterName.get()); - if (getLayer() != NULL) + if (getLayer() != nullptr) setObjVarItem(OBJVAR_THEATER_FLATTEN, 1); char buffer[32]; @@ -551,7 +551,7 @@ int IntangibleObject::getObjectsCreatedPerFrame() int IntangibleObject::getNumObjects(const std::string & datatable) { DataTable * dt = DataTableManager::getTable(datatable, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("IntangibleObject::getNumObjects could not open " "datatable %s", datatable.c_str())); @@ -586,7 +586,7 @@ int IntangibleObject::getNumObjects(const std::string & datatable) float IntangibleObject::getRadius(const std::string & datatable) { DataTable * dt = DataTableManager::getTable(datatable, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("IntangibleObject::getRadius could not open " "datatable %s", datatable.c_str())); @@ -648,18 +648,18 @@ IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, const Vector & position, const std::string & script, TheaterLocationType locationType) { DataTable * dt = DataTableManager::getTable(datatable, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("IntangibleObject::spawnTheater could not open " "datatable %s", datatable.c_str())); - return NULL; + return nullptr; } int rows = dt->getNumRows(); if (rows <= 0) { WARNING(true, ("IntangibleObject::spawnTheater datatable %s has no " "rows", datatable.c_str())); - return NULL; + return nullptr; } int templateColumn = dt->findColumnNumber("template"); @@ -684,7 +684,7 @@ IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, { WARNING(true, ("IntangibleObject::spawnTheater datatable %s has no " "objects", datatable.c_str())); - return NULL; + return nullptr; } skipFirstRow = true; objectCrcs.erase(objectCrcs.begin()); @@ -737,11 +737,11 @@ IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, float centerX = minx + dx / 2.0f + position.x; float centerZ = minz + dz / 2.0f + position.z; - TerrainGenerator::Layer * layer = NULL; + TerrainGenerator::Layer * layer = nullptr; if (locationType == TLT_flatten) { layer = TerrainModificationHelper::importLayer(THEATER_FLATTEN_LAYER.c_str()); - if (layer == NULL) + if (layer == nullptr) { WARNING (true, ("Layer %s not found for theater %s, using getGoodLocation " "instead", THEATER_FLATTEN_LAYER.c_str(), datatable.c_str())); @@ -770,7 +770,7 @@ IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, iter != regions.end(); ++iter) { const Region * region = *iter; - if (region != NULL) + if (region != nullptr) { if (region->getPvp() == RegionNamespace::RP_pvpBattlefield || region->getPvp() == RegionNamespace::RP_pveBattlefield || @@ -796,7 +796,7 @@ IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, IntangibleObject * theater = safe_cast(ServerWorld::createNewObject(THEATER_TEMPLATE, tr, 0, false)); NOT_NULL(theater); - if (layer != NULL) + if (layer != nullptr) { theater->setLayer(layer); } diff --git a/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp index a7de4055..3d3c72ff 100755 --- a/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp +++ b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp @@ -308,14 +308,14 @@ bool LineOfSightCache::checkLOS(Object const &a, Location const &b) Clock::getFrameStartTimeMs() + ConfigServerGame::getLineOfSightCacheDurationMs())); CellProperty const * const sourceCell = source->getParentCell(); - CellProperty const * targetCell = NULL; + CellProperty const * targetCell = nullptr; if (b.getCell() != NetworkId::cms_invalid) { Object const * cellObject = NetworkIdManager::getObjectById(b.getCell()); - if (cellObject != NULL) + if (cellObject != nullptr) targetCell = ContainerInterface::getCell(*cellObject); } - if (targetCell == NULL) + if (targetCell == nullptr) targetCell = CellProperty::getWorldCellProperty(); // if source and target are in the same cell in a player structure, skip LOS check; @@ -418,7 +418,7 @@ bool LineOfSightCache::checkLOS(Object const &a, Location const &b) qirResult = CollisionWorld::queryInteraction( targetCell, b.getCoordinates(), sourceCell, sourceTop, - NULL, + nullptr, (!ConfigSharedCollision::getIgnoreTerrainLos() && !ConfigSharedCollision::getGenerateTerrainLos()), false, ConfigSharedCollision::getTerrainLOSMinDistance(), diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp index c199bd84..50fec4c8 100755 --- a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp @@ -99,11 +99,11 @@ namespace ManufactureInstallationObjectNamespace bool isOutputHopperFull(ManufactureInstallationObject const & mio) { ServerObject const * const outputHopper = mio.getOutputHopper(); - if (outputHopper == NULL) + if (outputHopper == nullptr) return false; VolumeContainer const * const hopperContainer = ContainerInterface::getVolumeContainer(*outputHopper); - if (hopperContainer == NULL) + if (hopperContainer == nullptr) return false; return (hopperContainer->getCurrentVolume() >= hopperContainer->getTotalVolume()); @@ -170,7 +170,7 @@ void ManufactureInstallationObject::endBaselines() // if we are active, make sure we have the right data if (isAuthoritative() && isActive()) { - if (getSchematic() == NULL) + if (getSchematic() == nullptr) { WARNING(true, ("Manufacture installation %s is set to active but has not schematic available!", getNetworkId().getValueString().c_str())); @@ -302,17 +302,17 @@ void ManufactureInstallationObject::setOwnerId(const NetworkId &id) InstallationObject::setOwnerId(id); const Object * const object = NetworkIdManager::getObjectById(id); - if (object != NULL) + if (object != nullptr) { const ServerObject * const owner = safe_cast(object); setObjVarItem(OBJVAR_OWNER_NAME, Unicode::wideToNarrow(owner->getObjectName())); // we need to store the owner's Station id for logging purposes const CreatureObject * const creatureOwner = owner->asCreatureObject(); - if (creatureOwner != NULL) + if (creatureOwner != nullptr) { const PlayerObject * const player = PlayerCreatureController::getPlayerObject(creatureOwner); - if (player != NULL) + if (player != nullptr) { setObjVarItem(OBJVAR_OWNER_STATION_ID, static_cast(player->getStationId())); } @@ -331,10 +331,10 @@ ServerObject * ManufactureInstallationObject::getInputHopper() const { SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str())); - return NULL; + return nullptr; } Container::ContainerErrorCode tmp = Container::CEC_Success; @@ -342,7 +342,7 @@ ServerObject * ManufactureInstallationObject::getInputHopper() const if (hopperId == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("Manufacture installation %s does not have an input hopper!", getDebugInformation().c_str())); - return NULL; + return nullptr; } return safe_cast(hopperId.getObject()); @@ -359,10 +359,10 @@ ServerObject * ManufactureInstallationObject::getOutputHopper() const { SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str())); - return NULL; + return nullptr; } Container::ContainerErrorCode tmp = Container::CEC_Success; @@ -370,7 +370,7 @@ ServerObject * ManufactureInstallationObject::getOutputHopper() const if (hopperId == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("Manufacture installation %s does not have an output hopper!", getDebugInformation().c_str())); - return NULL; + return nullptr; } return safe_cast(hopperId.getObject()); @@ -399,7 +399,7 @@ bool ManufactureInstallationObject::addSchematic(ManufactureSchematicObject & sc SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str())); return false; @@ -433,7 +433,7 @@ bool ManufactureInstallationObject::onContainerAboutToLoseItem(ServerObject * de { bool isSchematic = false; const ManufactureSchematicObject * const schematic = getSchematic(); - if (schematic != NULL && schematic->getNetworkId() == item.getNetworkId()) + if (schematic != nullptr && schematic->getNetworkId() == item.getNetworkId()) { isSchematic = true; if (isActive()) @@ -465,10 +465,10 @@ ManufactureSchematicObject * ManufactureInstallationObject::getSchematic() const // get our manufacturing schematic SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str())); - return NULL; + return nullptr; } Container::ContainerErrorCode tmp = Container::CEC_Success; @@ -486,7 +486,7 @@ ManufactureSchematicObject * ManufactureInstallationObject::getSchematic() const float ManufactureInstallationObject::getTimePerObject() const { ManufactureSchematicObject * const schematic = getSchematic(); - if (schematic == NULL) + if (schematic == nullptr) return 0; #ifdef _DEBUG @@ -516,7 +516,7 @@ float ManufactureInstallationObject::getTimePerObject() const getObjVars().getItem(OBJVAR_OWNER_SKILL,ownerSkill); int skill = 0; - if (owner != NULL) + if (owner != nullptr) { skill = owner->getEnhancedModValue(FACTORY_SKILL_MOD); @@ -551,7 +551,7 @@ void ManufactureInstallationObject::activate(const NetworkId &actorId) { if (isAuthoritative() && !isActive()) { - if (getSchematic() == NULL) + if (getSchematic() == nullptr) { WARNING(true, ("Manufacture installation %s tried to activate with " "no schematic available!", getNetworkId().getValueString().c_str())); @@ -588,7 +588,7 @@ void ManufactureInstallationObject::activate(const NetworkId &actorId) OutOfBandPackager::pack(pp, -1, oob); } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob); } @@ -615,7 +615,7 @@ void ManufactureInstallationObject::deactivate() OutOfBandPackager::pack(pp, -1, oob); } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob); } @@ -645,13 +645,13 @@ void ManufactureInstallationObject::harvest() maxItemCount = schematic->getCount(); } - if (schematic == NULL || maxItemCount <= 0) + if (schematic == nullptr || maxItemCount <= 0) { setTickCount(0); // to avoid recursion deactivate(); - if (schematic == NULL) + if (schematic == nullptr) { - WARNING(true, ("ManufactureInstallationObject::harvest called on object %s with a NULL schematic", + WARNING(true, ("ManufactureInstallationObject::harvest called on object %s with a nullptr schematic", getNetworkId().getValueString().c_str())); Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_1, Unicode::emptyString); @@ -694,7 +694,7 @@ void ManufactureInstallationObject::harvest() OutOfBandPackager::pack(pp, -1, oob); } const Object * owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob); } @@ -748,7 +748,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) int i; ManufactureSchematicObject * schematic = getSchematic(); - if (schematic == NULL) + if (schematic == nullptr) { WARNING(true, ("ManufactureInstallationObject::createObject can't find schematic for station %s", getNetworkId().getValueString().c_str())); @@ -771,7 +771,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) } ServerObject * inputHopper = getInputHopper(); - if (inputHopper == NULL) + if (inputHopper == nullptr) { WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject can't find input hopper for station %s", getNetworkId().getValueString().c_str())); @@ -782,7 +782,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) } ServerObject * outputHopper = getOutputHopper(); - if (outputHopper == NULL) + if (outputHopper == nullptr) { WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject can't find output hopper for station %s", getNetworkId().getValueString().c_str())); @@ -803,7 +803,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) { // is there a current crate in the output hopper put we can stuff objects into FactoryObject * crate = getCurrentCrate(*schematic); - if (crate == NULL) + if (crate == nullptr) { // is there room in the output hopper for a new crate outputHopperFull = isOutputHopperFull(*this); @@ -819,7 +819,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) OutOfBandPackager::pack(pp, -1, oob); } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) { Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob); } @@ -894,7 +894,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) // the ingredient needs to be made with the same template const ObjectTemplate * componentTemplate = ObjectTemplateList::fetch( componentInfo->templateName); - if (componentTemplate != NULL) + if (componentTemplate != nullptr) { for (j = 0; j < ingredientCount; ++j) { @@ -945,7 +945,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) ProsePackage pp; ProsePackageManagerServer::createSimpleProsePackageParticipant (*this, pp.target); - if (resource != NULL) + if (resource != nullptr) { pp.stringId = StringIds::manf_no_named_resource; pp.other.str = Unicode::narrowToWide(resource->getResourceName()); @@ -957,7 +957,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) } const Object * const owner = NetworkIdManager::getObjectById(getOwnerId()); - if (owner != NULL) + if (owner != nullptr) Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob); Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::no_ingredients, Unicode::emptyString, oob); @@ -1000,7 +1000,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) { TangibleObject * object = safe_cast(schematic-> manufactureObject(getOwnerId(), *this, newObjectSlotId, false)); - if (object == NULL) + if (object == nullptr) { WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to create object for station %s", getNetworkId().getValueString().c_str())); @@ -1009,7 +1009,7 @@ bool ManufactureInstallationObject::createObject(bool testOnly) return false; } - if (!ContainerInterface::transferItemToVolumeContainer(*outputHopper, *object, NULL, tmp)) + if (!ContainerInterface::transferItemToVolumeContainer(*outputHopper, *object, nullptr, tmp)) { object->permanentlyDestroy(DeleteReasons::BadContainerTransfer); WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to transfer new object for station %s, error code = %d", @@ -1024,12 +1024,12 @@ bool ManufactureInstallationObject::createObject(bool testOnly) { // put the object in a box of objects FactoryObject * crate = getCurrentCrate(*schematic); - if (crate == NULL) + if (crate == nullptr) { // make a new crate to put the object in crate = makeNewCrate(*schematic); } - if (crate == NULL) + if (crate == nullptr) { WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to create factory crate for station %s", getNetworkId().getValueString().c_str())); @@ -1082,7 +1082,7 @@ void ManufactureInstallationObject::restoreIngredients(IngredientVector const &i if (count != 0) { FactoryObject * crate = dynamic_cast(itemId.getObject()); - if (crate != NULL) + if (crate != nullptr) crate->incrementCount(count); } } @@ -1109,7 +1109,7 @@ void ManufactureInstallationObject::destroyIngredients(IngredientVector const &i else { FactoryObject * crate = dynamic_cast(itemId.getObject()); - if (crate != NULL) + if (crate != nullptr) { LOG("CustomerService", ("Crafting:destroying %d ingredients from crate %s in manf station %s owned by %s", count, itemId.getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str())); if (crate->getCount() == 0) @@ -1149,7 +1149,7 @@ bool ManufactureInstallationObject::transferCraftedIngredientToSchematic( // crafted id as the component wanted VolumeContainer * container = ContainerInterface::getVolumeContainer(inputHopper); - if (container == NULL) + if (container == nullptr) return false; // stuff to keep track of crates that don't have enough ingredients @@ -1160,11 +1160,11 @@ bool ManufactureInstallationObject::transferCraftedIngredientToSchematic( { const Container::ContainedItem & itemId = *iter; TangibleObject * object = safe_cast(itemId.getObject()); - if (object != NULL && object->getCraftedId() == craftedId) + if (object != nullptr && object->getCraftedId() == craftedId) { // see if the object is a factory or not FactoryObject * crate = dynamic_cast(object); - if (crate != NULL) + if (crate != nullptr) { // see if the crate has enough objects or not int crateCount = crate->getCount(); @@ -1247,18 +1247,18 @@ const NetworkId & ManufactureInstallationObject::transferTemplateIngredientToSch VolumeContainer * container = ContainerInterface::getVolumeContainer( inputHopper); - if (container == NULL) + if (container == nullptr) return NetworkId::cms_invalid; for (ContainerIterator iter = container->begin(); iter != container->end(); ++iter) { const Container::ContainedItem & itemId = *iter; TangibleObject * object = safe_cast(itemId.getObject()); - if (object != NULL) + if (object != nullptr) { // see if the object is a factory or not FactoryObject * crate = dynamic_cast(object); - if (crate != NULL && crate->getCount() > 0) + if (crate != nullptr && crate->getCount() > 0) { if (crate->getContainedObjectTemplate() == &componentTemplate) { @@ -1300,7 +1300,7 @@ const NetworkId & ManufactureInstallationObject::transferResourceTypeToSchematic const NetworkId & resourceTypeId, int resourceCount) { VolumeContainer * const container = ContainerInterface::getVolumeContainer(inputHopper); - if (container == NULL) + if (container == nullptr) return NetworkId::cms_invalid; // keep a map of the sources that are providing the resources @@ -1317,7 +1317,7 @@ const NetworkId & ManufactureInstallationObject::transferResourceTypeToSchematic const Container::ContainedItem & itemId = *iter; ResourceContainerObject * object = dynamic_cast( itemId.getObject()); - if (object != NULL && object->getResourceTypeId() == resourceTypeId) + if (object != nullptr && object->getResourceTypeId() == resourceTypeId) { // see if this crate fills our requirements if (object->getQuantity() >= resourceCount) @@ -1346,7 +1346,7 @@ const NetworkId & ManufactureInstallationObject::transferResourceTypeToSchematic if (!smallCrate->removeResource(resourceTypeId, smallCrate->getQuantity(), &sources)) return NetworkId::cms_invalid; // small crate has been deleted by the resource system - *crateIter = NULL; + *crateIter = nullptr; ++crateIter; } else @@ -1390,41 +1390,41 @@ const NetworkId & ManufactureInstallationObject::transferResourceTypeToSchematic * * @param contents an object we want to put in the crate * - * @return the crate, or NULL if we have no crate + * @return the crate, or nullptr if we have no crate */ FactoryObject * ManufactureInstallationObject::getCurrentCrate(const ManufactureSchematicObject & source) { - FactoryObject * crate = NULL; + FactoryObject * crate = nullptr; ServerObject * outputHopper = getOutputHopper(); - if (outputHopper == NULL) - return NULL; + if (outputHopper == nullptr) + return nullptr; - if (m_currentCrate.getObject() != NULL) + if (m_currentCrate.getObject() != nullptr) { crate = safe_cast(m_currentCrate.getObject()); // make sure the crate is still in our hopper and is not full - if (crate != NULL && ContainerInterface::getContainedByObject(*crate) == outputHopper && + if (crate != nullptr && ContainerInterface::getContainedByObject(*crate) == outputHopper && crate->getCraftedId() == source.getOriginalId()) { if (crate->getCount() < source.getItemsPerContainer()) return crate; else - return NULL; + return nullptr; } } // see if there is another non-full crate in the output hopper we could use const VolumeContainer * hopperContainer = ContainerInterface::getVolumeContainer( *outputHopper); - if (hopperContainer != NULL) + if (hopperContainer != nullptr) { for (ContainerConstIterator iter = hopperContainer->begin(); iter != hopperContainer->end(); ++iter) { crate = dynamic_cast((*iter).getObject()); - if (crate != NULL && crate->getCraftedId() == source.getOriginalId() && crate->getCount() < source.getItemsPerContainer()) + if (crate != nullptr && crate->getCraftedId() == source.getOriginalId() && crate->getCount() < source.getItemsPerContainer()) { // change our current crate to the one we found m_currentCrate = CachedNetworkId(*crate); @@ -1433,7 +1433,7 @@ FactoryObject * ManufactureInstallationObject::getCurrentCrate(const Manufacture } } - return NULL; + return nullptr; } // ManufactureInstallationObject::getCurrentCrate // ---------------------------------------------------------------------- @@ -1449,21 +1449,21 @@ FactoryObject * ManufactureInstallationObject::getCurrentCrate(const Manufacture FactoryObject * ManufactureInstallationObject::makeNewCrate(const ManufactureSchematicObject & source) { ServerObject * outputHopper = getOutputHopper(); - if (outputHopper == NULL) - return NULL; + if (outputHopper == nullptr) + return nullptr; // get the correct factory object template from the draft schematic const ManufactureSchematicObject * manfSchematic = getSchematic(); - if (manfSchematic == NULL) - return NULL; + if (manfSchematic == nullptr) + return nullptr; const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic( manfSchematic->getDraftSchematic()); - if (draftSchematic == NULL) - return NULL; + if (draftSchematic == nullptr) + return nullptr; - ServerObject * object = NULL; + ServerObject * object = nullptr; const ServerFactoryObjectTemplate * crateTemplate = draftSchematic->getCrateObjectTemplate(); - if (crateTemplate != NULL) + if (crateTemplate != nullptr) { object = ServerWorld::createNewObject(*crateTemplate, *outputHopper, false); } @@ -1472,11 +1472,11 @@ FactoryObject * ManufactureInstallationObject::makeNewCrate(const ManufactureSch object = ServerWorld::createNewObject(DEFAULT_FACTORY_OBJECT_TEMPLATE, *outputHopper, false); } - if (object == NULL) - return NULL; + if (object == nullptr) + return nullptr; FactoryObject * crate = dynamic_cast(object); - if (crate == NULL) + if (crate == nullptr) object->permanentlyDestroy(DeleteReasons::SetupFailed); else { @@ -1526,7 +1526,7 @@ bool ManufactureInstallationObject::TaskManufactureObject::run() { ManufactureInstallationObject * manfInst = safe_cast (m_manfInstallation.getObject()); - if (manfInst == NULL || !manfInst->isActive()) + if (manfInst == nullptr || !manfInst->isActive()) return true; if (!manfInst->createObject()) @@ -1545,7 +1545,7 @@ void ManufactureInstallationObject::getAttributes(AttributeVector & data) const InstallationObject::getAttributes(data); ManufactureSchematicObject * schematic = getSchematic(); - if (schematic != NULL) + if (schematic != nullptr) { char valueBuffer[32]; const size_t valueBuffer_size = sizeof (valueBuffer); diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp index 00b51fc1..e4646395 100755 --- a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp @@ -96,7 +96,7 @@ using namespace ManufactureSchematicObjectNamespace; //---------------------------------------------------------------------- -const SharedObjectTemplate * ManufactureSchematicObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * ManufactureSchematicObject::m_defaultSharedTemplate = nullptr; //======================================================================== @@ -170,11 +170,11 @@ const SharedObjectTemplate * ManufactureSchematicObject::getDefaultSharedTemplat { static const ConstCharCrcLowerString templateName("object/manufacture_schematic/base/shared_manufacture_schematic_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast(ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create default shared object template %s", templateName.getString())); + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "ManufactureSchematicObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -187,10 +187,10 @@ const SharedObjectTemplate * ManufactureSchematicObject::getDefaultSharedTemplat */ void ManufactureSchematicObject::removeDefaultTemplate() { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // ManufactureSchematicObject::removeDefaultTemplate @@ -209,7 +209,7 @@ void ManufactureSchematicObject::init(const DraftSchematicObject & schematic, co m_draftSchematicSharedTemplate = schematic.getSharedTemplate()->getCrcName().getCrc(); m_creatorId = creator; - if (creator.getObject() != NULL) + if (creator.getObject() != nullptr) { m_creatorName = safe_cast(creator.getObject())-> getObjectName(); @@ -481,7 +481,7 @@ ServerIntangibleObjectTemplate::CraftingType ManufactureSchematicObject::getCate { schematicOk = false; } - else if (draft != NULL) + else if (draft != nullptr) { // test the ingredients Crafting::IngredientSlot sourceSlot; @@ -520,11 +520,11 @@ ServerIntangibleObjectTemplate::CraftingType ManufactureSchematicObject::getCate return draft->getCategory(); // this schematic can't be used, inform the player - const CreatureObject * owner = NULL; + const CreatureObject * owner = nullptr; const Object * object = ContainerInterface::getContainedByObject(*this); - while (owner == NULL && object != NULL && object->asServerObject() != NULL) + while (owner == nullptr && object != nullptr && object->asServerObject() != nullptr) { - if (object->asServerObject()->asCreatureObject() != NULL) + if (object->asServerObject()->asCreatureObject() != nullptr) owner = object->asServerObject()->asCreatureObject(); else object = ContainerInterface::getContainedByObject(*object); @@ -534,7 +534,7 @@ ServerIntangibleObjectTemplate::CraftingType ManufactureSchematicObject::getCate LOG("CustomerService", ("Crafting:Manufacturing schematic %s " "owned by %s is unuseable due to %s", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(owner).c_str(), errBuffer)); - if (owner != NULL) + if (owner != nullptr) { // send mail to the owner telling them their schematic can't be used const static StringId message("system_msg", "manf_schematic_unuseable"); @@ -562,7 +562,7 @@ bool ManufactureSchematicObject::mustDestroyIngredients() const const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( m_draftSchematic.get()); NOT_NULL(draft); - if (draft != NULL) + if (draft != nullptr) return draft->mustDestroyIngredients(); return false; } // ManufactureSchematicObject::mustDestroyIngredients @@ -701,12 +701,12 @@ bool ManufactureSchematicObject::getSlot(int index, Crafting::IngredientSlot & d // get the xp type based on the resource container int xpType = 0; const ResourceTypeObject * const resourceType = ServerUniverse::getInstance().getResourceTypeById(ingredientId); - if (resourceType != NULL) + if (resourceType != nullptr) { std::string crateTemplateName; resourceType->getCrateTemplate(crateTemplateName); const ServerObjectTemplate * crateTemplate = safe_cast(ObjectTemplateList::fetch(crateTemplateName)); - if (crateTemplate != NULL && crateTemplate->getXpPointsCount() > 0) + if (crateTemplate != nullptr && crateTemplate->getXpPointsCount() > 0) { ServerObjectTemplate::Xp xpData; crateTemplate->getXpPoints(xpData, 0); @@ -1024,10 +1024,10 @@ void ManufactureSchematicObject::addSlotComponent(const StringId & name, // Check if the object being added is a factory const TangibleObject * componentPtr = &component; const FactoryObject * factory = dynamic_cast(&component); - if (factory != NULL) + if (factory != nullptr) { componentPtr = factory->getContainedObject(); - if (componentPtr == NULL) + if (componentPtr == nullptr) { WARNING(true, ("ManufactureSchematicObject::addSlotComponent passed " "FactoryObject %s with no contained object", @@ -1112,11 +1112,11 @@ TangibleObject * ManufactureSchematicObject::getComponent( const Crafting::ComponentIngredient & info) const { const VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this); - if (volumeContainer == NULL) + if (volumeContainer == nullptr) { DEBUG_WARNING(true, ("Manf schematic %s does not have a volume container!", getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } // check if the component is in a FactoryObject; if it is, return the factory, @@ -1124,10 +1124,10 @@ TangibleObject * ManufactureSchematicObject::getComponent( if (info.ingredient != NetworkId::cms_invalid) { ServerObject * object = ServerWorld::findObjectByNetworkId(info.ingredient); - if (object != NULL) + if (object != nullptr) { Object * container = ContainerInterface::getContainedByObject(*object); - if (container != NULL && dynamic_cast(container) != NULL) + if (container != nullptr && dynamic_cast(container) != nullptr) return safe_cast(container); } } @@ -1137,7 +1137,7 @@ TangibleObject * ManufactureSchematicObject::getComponent( { const Container::ContainedItem & item = *iter; TangibleObject * object = safe_cast(item.getObject()); - if (object != NULL) + if (object != nullptr) { if (info.ingredient != NetworkId::cms_invalid) { @@ -1154,7 +1154,7 @@ TangibleObject * ManufactureSchematicObject::getComponent( } } } - return NULL; + return nullptr; } // ManufactureSchematicObject::getComponent //----------------------------------------------------------------------- @@ -1295,7 +1295,7 @@ void ManufactureSchematicObject::clearSlotSources() m_factories.begin(); iter != m_factories.end(); ++iter) { FactoryObject * factory = safe_cast((*iter).getObject()); - if (factory != NULL) + if (factory != nullptr) { factory->endCraftingSession(); } @@ -1305,23 +1305,23 @@ void ManufactureSchematicObject::clearSlotSources() // get rid of all our held ingredients VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this); - if (volumeContainer != NULL && volumeContainer->getNumberOfItems() > 0) + if (volumeContainer != nullptr && volumeContainer->getNumberOfItems() > 0) { // for a stacked ingredient, if there are still more than one items in the stack, // "consume" 1 item from the stack, and return it to the player's inventory std::set itemsToReturnToInventory; - ServerObject* inventory = NULL; + ServerObject* inventory = nullptr; for (ContainerIterator iter = volumeContainer->begin(); iter != volumeContainer->end(); ++iter) { - if ((*iter).getObject() != NULL) + if ((*iter).getObject() != nullptr) { bool destroyItem = true; TangibleObject* to = safe_cast((*iter).getObject())->asTangibleObject(); - if (to && (to->getCount() > 1) && (dynamic_cast(to) == NULL)) + if (to && (to->getCount() > 1) && (dynamic_cast(to) == nullptr)) { - if (inventory == NULL) + if (inventory == nullptr) { ServerObject * o = safe_cast(ContainerInterface::getContainedByObject(*to)); while (o) @@ -1357,7 +1357,7 @@ void ManufactureSchematicObject::clearSlotSources() Container::ContainerErrorCode errCode; for (std::set::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter) { - if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, nullptr, errCode)) { (*iter)->permanentlyDestroy(DeleteReasons::Replaced); } @@ -1741,11 +1741,11 @@ bool ManufactureSchematicObject::getCustomization(const std::string & name, const DynamicVariableList * objvars = getObjVars(); NOT_NULL(objvars); const DynamicVariableList * customs = safe_cast(objvars->getItemByName("cust")); - if (customs == NULL) + if (customs == nullptr) return false; const DynamicVariableList * custom = safe_cast(customs->getItemByName(name)); - if (custom == NULL) + if (custom == nullptr) return false; data.name = name; @@ -1771,7 +1771,7 @@ bool ManufactureSchematicObject::getCustomization(int index, const DynamicVariableList * objvars = getObjVars(); NOT_NULL(objvars); const DynamicVariableList * customs = safe_cast(objvars->getItemByName("cust")); - if (customs == NULL) + if (customs == nullptr) return false; int count = customs->getCount(); @@ -1799,7 +1799,7 @@ int ManufactureSchematicObject::getCustomizationsCount() const const DynamicVariableList * objvars = getObjVars(); NOT_NULL(objvars); const DynamicVariableList * customs = safe_cast(objvars->getItemByName("cust")); - if (customs == NULL) + if (customs == nullptr) return 0; return customs->getCount(); @@ -1838,7 +1838,7 @@ bool ManufactureSchematicObject::setCustomization(int index, int value, ServerObject & prototype) { ManufactureSchematicSynchronizedUi * sync = safe_cast(getSynchronizedUi ()); - if (sync == NULL) + if (sync == nullptr) return false; const std::string & customName = sync->getCustomizationName(index); @@ -1863,7 +1863,7 @@ bool ManufactureSchematicObject::setCustomization(const std::string & name, int value, ServerObject & prototype) { ManufactureSchematicSynchronizedUi * sync = safe_cast(getSynchronizedUi ()); - if (sync == NULL) + if (sync == nullptr) return false; // make sure the value is within range @@ -1878,10 +1878,10 @@ bool ManufactureSchematicObject::setCustomization(const std::string & name, // save the customization string CustomizationDataProperty * const cdProperty = safe_cast(prototype.getProperty(CustomizationDataProperty::getClassPropertyId())); - if (cdProperty != NULL) + if (cdProperty != nullptr) { CustomizationData *const customizationData = cdProperty->fetchCustomizationData(); - if (customizationData != NULL) + if (customizationData != nullptr) { m_appearanceData = customizationData->writeLocalDataToString(); setObjVarItem("customization_data", m_appearanceData.get()); @@ -1993,7 +1993,7 @@ void ManufactureSchematicObject::removeCraftingFactory(const FactoryObject & fac bool ManufactureSchematicObject::addIngredient(ServerObject & component) { Container::ContainerErrorCode tmp = Container::CEC_Success; - return ContainerInterface::transferItemToVolumeContainer(*this, component, NULL, tmp); + return ContainerInterface::transferItemToVolumeContainer(*this, component, nullptr, tmp); } // ManufactureSchematicObject::addIngredient //----------------------------------------------------------------------- @@ -2037,7 +2037,7 @@ bool ManufactureSchematicObject::removeIngredient(ServerObject & component, { // if the component is a factory, treat is differently FactoryObject * factory = dynamic_cast(&component); - if (factory != NULL) + if (factory != nullptr) { // if the factory is contained by us, move it to the destination, // making sure that its count is 1; if it is not contained by us, @@ -2050,7 +2050,7 @@ bool ManufactureSchematicObject::removeIngredient(ServerObject & component, factory->removeCraftingReferences(factory->getCount() - 1); Container::ContainerErrorCode errCode; return ContainerInterface::transferItemToVolumeContainer(destination, - *factory, NULL, errCode); + *factory, nullptr, errCode); } else { @@ -2064,17 +2064,17 @@ bool ManufactureSchematicObject::removeIngredient(ServerObject & component, { // make sure the component is in our container Object * container = ContainerInterface::getContainedByObject(component); - if (container == NULL || container->getNetworkId() != getNetworkId()) + if (container == nullptr || container->getNetworkId() != getNetworkId()) { FactoryObject * factory = dynamic_cast(container); - if (factory != NULL) + if (factory != nullptr) return removeIngredient(*factory, destination); return false; } Container::ContainerErrorCode errCode; return ContainerInterface::transferItemToVolumeContainer(destination, component, - NULL, errCode); + nullptr, errCode); } } // ManufactureSchematicObject::removeIngredient @@ -2169,7 +2169,7 @@ void ManufactureSchematicObject::destroyAllIngredients() m_factories.begin(); iter != m_factories.end(); ++iter) { FactoryObject * factory = safe_cast((*iter).getObject()); - if (factory != NULL) + if (factory != nullptr) { factory->endCraftingSession(); } @@ -2179,24 +2179,24 @@ void ManufactureSchematicObject::destroyAllIngredients() // empty our volume container VolumeContainer * const container = ContainerInterface::getVolumeContainer(*this); - if (container != NULL) + if (container != nullptr) { // for a stacked ingredient, if there are still more than one items in the stack, // "consume" 1 item from the stack, and return it to the player's inventory std::set itemsToReturnToInventory; - ServerObject* inventory = NULL; + ServerObject* inventory = nullptr; ContainerIterator iter; for (iter = container->begin(); iter != container->end(); ++iter) { CachedNetworkId & itemId = *iter; - if (itemId.getObject() != NULL) + if (itemId.getObject() != nullptr) { bool destroyItem = true; TangibleObject* to = safe_cast(itemId.getObject())->asTangibleObject(); - if (to && (to->getCount() > 1) && (dynamic_cast(to) == NULL)) + if (to && (to->getCount() > 1) && (dynamic_cast(to) == nullptr)) { - if (inventory == NULL) + if (inventory == nullptr) { ServerObject * o = safe_cast(ContainerInterface::getContainedByObject(*to)); while (o) @@ -2235,7 +2235,7 @@ void ManufactureSchematicObject::destroyAllIngredients() Container::ContainerErrorCode errCode; for (std::set::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter) { - if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, nullptr, errCode)) { (*iter)->permanentlyDestroy(DeleteReasons::Consumed); } @@ -2281,29 +2281,29 @@ void ManufactureSchematicObject::destroyAllIngredients() ServerObject * ManufactureSchematicObject::manufactureObject(const NetworkId & creatorId, ServerObject & container, const SlotId & containerSlotId, bool prototype) { if (getCount() <= 0) - return NULL; + return nullptr; const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(m_draftSchematic.get()); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) { - return NULL; + return nullptr; } - if (draftSchematic->getCraftedObjectTemplate() == NULL) + if (draftSchematic->getCraftedObjectTemplate() == nullptr) { DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable object template!\n", draftSchematic->getTemplateName())); - return NULL; + return nullptr; } // create the item TangibleObject * const object = dynamic_cast(ServerWorld::createNewObject(*draftSchematic->getCraftedObjectTemplate(), container, containerSlotId, false)); - if (object == NULL) + if (object == nullptr) { DEBUG_WARNING(true, ("Player %s failed to create object for template " "%s.\n", creatorId.getValueString().c_str(), draftSchematic->getCraftedObjectTemplate()->getName())); - return NULL; + return nullptr; } if (!getAssignedObjectName().empty()) @@ -2327,7 +2327,7 @@ ServerObject * ManufactureSchematicObject::manufactureObject(const NetworkId & c // set the creator xp type from the schematic template const ServerObjectTemplate * schematicTemplate = safe_cast(draftSchematic->getObjectTemplate()); - if (schematicTemplate != NULL && schematicTemplate->getXpPointsCount() > 0) + if (schematicTemplate != nullptr && schematicTemplate->getXpPointsCount() > 0) { ServerObjectTemplate::Xp xpData; schematicTemplate->getXpPoints(xpData, 0); @@ -2339,7 +2339,7 @@ ServerObject * ManufactureSchematicObject::manufactureObject(const NetworkId & c if (!setObjectComponents(object, true)) { object->permanentlyDestroy(DeleteReasons::BadContainerTransfer); - return NULL; + return nullptr; } // allow the schematic scripts to modify the object @@ -2356,7 +2356,7 @@ ServerObject * ManufactureSchematicObject::manufactureObject(const NetworkId & c if (result == SCRIPT_OVERRIDE) { object->permanentlyDestroy(DeleteReasons::Script); - return NULL; + return nullptr; } incrementCount(-1); @@ -2392,15 +2392,15 @@ ServerObject * ManufactureSchematicObject::manufactureObject(const Vector & posi { const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic( m_draftSchematic.get()); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) { - return NULL; + return nullptr; } - if (draftSchematic->getCraftedObjectTemplate() == NULL) + if (draftSchematic->getCraftedObjectTemplate() == nullptr) { DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable " "object template!\n", draftSchematic->getTemplateName())); - return NULL; + return nullptr; } Transform tr; @@ -2409,11 +2409,11 @@ ServerObject * ManufactureSchematicObject::manufactureObject(const Vector & posi TangibleObject * object = dynamic_cast(ServerWorld::createNewObject( *draftSchematic->getCraftedObjectTemplate(), tr, 0, false)); - if (object == NULL) + if (object == nullptr) { DEBUG_WARNING(true, ("Failed to create object for template " "%s.\n", draftSchematic->getCraftedObjectTemplate()->getName())); - return NULL; + return nullptr; } if (!getAssignedObjectName().empty()) @@ -2468,7 +2468,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo // check the objects in the schematic volume container to make sure they match VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this); - if (volumeContainer == NULL) + if (volumeContainer == nullptr) { DEBUG_WARNING(true, ("Manf schematic %s does not have a volume container!", getNetworkId().getValueString().c_str())); @@ -2478,7 +2478,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo // for a stacked ingredient, if there are still more than one items in the stack, // "consume" 1 item from the stack, and return it to the player's inventory std::set itemsToReturnToInventory; - ServerObject* inventory = NULL; + ServerObject* inventory = nullptr; DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS); @@ -2533,11 +2533,11 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo { Container::ContainedItem & item = *iter; TangibleObject * const testComponent = dynamic_cast(item.getObject()); - if (testComponent == NULL) + if (testComponent == nullptr) continue; if (itemsToReturnToInventory.count(testComponent) > 0) continue; - FactoryObject * crate = NULL; + FactoryObject * crate = nullptr; bool found = false; bool foundCrate = false; if (component->ingredient != NetworkId::cms_invalid) @@ -2548,7 +2548,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo // see if the test component is a crate crate = dynamic_cast(testComponent); - if (crate != NULL && crate->getCount() == ingredientCount) + if (crate != nullptr && crate->getCount() == ingredientCount) { foundCrate = true; } @@ -2598,7 +2598,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo if (!componentTableName.empty()) { DataTable * componentTable = DataTableManager::getTable(componentTableName, true); - if (componentTable != NULL) + if (componentTable != nullptr) { uint32 value = INVALID_CRC; if (draftSlot.appearance == "component") @@ -2645,9 +2645,9 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo } bool destroyItem = true; - if ((testComponent->getCount() > 1) && (dynamic_cast(testComponent) == NULL)) + if ((testComponent->getCount() > 1) && (dynamic_cast(testComponent) == nullptr)) { - if (inventory == NULL) + if (inventory == nullptr) { ServerObject * o = safe_cast(ContainerInterface::getContainedByObject(*testComponent)); while (o) @@ -2701,7 +2701,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo Container::ContainerErrorCode errCode; for (std::set::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter) { - if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, nullptr, errCode)) { (*iter)->permanentlyDestroy(DeleteReasons::Consumed); } @@ -2723,15 +2723,15 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo for (iter = volumeContainer->begin(); iter != volumeContainer->end(); ++iter) { - if ((*iter).getObject() != NULL) + if ((*iter).getObject() != nullptr) { ServerObject * temp = safe_cast((*iter).getObject()); bool destroyItem = true; TangibleObject* to = temp->asTangibleObject(); - if (to && (to->getCount() > 1) && (dynamic_cast(to) == NULL)) + if (to && (to->getCount() > 1) && (dynamic_cast(to) == nullptr)) { - if (inventory == NULL) + if (inventory == nullptr) { ServerObject * o = safe_cast(ContainerInterface::getContainedByObject(*to)); while (o) @@ -2787,7 +2787,7 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo Container::ContainerErrorCode errCode; for (std::set::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter) { - if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, nullptr, errCode)) { (*iter)->permanentlyDestroy(DeleteReasons::Replaced); } @@ -2847,7 +2847,7 @@ void ManufactureSchematicObject::requestSlots(ServerObject & player) const case Crafting::IT_schematicGeneric: { const TangibleObject * const ingredient = dynamic_cast(NetworkIdManager::getObjectById(ingredientId)); - if (ingredient != NULL) + if (ingredient != nullptr) { optionInfo.ingredient = ingredient->getEncodedObjectName(); // since names can be duplicated, concatinate the id of @@ -2870,7 +2870,7 @@ void ManufactureSchematicObject::requestSlots(ServerObject & player) const case Crafting::IT_resourceClass: { ResourceTypeObject const * const ingredient = ServerUniverse::getInstance().getResourceTypeById(ingredientId); - if (ingredient != NULL) + if (ingredient != nullptr) optionInfo.ingredient = Unicode::narrowToWide(ingredient->getResourceName()); else optionInfo.ingredient = Unicode::narrowToWide("unknown"); @@ -2942,7 +2942,7 @@ void ManufactureSchematicObject::getIngredientInfo (IngredientInfoVector & iiv) // the manf schematic to the name if (component->ingredient != NetworkId::cms_invalid) { - //-- null-separate the string if needed + //-- nullptr-separate the string if needed if (!ingredientName.empty () && ingredientName [0] == '@') ingredientName.push_back ('\0'); @@ -2990,7 +2990,7 @@ void ManufactureSchematicObject::getIngredientInfo (IngredientInfoVector & iiv) case Crafting::IT_resourceClass: { ResourceTypeObject const * const ingredient = ServerUniverse::getInstance().getResourceTypeById(ingredientId); - if (ingredient != NULL) + if (ingredient != nullptr) ingredientName = Unicode::narrowToWide(ingredient->getResourceName ()); } break; @@ -3125,7 +3125,7 @@ const std::map & ManufactureSchematicObject::getAttributes() co int ManufactureSchematicObject::getVolume() const { const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(getDraftSchematic()); - if (schematic != NULL) + if (schematic != nullptr) return schematic->getObjectTemplate()->asServerObjectTemplate()->getVolume(); return IntangibleObject::getVolume(); } // ManufactureSchematicObject::getVolume @@ -3212,7 +3212,7 @@ void ManufactureSchematicObject::recalculateData() else { const DraftSchematicObject * const missingSchematic = DraftSchematicObject::getSchematic(MISSING_SCHEMATIC_SUBSTITUTE); - if (missingSchematic != NULL) + if (missingSchematic != nullptr) m_draftSchematicSharedTemplate = missingSchematic->getSharedTemplate()->getCrcName().getCrc(); else WARNING_STRICT_FATAL(true, ("Cannot find draft schematic %s! This must always exist!", MISSING_SCHEMATIC_SUBSTITUTE.c_str())); @@ -3262,7 +3262,7 @@ void ManufactureSchematicObject::getByteStreamFromAutoVariable(const std::string if (name == "msoCtsPackUnpack") { // creator Id/Name - CreatureObject const * containingPlayer = NULL; + CreatureObject const * containingPlayer = nullptr; ServerObject const * parent = safe_cast(ContainerInterface::getContainedByObject(*this)); while (parent) @@ -3271,7 +3271,7 @@ void ManufactureSchematicObject::getByteStreamFromAutoVariable(const std::string if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer)) break; - containingPlayer = NULL; + containingPlayer = nullptr; parent = safe_cast(ContainerInterface::getContainedByObject(*parent)); } @@ -3329,7 +3329,7 @@ void ManufactureSchematicObject::setAutoVariableFromByteStream(const std::string Archive::AutoDeltaVariable creatorIsOwner; creatorIsOwner.unpackDelta(ri); - CreatureObject const * containingPlayer = NULL; + CreatureObject const * containingPlayer = nullptr; if (creatorIsOwner.get()) { @@ -3340,7 +3340,7 @@ void ManufactureSchematicObject::setAutoVariableFromByteStream(const std::string if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer)) break; - containingPlayer = NULL; + containingPlayer = nullptr; parent = safe_cast(ContainerInterface::getContainedByObject(*parent)); } } diff --git a/engine/server/library/serverGame/src/shared/object/MissionObject.cpp b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp index 9aa5873a..fb7504f0 100755 --- a/engine/server/library/serverGame/src/shared/object/MissionObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp @@ -32,7 +32,7 @@ //----------------------------------------------------------------------- -const SharedObjectTemplate * MissionObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * MissionObject::m_defaultSharedTemplate = nullptr; const char * const s_missionObjectTemplateName = "object/mission/base_mission_object.iff"; //----------------------------------------------------------------------- @@ -125,13 +125,13 @@ const SharedObjectTemplate * MissionObject::getDefaultSharedTemplate(void) const { static const ConstCharCrcLowerString templateName("object/mission/base/shared_mission_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "MissionObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -144,10 +144,10 @@ static const ConstCharCrcLowerString templateName("object/mission/base/shared_mi */ void MissionObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // MissionObject::removeDefaultTemplate @@ -158,7 +158,7 @@ void MissionObject::abortMission() ScriptParams params; ScriptDictionaryPtr dictionary; getScriptObject()->makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), @@ -710,7 +710,7 @@ void MissionObject::getByteStreamFromAutoVariable(const std::string & name, Arch Archive::put(target, m_waypoint.get().getWaypointDataBase()); // mission location target - CreatureObject const * containingPlayer = NULL; + CreatureObject const * containingPlayer = nullptr; ServerObject const * parent = safe_cast(ContainerInterface::getContainedByObject(*this)); while (parent) { @@ -718,7 +718,7 @@ void MissionObject::getByteStreamFromAutoVariable(const std::string & name, Arch if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer)) break; - containingPlayer = NULL; + containingPlayer = nullptr; parent = safe_cast(ContainerInterface::getContainedByObject(*parent)); } @@ -785,7 +785,7 @@ void MissionObject::setAutoVariableFromByteStream(const std::string & name, cons m_title.unpackDelta(ri); // mission holder id - CreatureObject * containingPlayer = NULL; + CreatureObject * containingPlayer = nullptr; ServerObject * parent = safe_cast(ContainerInterface::getContainedByObject(*this)); while (parent) { @@ -793,7 +793,7 @@ void MissionObject::setAutoVariableFromByteStream(const std::string & name, cons if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer)) break; - containingPlayer = NULL; + containingPlayer = nullptr; parent = safe_cast(ContainerInterface::getContainedByObject(*parent)); } diff --git a/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp b/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp index bcba1d72..e23c7d1d 100755 --- a/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp +++ b/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp @@ -53,14 +53,14 @@ ServerObject * ServerWorld::createObjectFromTemplate(uint32 templateCrc, const N WARNING(!objectTemplate, ("Missing Template! Can't create object from " "template crc %lu(%s), file not found", templateCrc, ObjectTemplateList::lookUp(templateCrc).getString())); - Object *object = NULL; + Object *object = nullptr; if (objectTemplate) { ServerObjectTemplate const * serverObjectTemplate = objectTemplate->asServerObjectTemplate(); - if ( (serverObjectTemplate == NULL) - || ((serverObjectTemplate != NULL) && (ObjectTemplateList::lookUp(serverObjectTemplate->getSharedTemplate().c_str()).getCrc() != 0))) + if ( (serverObjectTemplate == nullptr) + || ((serverObjectTemplate != nullptr) && (ObjectTemplateList::lookUp(serverObjectTemplate->getSharedTemplate().c_str()).getCrc() != 0))) { PROFILER_AUTO_BLOCK_DEFINE("ObjectTemplate::createObject"); object = objectTemplate->createObject(); diff --git a/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp b/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp index 888b5d77..23b38bfe 100755 --- a/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp +++ b/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp @@ -81,7 +81,7 @@ int ObjectTracker::getNumPlayers() void ObjectTracker::getNumPlayersByFaction(int & imperial, int & rebel, int & neutral) { - time_t const now = ::time(NULL); + time_t const now = ::time(nullptr); if ((now - m_lastTimeCalculateFactionalPlayersCount) > 60) { m_numPlayersImperial = 0; diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp index c17b6ca6..4731fcd7 100755 --- a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp +++ b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp @@ -36,7 +36,7 @@ m_roots(new std::set) PatrolPathNodeProperty::~PatrolPathNodeProperty() { delete m_roots; - m_roots = NULL; + m_roots = nullptr; } //------------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp index f6a57df4..0ecbb8d6 100755 --- a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp @@ -126,7 +126,7 @@ namespace PlanetObjectNamespace const char * makeCopyOfString(const char * rhs) { - char * lhs = NULL; + char * lhs = nullptr; if (rhs) { lhs = new char[strlen(rhs) + 1]; @@ -144,7 +144,7 @@ namespace PlanetObjectNamespace int getNextGcwScoreDecayTime(int base); // dictionary containing the table showing factional presence activity - ScriptParams * s_factionalPresenceSuiTable = NULL; + ScriptParams * s_factionalPresenceSuiTable = nullptr; bool s_factionalPresenceSuiTableNeedRebuild = true; void decrementConnectedCharacterLfgDataFactionalPresenceCount(Archive::AutoDeltaMap, PlanetObject> & connectedCharacterLfgDataFactionalPresence, const LfgCharacterData & lfgCharacterData); @@ -914,7 +914,7 @@ void PlanetObject::onLoadedFromDatabase() // "server first" information and manually create the CollectionServerFirstObserver // object, so that there will only be 1 call to the CollectionServerFirstObserver // object when it goes out of scope at the end of the function - m_collectionServerFirst.setSourceObject(NULL); + m_collectionServerFirst.setSourceObject(nullptr); CollectionServerFirstObserver observer(this, Archive::ADOO_set); const DynamicVariableList & objvars = getObjVars(); @@ -1004,7 +1004,7 @@ void PlanetObject::setCollectionServerFirst(const CollectionsDataTable::Collecti if (objvars.hasItem(objvar) && (DynamicVariable::STRING_ARRAY == objvars.getType(objvar))) return; - const time_t timeNow = ::time(NULL); + const time_t timeNow = ::time(nullptr); char buffer[64]; snprintf(buffer, sizeof(buffer)-1, "%ld", timeNow); buffer[sizeof(buffer)-1] = '\0'; @@ -1131,7 +1131,7 @@ void PlanetObject::handleCMessageTo(MessageToPayload const &message) std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end()); Unicode::String const delimiters(Unicode::narrowToWide("|")); Unicode::UnicodeStringVector tokens; - if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2)) + if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, nullptr)) && (tokens.size() == 2)) { CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(Unicode::wideToNarrow(tokens[0])); if (collectionInfo && collectionInfo->trackServerFirst && (collectionInfo->serverFirstClaimTime > 0)) @@ -1193,7 +1193,7 @@ void PlanetObject::handleCMessageTo(MessageToPayload const &message) else if (message.getMethod() == "C++DoGcwDecay") { // start decay handling loop - int const now = static_cast(::time(NULL)); + int const now = static_cast(::time(nullptr)); int timeNextGcwScoreDecay; if (!getObjVars().getItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay) || (timeNextGcwScoreDecay <= 0)) { @@ -1397,7 +1397,7 @@ void PlanetObject::endBaselines() } // start decay handling loop - int const now = static_cast(::time(NULL)); + int const now = static_cast(::time(nullptr)); int timeNextGcwScoreDecay; if (!getObjVars().getItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay) || (timeNextGcwScoreDecay <= 0)) { @@ -1481,7 +1481,7 @@ ScriptParams const *PlanetObject::getConnectedCharacterLfgDataFactionalPresenceT if (s_factionalPresenceSuiTableNeedRebuild) { delete s_factionalPresenceSuiTable; - s_factionalPresenceSuiTable = NULL; + s_factionalPresenceSuiTable = nullptr; PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet(); if (tatooine) @@ -2156,8 +2156,8 @@ void PlanetObject::updateGcwTrackingData() // send our GCW score to the other clusters and process GCW scores we received from other clusters if (isAuthoritative() && (ConfigServerGame::getBroadcastGcwScoreToOtherGalaxies() || ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies())) { - static time_t timeNextBroadcast = ::time(NULL) + ConfigServerGame::getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds(); - time_t const timeNow = ::time(NULL); + static time_t timeNextBroadcast = ::time(nullptr) + ConfigServerGame::getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds(); + time_t const timeNow = ::time(nullptr); if (timeNextBroadcast < timeNow) { if (ConfigServerGame::getBroadcastGcwScoreToOtherGalaxies()) @@ -2342,7 +2342,7 @@ void PlanetObject::adjustGcwImperialScore(std::string const & source, CreatureOb PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(sourceObject); if (playerObject) { - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTracking.") + gcwCategory, timeNow)); IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTrackingLastUpdated"), timeNow)); @@ -2387,7 +2387,7 @@ void PlanetObject::adjustGcwRebelScore(std::string const & source, CreatureObjec PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(sourceObject); if (playerObject) { - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTracking.") + gcwCategory, timeNow)); IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTrackingLastUpdated"), timeNow)); @@ -2441,7 +2441,7 @@ int PlanetObjectNamespace::getNextGcwScoreDecayTime(int base) } if (nextTime < 0) - nextTime = static_cast(::time(NULL)) + (60 * 60 * 24 * 7); + nextTime = static_cast(::time(nullptr)) + (60 * 60 * 24 * 7); return nextTime; } diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 1e574c40..5a481653 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -95,7 +95,7 @@ #include #include -const SharedObjectTemplate * PlayerObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * PlayerObject::m_defaultSharedTemplate = nullptr; bool PlayerObject::m_allowEmptySlot = false; @@ -317,7 +317,7 @@ PlayerObject::PlayerObject(const ServerPlayerObjectTemplate* newTemplate) : m_craftingStation(), m_craftingComponentBioLink(), m_useableDraftSchematics(), - m_draftSchematic(NULL), + m_draftSchematic(nullptr), m_matchMakingPersonalProfileId(), m_matchMakingCharacterProfileId(), m_friendList(), @@ -451,13 +451,13 @@ const SharedObjectTemplate * PlayerObject::getDefaultSharedTemplate() const { static const ConstCharCrcLowerString templateName("object/player/base/shared_player_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "PlayerObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -470,10 +470,10 @@ static const ConstCharCrcLowerString templateName("object/player/base/shared_pla */ void PlayerObject::removeDefaultTemplate() { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // PlayerObject::removeDefaultTemplate @@ -514,7 +514,7 @@ int PlayerObject::getCurrentBornDate() time_t baseTime = mktime(&baseTimeData); // get the current time and compute the birth date - time_t currentTime = time(NULL); + time_t currentTime = time(nullptr); time_t delta = (currentTime - baseTime) / (60 * 60 * 24); delta += ((currentTime - baseTime) % (60 * 60 * 24) != 0 ? 1 : 0); return int(delta); @@ -631,14 +631,14 @@ void PlayerObject::virtualOnSetAuthority() if (isCrafting()) { const TangibleObject * tool = safe_cast(getCraftingTool().getObject()); - if (tool != NULL) + if (tool != nullptr) { const ManufactureSchematicObject * manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic != NULL) + if (manfSchematic != nullptr) { m_draftSchematic = DraftSchematicObject::getSchematic( manfSchematic->getDraftSchematic()); - if (m_draftSchematic.getPointer() == NULL) + if (m_draftSchematic.getPointer() == nullptr) { WARNING(true, ("PlayerObject::virtualOnSetAuthority object " "%s is flagged as crafting, but has bad manf schematic %lu", @@ -749,7 +749,7 @@ int PlayerObject::getExperienceLimit(const std::string & experienceType) const if((*iter)) { const SkillObject::ExperiencePair * xpInfo = (*iter)->getPrerequisiteExperience(); - if (xpInfo != NULL && experienceType == xpInfo->first && xpInfo->second.second > 0) + if (xpInfo != nullptr && experienceType == xpInfo->first && xpInfo->second.second > 0) { if (limit == static_cast(-1) || limit < static_cast(xpInfo->second.second)) @@ -797,9 +797,9 @@ int PlayerObject::grantExperiencePoints(const std::string & experienceType, int // adjust the xp based on what faction is doing best // NOTE: HACK HACK HACK! const PlanetObject * tatooine = ServerUniverse::getInstance().getTatooinePlanet(); - if (tatooine == NULL) + if (tatooine == nullptr) tatooine = ServerUniverse::getInstance().getPlanetByName("Tatooine"); - if (tatooine == NULL) + if (tatooine == nullptr) { WARNING(true, ("Can't find planet tatooine from ServerUniverse")); } @@ -932,7 +932,7 @@ bool PlayerObject::grantSchematic(uint32 schematicCrc, bool fromSkill) const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( schematicCrc); - if (schematic != NULL) + if (schematic != nullptr) { // add the schematic to the player's draft schematic list Archive::AutoDeltaMap, int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc()); @@ -982,7 +982,7 @@ bool PlayerObject::revokeSchematic(uint32 schematicCrc, bool fromSkill) stopCrafting(false); const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic(schematicCrc); - if (schematic != NULL) + if (schematic != nullptr) { // remove the schematic from the player's draft schematic list Archive::AutoDeltaMap, int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc()); @@ -1028,7 +1028,7 @@ bool PlayerObject::revokeSchematic(uint32 schematicCrc, bool fromSkill) bool PlayerObject::hasSchematic(uint32 schematicCrc) { const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic(schematicCrc); - if (schematic != NULL) + if (schematic != nullptr) { std::map,int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc()); if (found != m_draftSchematics.end()) @@ -1065,7 +1065,7 @@ void PlayerObject::setCraftingTool(const TangibleObject & tool) */ void PlayerObject::setCraftingStation(const TangibleObject * station) { - if (station != NULL) + if (station != nullptr) { // verify the crafting station is valid if (station->getObjVars().hasItem(OBJVAR_CRAFTING_STATION)) @@ -1075,7 +1075,7 @@ void PlayerObject::setCraftingStation(const TangibleObject * station) // if we are private, make sure we have an ingredient hopper int privateStation = 0; station->getObjVars().getItem(OBJVAR_PRIVATE_STATION, privateStation); - if (privateStation == 1 && getCraftingLevel() == 3 && station->getIngredientHopper() == NULL) + if (privateStation == 1 && getCraftingLevel() == 3 && station->getIngredientHopper() == nullptr) { CreatureObject * const owner = getCreatureObject(); NOT_NULL(owner); @@ -1105,7 +1105,7 @@ void PlayerObject::setCraftingStation(const TangibleObject * station) bool PlayerObject::requestCraftingSession(const NetworkId & toolId) { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return false; const std::string myId = getNetworkId().getValueString(); @@ -1133,7 +1133,7 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId) } TangibleObject * const tool = dynamic_cast(CachedNetworkId(toolId).getObject()); - if (tool == NULL) + if (tool == nullptr) { DEBUG_WARNING(true, ("Player %s requesting crafting session with invalid " "object %s", myIdString, toolIdString)); @@ -1155,7 +1155,7 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId) { CachedNetworkId const & objId = (*iter); TangibleObject * const obj = safe_cast(objId.getObject()); - if ((obj != NULL) && obj->isCraftingTool() && (toolType & obj->getCraftingType())) + if ((obj != nullptr) && obj->isCraftingTool() && (toolType & obj->getCraftingType())) { return requestCraftingSession(objId) ; } @@ -1182,7 +1182,7 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId) void PlayerObject::sendUseableDraftSchematics(std::vector & schematicNames) { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return; // keep around the names since we are just going to get an index back from @@ -1198,7 +1198,7 @@ void PlayerObject::sendUseableDraftSchematics(std::vector & schematicNam if (*iter != 0) { const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(*iter); - if (schematic != NULL) + if (schematic != nullptr) { message->addSchematic(schematic->getCombinedCrc(), static_cast(schematic->getCategory())); @@ -1248,37 +1248,37 @@ void PlayerObject::sendUseableDraftSchematics(std::vector & schematicNam */ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraftSlots * message, MessageQueueDraftSlotsQueryResponse * queryMessage) { - ManufactureSchematicObject * manfSchematic = NULL; + ManufactureSchematicObject * manfSchematic = nullptr; MessageQueueDraftSlots::Slot slotInfo; MessageQueueDraftSlots::Option optionInfo; - if ((message == NULL && queryMessage == NULL) || - (message != NULL && queryMessage != NULL)) + if ((message == nullptr && queryMessage == nullptr) || + (message != nullptr && queryMessage != nullptr)) { return false; } CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return false; const ConstCharCrcString & schematicName = ObjectTemplateList::lookUp(draftSchematicCrc); UNREF(schematicName); const DraftSchematicObject * const draftSchematic = DraftSchematicObject::getSchematic(draftSchematicCrc); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) { DEBUG_WARNING(true, ("Player %s requested invalid draft schematic %s", owner->getNetworkId().getValueString().c_str(), schematicName.getString())); return false; } - if (message != NULL) + if (message != nullptr) { m_draftSchematic = draftSchematic; TangibleObject * const tool = safe_cast(getCraftingTool().getObject()); NOT_NULL(tool); - if (tool == NULL) + if (tool == nullptr) return false; tool->clearCraftingManufactureSchematic(); @@ -1287,7 +1287,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft // make a temporary manufacturing schematic based on the draft scematic manfSchematic = ServerWorld::createNewManufacturingSchematic(CachedNetworkId( *owner), *tool, tool->getCraftingManufactureSchematicSlotId(), false); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { DEBUG_WARNING(true, ("Error creating manufacturing schematic!")); return false; @@ -1305,7 +1305,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft // being made ServerObject * prototype = manfSchematic->manufactureObject(owner->getNetworkId(), *tool, tool->getCraftingPrototypeSlotId(), true); - if (prototype == NULL) + if (prototype == nullptr) { DEBUG_WARNING(true, ("Error creating temp prototype!")); return false; @@ -1322,7 +1322,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft getAccountDescription().c_str())); } - if (queryMessage != NULL) + if (queryMessage != nullptr) { queryMessage->setComplexity(static_cast(draftSchematic->getComplexity())); queryMessage->setVolume(draftSchematic->getVolume()); @@ -1343,7 +1343,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft if (!slot.optional || slot.optionalSkillCommand.empty() || owner->hasCommand(slot.optionalSkillCommand)) { - if (manfSchematic != NULL) + if (manfSchematic != nullptr) { // create the slot IGNORE_RETURN(manfSchematic->getSlot(slot.name, manfSlot)); @@ -1370,13 +1370,13 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft { // get the default object name from the shared template const ObjectTemplate *const ingredientTemplate = ObjectTemplateList::fetch(simple.ingredient); - if (ingredientTemplate == NULL) + if (ingredientTemplate == nullptr) { DEBUG_WARNING(true, ("draft schematic component ingredient %s not found!", simple.ingredient.c_str())); continue; } const SharedObjectTemplate * const sharedTemplate = safe_cast(ObjectTemplateList::fetch((safe_cast(ingredientTemplate))->getSharedTemplate())); - if (sharedTemplate == NULL) + if (sharedTemplate == nullptr) { DEBUG_WARNING(true, ("draft schematic component ingredient %s shared template not found!", simple.ingredient.c_str())); continue; @@ -1391,19 +1391,19 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft { // get the default object name from the shared template of the crafted object const ObjectTemplate * const ingredientTemplate = ObjectTemplateList::fetch(simple.ingredient); - if (ingredientTemplate == NULL) + if (ingredientTemplate == nullptr) { DEBUG_WARNING(true, ("draft schematic schematic ingredient %s not found!", simple.ingredient.c_str())); continue; } const ServerObjectTemplate * const craftedTemplate = safe_cast(ingredientTemplate)->getCraftedObjectTemplate(); - if (craftedTemplate == NULL) + if (craftedTemplate == nullptr) { DEBUG_WARNING(true, ("draft schematic schematic ingredient %s not found!", simple.ingredient.c_str())); continue; } const SharedObjectTemplate * const sharedTemplate = safe_cast(ObjectTemplateList::fetch((safe_cast(craftedTemplate))->getSharedTemplate())); - if (sharedTemplate == NULL) + if (sharedTemplate == nullptr) { DEBUG_WARNING(true, ("draft schematic component ingredient %s shared template not found!", simple.ingredient.c_str())); continue; @@ -1434,7 +1434,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft } // for (int j = 0; j < optionsCount; ++j) if (componentSlot) slotInfo.hardpoint = slot.appearance; - if (message != NULL) + if (message != nullptr) message->addSlot(slotInfo); else queryMessage->addSlot(slotInfo); @@ -1443,7 +1443,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft } // for (int i = 0; i < slotCount; ++i) // send the slot info to the player - if (message != NULL) + if (message != nullptr) { (safe_cast(owner->getController()))->appendMessage( static_cast(CM_draftSlotsMessage), 0.0f, message, @@ -1475,7 +1475,7 @@ bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraft void PlayerObject::selectDraftSchematic(int index) { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return; const std::string myId = getNetworkId().getValueString(); @@ -1510,7 +1510,7 @@ void PlayerObject::selectDraftSchematic(int index) MessageQueueDraftSlots * message = new MessageQueueDraftSlots( getCraftingTool(), NetworkId::cms_invalid); - if (requestDraftSlots(m_useableDraftSchematics[static_cast(index)], message, NULL)) + if (requestDraftSlots(m_useableDraftSchematics[static_cast(index)], message, nullptr)) { m_craftingStage = static_cast(Crafting::CS_assembly); m_craftingComponentBioLink = NetworkId::cms_invalid; @@ -1540,11 +1540,11 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde UNREF(myIdString); // needed for release mode CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return Crafting::CE_noOwner; // check the draft schematic - if (m_draftSchematic.getPointer() == NULL) + if (m_draftSchematic.getPointer() == nullptr) { WARNING(true, ("Player %s trying to fill slot with no draft schematic!", myIdString)); return Crafting::CE_noDraftSchematic; @@ -1572,9 +1572,9 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde } TangibleObject * const tool = safe_cast(getCraftingTool().getObject()); - if (tool == NULL) + if (tool == nullptr) { - WARNING(true, ("Player %s trying to fill slot with crafting tool %s, but tool is NULL!", myIdString, getCraftingTool().getValueString().c_str())); + WARNING(true, ("Player %s trying to fill slot with crafting tool %s, but tool is nullptr!", myIdString, getCraftingTool().getValueString().c_str())); return Crafting::CE_noCraftingTool; } @@ -1583,7 +1583,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde // check the manufacturing schematic ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { WARNING(true, ("Player %s trying to fill slot with no manufacturing schematic!", myIdString)); return Crafting::CE_noManfSchematic; @@ -1614,7 +1614,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde // get the draft schematic option, convert the passed-in option index to the // unfiltered index int i, j; - const ServerIntangibleObjectTemplate::Ingredient * slotOption = NULL; + const ServerIntangibleObjectTemplate::Ingredient * slotOption = nullptr; const int optionsCount = static_cast(draftSlot.options.size()); for (i = 0, j = 0; i < optionsCount; ++i) { @@ -1637,9 +1637,9 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde } slotOptionIndex = i; - if (slotOption == NULL || slotOption->ingredients.size() != 1) + if (slotOption == nullptr || slotOption->ingredients.size() != 1) { - WARNING(true, ("slotOption is NULL or ingredient %d for draft schematic %s, slot %s, has ingredient count != 1", + WARNING(true, ("slotOption is nullptr or ingredient %d for draft schematic %s, slot %s, has ingredient count != 1", slotOptionIndex, m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str())); return Crafting::CE_invalidIngredientSize; } @@ -1671,7 +1671,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde int numIngredientsToAdd = neededIngredientCount - currentIngredientCount; TangibleObject * const ingredient = dynamic_cast(NetworkIdManager::getObjectById(ingredientId)); - if (ingredient == NULL) + if (ingredient == nullptr) { WARNING(true, ("No object for ingredient id %s", ingredientId.getValueString().c_str())); return Crafting::CE_invalidIngredient; @@ -1698,7 +1698,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde if (!owner->isIngredientInInventory(*ingredient)) { // if we are crafting level 3, also check the crafting station's hopper - if (getCraftingLevel() != 3 || (station != NULL && + if (getCraftingLevel() != 3 || (station != nullptr && !station->isIngredientInHopper(ingredientId))) { DEBUG_WARNING(true, ("Player %s chose invalid ingredient %s", myIdString, ingredientId.getValueString().c_str())); @@ -1709,7 +1709,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde // see if the ingredient is a resource or component ResourceContainerObject * const crate = dynamic_cast(ingredient); - if (crate != NULL) + if (crate != nullptr) { // get the resource type name and class name ResourceTypeObject const * const resource = crate->getResourceType(); @@ -1731,7 +1731,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde else if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_resourceClass) { ResourceClassObject const * resourceClass = &(resource->getParentClass()); - while (resourceClass != NULL) + while (resourceClass != nullptr) { const std::string className (resourceClass->getResourceClassName()); if (className == slotIngredient.ingredient) @@ -1805,11 +1805,11 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde FactoryObject * factory = dynamic_cast(ingredient); // if this is an old-style factory, we can't use it directly in crafting - if (factory != NULL && !factory->getLoadContents()) - factory = NULL; + if (factory != nullptr && !factory->getLoadContents()) + factory = nullptr; // make sure the component isn't damaged - if (factory == NULL && ingredient->getDamageTaken() != 0 && + if (factory == nullptr && ingredient->getDamageTaken() != 0 && !ingredient->getObjVars().hasItem(OBJVAR_CRAFTING_COMPONENT_CAN_BE_DAMAGED)) { DEBUG_WARNING(true, ("Tried to use damaged component %s for draft schematic %s, slot %s, option %d", @@ -1853,27 +1853,27 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde // check the ingredient template name for every template in it's // heirarchy - const ObjectTemplate * testTemplate = NULL; + const ObjectTemplate * testTemplate = nullptr; if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_template || slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_templateGeneric) { - if (factory == NULL) + if (factory == nullptr) testTemplate = ingredient->getObjectTemplate(); else testTemplate = factory->getContainedObjectTemplate(); } else { - const DraftSchematicObject * itemSchematic = NULL; - if (factory == NULL) + const DraftSchematicObject * itemSchematic = nullptr; + if (factory == nullptr) itemSchematic = DraftSchematicObject::getSchematic(ingredient->getSourceDraftSchematic()); else itemSchematic = DraftSchematicObject::getSchematic(factory->getDraftSchematic()); - if (itemSchematic != NULL) + if (itemSchematic != nullptr) testTemplate = itemSchematic->getObjectTemplate(); } - while (testTemplate != NULL) + while (testTemplate != nullptr) { const std::string ingredientName(testTemplate->getName()); if (ingredientName == requiredIngredientName) @@ -1896,7 +1896,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde // this is a configureable setting const Crafting::ComponentIngredient * testComponent = dynamic_cast< const Crafting::ComponentIngredient *>(manfSlot.ingredients.front().get()); - if (testComponent != NULL) + if (testComponent != nullptr) { if (ConfigServerGame::getCraftingComponentStrict() && (slotOption->ingredientType != ServerIntangibleObjectTemplate::IT_templateGeneric && @@ -1909,15 +1909,15 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde else { // component from same template - if (factory == NULL) + if (factory == nullptr) { - if (ingredient->getObjectTemplateName() != NULL && + if (ingredient->getObjectTemplateName() != nullptr && ingredient->getObjectTemplateName() == testComponent->templateName) { slotOk = true; } } - else if (factory->getContainedTemplateName() != NULL && + else if (factory->getContainedTemplateName() != nullptr && factory->getContainedTemplateName() == testComponent->templateName) { slotOk = true; @@ -1927,7 +1927,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde } if (slotOk) { - if (factory == NULL || factory->getCount() <= numIngredientsToAdd) + if (factory == nullptr || factory->getCount() <= numIngredientsToAdd) { // adding normal component or a complete factory object if (manfSchematic->addIngredient(*ingredient)) @@ -1938,7 +1938,7 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde manfSchematic->setSlotOption(manfSlot.name, slotOptionIndex); manfSchematic->modifySlotComplexity(manfSlot.name, slotOption->complexity); } - if (factory == NULL) + if (factory == nullptr) { manfSchematic->addSlotComponent(manfSlot.name, *ingredient, slotOption->ingredientType); @@ -2014,7 +2014,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & UNREF(myIdString); // needed for release mode CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return Crafting::CE_noOwner; if (getCraftingStage() != Crafting::CS_assembly && !m_allowEmptySlot) @@ -2024,7 +2024,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & } // check the draft schematic - if (m_draftSchematic.getPointer() == NULL) + if (m_draftSchematic.getPointer() == nullptr) { WARNING(true, ("Player %s trying to empty slot with no draft schematic!", myIdString)); return Crafting::CE_noDraftSchematic; @@ -2037,15 +2037,15 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & return Crafting::CE_noCraftingTool; } TangibleObject * const tool = safe_cast(getCraftingTool().getObject()); - if (tool == NULL) + if (tool == nullptr) { - WARNING(true, ("Player %s trying to empty slot with crafting tool %s, but tool is NULL!", myIdString, getCraftingTool().getValueString().c_str())); + WARNING(true, ("Player %s trying to empty slot with crafting tool %s, but tool is nullptr!", myIdString, getCraftingTool().getValueString().c_str())); return Crafting::CE_noCraftingTool; } // get the crafting station (if any) TangibleObject * station = dynamic_cast(getCraftingStation().getObject()); - if (station != NULL && getCraftingLevel() == 3 && station->getIngredientHopper() == NULL) + if (station != nullptr && getCraftingLevel() == 3 && station->getIngredientHopper() == nullptr) { WARNING_STRICT_FATAL(true, ("Player %s trying to empty crafting slot near " "a crafting station %s that has no ingredient hopper!", @@ -2055,7 +2055,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & } ServerObject * const inventory = owner->getInventory(); - if (inventory == NULL) + if (inventory == nullptr) { WARNING (true, ("Player %s has no inventory.", myIdString)); return Crafting::CE_noInventory; @@ -2077,7 +2077,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & // if we are crafting level 3, also check the crafting station's hopper if (!containerIsWorn && - (getCraftingLevel() != 3 || (station != NULL && + (getCraftingLevel() != 3 || (station != nullptr && !isNestedInContainer (targetContainerId, station->getIngredientHopper()->getNetworkId())))) { WARNING (true, ("Player %s attempted to empty slot into invalid container [%s].", myIdString, targetContainerId.getValueString().c_str())); @@ -2087,7 +2087,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & targetContainer = safe_cast(NetworkIdManager::getObjectById (targetContainerId)); - if (targetContainer == NULL) + if (targetContainer == nullptr) { WARNING (true, ("Player %s attempted to empty slot into non-existant container [%s].", myIdString, targetContainerId.getValueString ().c_str ())); return Crafting::CE_badTargetContainer; @@ -2102,7 +2102,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & // check the manufacturing schematic ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { WARNING(true, ("Player %s trying to empty slot with no manufacturing schematic!", myIdString)); return Crafting::CE_noManfSchematic; @@ -2154,7 +2154,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & const Crafting::ComponentIngredient * const componentInfo = dynamic_cast((*iter).get()); NOT_NULL(componentInfo); TangibleObject * const component = manfSchematic->getComponent(*componentInfo); - if (component != NULL) + if (component != nullptr) { // move the component from the schematic to the player if (!manfSchematic->removeIngredient(*component, *targetContainer)) @@ -2180,7 +2180,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & { // ingredient is a resource VolumeContainer * const targetVolumeContainer = ContainerInterface::getVolumeContainer(*targetContainer); - if (targetVolumeContainer == NULL) + if (targetVolumeContainer == nullptr) { DEBUG_WARNING(true, ("PlayerObject::emptySlot: targetContainer %s does not have a volume container", targetContainer->getNetworkId().getValueString().c_str())); @@ -2203,7 +2203,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & { ResourceContainerObject * crate = dynamic_cast< ResourceContainerObject *>(NetworkIdManager::getObjectById((*iter2))); - if (crate != NULL && crate->getResourceTypeId() == resourceId) + if (crate != nullptr && crate->getResourceTypeId() == resourceId) { int emptySpace = crate->getMaxQuantity() - crate->getQuantity(); if (emptySpace > 0) @@ -2236,7 +2236,7 @@ Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & { ServerObject * crateObject = ServerWorld::createNewObject( crateTemplateName, *targetContainer, true); - if (crateObject == NULL) + if (crateObject == nullptr) { // @todo: inform the player DEBUG_WARNING(true, ("PlayerObject::emptySlot tried to " @@ -2322,14 +2322,14 @@ int PlayerObject::startCraftingExperiment () int i; CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return -Crafting::CE_noOwner; std::string myId = getNetworkId().getValueString(); const char * myIdString = myId.c_str(); UNREF(myIdString); // needed for release mode - if (m_draftSchematic.getPointer() == NULL) + if (m_draftSchematic.getPointer() == nullptr) { DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with invalid schematic.", myIdString)); return -Crafting::CE_noDraftSchematic; @@ -2350,13 +2350,13 @@ int PlayerObject::startCraftingExperiment () if (!tool) { - DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with null crafting tool [%s].", myIdString, getCraftingTool().getValueString().c_str())); + DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with nullptr crafting tool [%s].", myIdString, getCraftingTool().getValueString().c_str())); return -Crafting::CE_noCraftingTool; } // check the manufacturing schematic ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with invalid manufacture schematic.", myIdString)); return -Crafting::CE_noManfSchematic; @@ -2425,7 +2425,7 @@ int PlayerObject::startCraftingExperiment () } ServerObject * prototype = tool->getCraftingPrototype(); - if (prototype == NULL) + if (prototype == nullptr) { DEBUG_WARNING(true, ("PlayerObject::startCraftingExperiment crafting " "tool %s has no prototype object!", @@ -2530,7 +2530,7 @@ int PlayerObject::startCraftingExperiment () Crafting::CraftingResult PlayerObject::experiment(const std::vector & experiments, int totalPoints, int corelevel) { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return Crafting::CR_internalFailure; std::string myId = getNetworkId().getValueString(); @@ -2554,7 +2554,7 @@ Crafting::CraftingResult PlayerObject::experiment(const std::vectorgetCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { DEBUG_WARNING(true, ("Player %s tried to experiment with invalid " "manufacture schematic.", myIdString)); @@ -2577,7 +2577,7 @@ Crafting::CraftingResult PlayerObject::experiment(const std::vectorgetCraftingPrototype(); - if (prototype == NULL) + if (prototype == nullptr) { DEBUG_WARNING(true, ("Player %s tried to experiment with invalid test " "prototype.", myIdString)); @@ -2680,7 +2680,7 @@ bool PlayerObject::customize(int property, int value) const return false; } - if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid) + if (m_draftSchematic.getPointer() == nullptr || getCraftingTool() == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("Player %s tried to customize with invalid " "schematic or crafting tool.", myIdString)); @@ -2732,7 +2732,7 @@ int PlayerObject::setCustomizationData(const Unicode::String & name, return Crafting::CE_notCustomizeStage; } - if (m_draftSchematic.getPointer() == NULL) + if (m_draftSchematic.getPointer() == nullptr) { DEBUG_WARNING(true, ("Player %s tried to customize with invalid schematic.", myIdString)); return Crafting::CE_noDraftSchematic; @@ -2804,7 +2804,7 @@ int PlayerObject::setCustomizationData(const Unicode::String & name, bool PlayerObject::createPrototype(bool keepPrototype) { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return false; std::string myId = getNetworkId().getValueString(); @@ -2821,7 +2821,7 @@ bool PlayerObject::createPrototype(bool keepPrototype) return false; } - if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid) + if (m_draftSchematic.getPointer() == nullptr || getCraftingTool() == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("Player %s tried to create prototype with invalid " "schematic or crafting tool.", myIdString)); @@ -2842,7 +2842,7 @@ bool PlayerObject::createPrototype(bool keepPrototype) } ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { WARNING_STRICT_FATAL(true, ("No manf schematic in crafting tool %s", tool->getNetworkId().getValueString().c_str())); @@ -2961,7 +2961,7 @@ bool PlayerObject::createPrototype(bool keepPrototype) params.addParam(prototype->getNetworkId(), "prototype"); ScriptDictionaryPtr dictionary; getScriptObject()->makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); @@ -2969,7 +2969,7 @@ bool PlayerObject::createPrototype(bool keepPrototype) { Client * client = owner->getClient(); - if (client != NULL && client->isGod()) + if (client != nullptr && client->isGod()) { Chat::sendSystemMessage(*owner, Unicode::narrowToWide("Crafting time changed due to god mode and crafting_qa objvar."), Unicode::emptyString); prototypeTime = 1; @@ -3022,7 +3022,7 @@ bool PlayerObject::createManufacturingSchematic() return false; CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return false; // @todo: need to filter the name @@ -3034,7 +3034,7 @@ bool PlayerObject::createManufacturingSchematic() return false; } - if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid) + if (m_draftSchematic.getPointer() == nullptr || getCraftingTool() == NetworkId::cms_invalid) { WARNING(true, ("Player %s tried to create manf schematic with invalid schematic or crafting tool.", getNetworkId().getValueString().c_str ())); return false; @@ -3048,19 +3048,19 @@ bool PlayerObject::createManufacturingSchematic() } TangibleObject * const tool = safe_cast(getCraftingTool().getObject()); - if (tool == NULL) + if (tool == nullptr) { WARNING_STRICT_FATAL(true, ("Could not find crafting tool during create manf schematic phase.")); return false; } ManufactureSchematicObject * const manfSchematic = tool->removeCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { WARNING_STRICT_FATAL(true, ("Could not find manf schematic during create manf schematic phase.")); return false; } TangibleObject * const prototype = safe_cast(tool->getCraftingPrototype()); - if (prototype == NULL) + if (prototype == nullptr) { WARNING_STRICT_FATAL(true, ("Could not find prototype during create manf schematic phase.")); return false; @@ -3141,14 +3141,14 @@ bool PlayerObject::createManufacturingSchematic() manfSchematic->persist(); ServerObject * const datapad = owner->getDatapad (); - if (datapad == NULL) + if (datapad == nullptr) { DEBUG_WARNING(true, ("Can't find datapad for player %s", getAccountDescription().c_str())); return false; } Container::ContainerErrorCode tmp = Container::CEC_Success; - if (!ContainerInterface::transferItemToVolumeContainer(*datapad, *manfSchematic, NULL, tmp)) + if (!ContainerInterface::transferItemToVolumeContainer(*datapad, *manfSchematic, nullptr, tmp)) { return false; } @@ -3173,7 +3173,7 @@ bool PlayerObject::createManufacturingSchematic() bool PlayerObject::restartCrafting () { CreatureObject * const owner = getCreatureObject(); - if (owner == NULL) + if (owner == nullptr) return false; std::string myId = getNetworkId().getValueString(); @@ -3195,7 +3195,7 @@ bool PlayerObject::restartCrafting () } // verify the tool - if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid) + if (m_draftSchematic.getPointer() == nullptr || getCraftingTool() == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation " "with invalid schematic or crafting tool.", myIdString)); @@ -3208,7 +3208,7 @@ bool PlayerObject::restartCrafting () // reset the manf schematic ManufactureSchematicObject * manfSchematic = tool->getCraftingManufactureSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { DEBUG_WARNING(true, ("Player %s has no manufacturing schematic!", myIdString)); return false; @@ -3262,21 +3262,21 @@ void PlayerObject::stopCrafting (bool normalExit) { CreatureObject * const owner = getCreatureObject(); - if (getCraftingTool().getObject() != NULL) + if (getCraftingTool().getObject() != nullptr) { TangibleObject * tool = dynamic_cast(getCraftingTool().getObject()); - if (tool != NULL) + if (tool != nullptr) { IGNORE_RETURN(tool->stopCraftingSession()); } // tell scripts that the session has ended ScriptParams params; - if (owner != NULL) + if (owner != nullptr) params.addParam(owner->getNetworkId()); else params.addParam(getNetworkId()); - if (getCurrentDraftSchematic() != NULL) + if (getCurrentDraftSchematic() != nullptr) params.addParam(getCurrentDraftSchematic()->getTemplateName()); else params.addParam(""); @@ -3292,7 +3292,7 @@ void PlayerObject::stopCrafting (bool normalExit) m_craftingComponentBioLink = NetworkId::cms_invalid; // tell the player crafting has ended - if (owner != NULL && owner->getController() != NULL) + if (owner != nullptr && owner->getController() != nullptr) { (safe_cast(owner->getController()))->appendMessage( static_cast(CM_craftingSessionEnded), 0.0f, @@ -3348,7 +3348,7 @@ void PlayerObject::requestFriendList() const { CreatureObject const *owner = safe_cast(ContainerInterface::getContainedByObject(*this)); - if (owner != NULL) + if (owner != nullptr) { ChatAvatarId chatAvatarId(Chat::constructChatAvatarId(*owner)); @@ -3410,7 +3410,7 @@ void PlayerObject::requestIgnoreList() const { CreatureObject const *owner = safe_cast(ContainerInterface::getContainedByObject(*this)); - if (owner != NULL) + if (owner != nullptr) { ChatAvatarId chatAvatarId(Chat::constructChatAvatarId(*owner)); @@ -3767,7 +3767,7 @@ void PlayerObject::setTitle(std::string const &title) m_skillTitle = title; } } - else if (title.empty() || (title == "citizenship") || (SkillManager::getInstance().getSkill(title) != NULL) || (CollectionsDataTable::isASlotTitle(title) != NULL) || (CollectionsDataTable::isACollectionTitle(title) != NULL) || (CollectionsDataTable::isAPageTitle(title) != NULL) || (GuildRankDataTable::isARankTitle(title) != NULL) || (CitizenRankDataTable::isARankTitle(title) != NULL)) + else if (title.empty() || (title == "citizenship") || (SkillManager::getInstance().getSkill(title) != nullptr) || (CollectionsDataTable::isASlotTitle(title) != nullptr) || (CollectionsDataTable::isACollectionTitle(title) != nullptr) || (CollectionsDataTable::isAPageTitle(title) != nullptr) || (GuildRankDataTable::isARankTitle(title) != nullptr) || (CitizenRankDataTable::isARankTitle(title) != nullptr)) { if (title != m_skillTitle.get()) m_skillTitle = title; @@ -4075,7 +4075,7 @@ void PlayerObject::handleCMessageTo(const MessageToPayload &message) } { - BiographyManager::requestBiography(owner->getNetworkId(), NULL); + BiographyManager::requestBiography(owner->getNetworkId(), nullptr); } bool needsTitleCheck = false; @@ -4139,7 +4139,7 @@ void PlayerObject::handleCMessageTo(const MessageToPayload &message) // also check to see if the citizen rank has changed, and if so, update the citizen rank information { std::vector const & cityIds = CityInterface::getCitizenOfCityId(owner->getNetworkId()); - CitizenInfo const * const citizenInfo = (!cityIds.empty() ? CityInterface::getCitizenInfo(cityIds.front(), owner->getNetworkId()) : NULL); + CitizenInfo const * const citizenInfo = (!cityIds.empty() ? CityInterface::getCitizenInfo(cityIds.front(), owner->getNetworkId()) : nullptr); if (!citizenInfo) { // not a citizen, so make sure the citizen rank is empty @@ -4265,12 +4265,12 @@ void PlayerObject::endBaselines() const CreatureObject * owner = safe_cast(ContainerInterface::getContainedByObject(*this)); - if (owner != NULL) + if (owner != nullptr) { SharedCreatureObjectTemplate::Species const species = owner->getSpecies(); setSpokenLanguage(GameLanguageManager::getStartingLanguage(species)); -// if (owner->isAuthoritative() && ServerUniverse::getInstance().getXpManager() != NULL) +// if (owner->isAuthoritative() && ServerUniverse::getInstance().getXpManager() != nullptr) // { // // get any xp we earned while offline // ServerUniverse::getInstance().getXpManager()->requestXp(*this); @@ -4326,7 +4326,7 @@ void PlayerObject::endBaselines() } else { - m_chatSpamTimeEndInterval = static_cast(::time(NULL)) + (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60); + m_chatSpamTimeEndInterval = static_cast(::time(nullptr)) + (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60); m_chatSpamSpatialNumCharacters = 0; m_chatSpamNonSpatialNumCharacters = 0; m_chatSpamNextTimeToSyncWithChatServer = 0; @@ -4362,7 +4362,7 @@ void PlayerObject::endBaselines() { m_squelchedById = tempNetworkId; m_squelchedByName = tempString; - m_squelchExpireTime = static_cast(::time(NULL)) + (temp - gameTimeNow); + m_squelchExpireTime = static_cast(::time(nullptr)) + (temp - gameTimeNow); } } } @@ -4373,7 +4373,7 @@ void PlayerObject::endBaselines() DynamicVariableList::NestedList const gcwContribution(getObjVars(), "gcwContributionTracking"); if (!gcwContribution.empty()) { - int const timeExpired = static_cast(::time(NULL)) - (60 * 60 * 24 * 30); // 30 days + int const timeExpired = static_cast(::time(nullptr)) - (60 * 60 * 24 * 30); // 30 days std::list gcwContributionToRemove; int timeLastContributed; for (DynamicVariableList::NestedList::const_iterator i = gcwContribution.begin(); i != gcwContribution.end(); ++i) @@ -4724,12 +4724,12 @@ std::string PlayerObject::getAccountDescription() const { const ServerObject * owner = safe_cast( ContainerInterface::getContainedByObject(*this)); - if (owner == NULL) + if (owner == nullptr) return "UNKNOWN"; bool isGod = false; bool isSecure = false; - Client * client = NULL; + Client * client = nullptr; if (owner && owner->getClient()) { client = owner->getClient(); @@ -4768,7 +4768,7 @@ std::string PlayerObject::getAccountDescription() const void PlayerObject::logChat(int const logIndex) { - if (m_chatLog != NULL) + if (m_chatLog != nullptr) { time_t const logTime = Os::getRealSystemTime(); @@ -5276,10 +5276,10 @@ void PlayerObject::checkTheater(const Vector & pos, const std::string & scene, IntangibleObject * theater = IntangibleObject::spawnTheater(m_theaterDatatable.get(), m_theaterPosition.get(), m_theaterScript.get(), static_cast(m_theaterLocationType.get())); - if (theater != NULL) + if (theater != nullptr) { const CreatureObject * owner = getCreatureObject(); - if (owner != NULL) + if (owner != nullptr) theater->setPlayer(*owner); theater->setTheaterCreator(m_theaterCreator.get()); if (!theater->setTheaterName(m_theaterName.get())) @@ -5287,10 +5287,10 @@ void PlayerObject::checkTheater(const Vector & pos, const std::string & scene, WARNING(true, ("PlayerObject::checkTheater could not create " "theater with name %s", m_theaterName.get().c_str())); theater->permanentlyDestroy(DeleteReasons::SetupFailed); - theater = NULL; + theater = nullptr; } } - if (theater == NULL) + if (theater == nullptr) { CreatureObject * creatureObject = getCreatureObject(); if (creatureObject) @@ -5357,7 +5357,7 @@ bool PlayerObject::setTheater(const std::string & datatable, const Vector & posi return false; } - if (ServerUniverse::getInstance().getPlanetByName(scene) == NULL) + if (ServerUniverse::getInstance().getPlanetByName(scene) == nullptr) { WARNING(true, ("PlayerObject::setTheater called with invalid scene %s", scene.c_str())); @@ -6342,7 +6342,7 @@ unsigned long PlayerObject::getSessionPlayTimeDuration() const time_t const sessionStartPlayTime = static_cast(m_sessionStartPlayTime.get()); if (sessionStartPlayTime > 0) { - time_t const now = ::time(NULL); + time_t const now = ::time(nullptr); if (now > sessionStartPlayTime) return static_cast(now - sessionStartPlayTime); } @@ -6359,7 +6359,7 @@ unsigned long PlayerObject::getSessionActivePlayTimeDuration() const time_t const sessionLastActiveTime = static_cast(m_sessionLastActiveTime.get()); if (sessionLastActiveTime > 0) { - time_t const now = ::time(NULL); + time_t const now = ::time(nullptr); if (now > sessionLastActiveTime) activePlayTimeDuration += static_cast(now - sessionLastActiveTime); } @@ -6393,7 +6393,7 @@ void PlayerObject::setSessionPlayTimeInfo(int32 sessionStartPlayTime, int32 sess ServerUniverse::setConnectedCharacterLfgData(owner->getNetworkId(), lfgCharacterData); - BiographyManager::requestBiography(owner->getNetworkId(), NULL); + BiographyManager::requestBiography(owner->getNetworkId(), nullptr); // check/set "account age" title checkAndSetAccountAgeTitle(*this); @@ -7040,7 +7040,7 @@ void PlayerObject::modifyNextGcwRatingCalcTime(int const weekCount) return; static int32 const max = std::numeric_limits::max(); - int32 const now = static_cast(::time(NULL)); + int32 const now = static_cast(::time(nullptr)); // m_nextGcwRatingCalcTime should always be >= 0 int32 const currentValue = std::max(static_cast(0), m_nextGcwRatingCalcTime.get()); @@ -7176,7 +7176,7 @@ void PlayerObject::setNextGcwRatingCalcTime(bool const alwaysSendMessageToForRec return; bool needToSendMessageTo = alwaysSendMessageToForRecalc; - int32 const now = static_cast(::time(NULL)); + int32 const now = static_cast(::time(nullptr)); // if the player needs a rating recalculation, // make sure that m_nextGcwRatingCalcTime is set so that the @@ -7232,7 +7232,7 @@ void PlayerObject::handleRecalculateGcwRating() return; // is it time to recalculate? - int32 const now = static_cast(::time(NULL)); + int32 const now = static_cast(::time(nullptr)); if ((m_nextGcwRatingCalcTime.get() > 0) && (m_nextGcwRatingCalcTime.get() <= now)) { // is recalculation required? @@ -7367,7 +7367,7 @@ void PlayerObject::sendRecalculateGcwRatingMessageTo(int delay) // send new messageTo int const adjustedDelay = std::max(5, delay); MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++RecalculateGcwRating", "", adjustedDelay, false); - m_gcwRatingActualCalcTime = static_cast(::time(NULL) + adjustedDelay); + m_gcwRatingActualCalcTime = static_cast(::time(nullptr) + adjustedDelay); } // ---------------------------------------------------------------------- @@ -7728,7 +7728,7 @@ bool PlayerObject::getCollectionSlotValue(CollectionsDataTable::CollectionInfoSl // ---------------------------------------------------------------------- -bool PlayerObject::hasCompletedCollectionSlotPrereq(std::string const & slotName, std::vector * collectionInfo /*= NULL*/) const +bool PlayerObject::hasCompletedCollectionSlotPrereq(std::string const & slotName, std::vector * collectionInfo /*= nullptr*/) const { CollectionsDataTable::CollectionInfoSlot const * slotInfo = CollectionsDataTable::getSlotByName(slotName); if (!slotInfo) @@ -7742,7 +7742,7 @@ bool PlayerObject::hasCompletedCollectionSlotPrereq(std::string const & slotName // ---------------------------------------------------------------------- -bool PlayerObject::hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, std::vector * collectionInfo /*= NULL*/) const +bool PlayerObject::hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7862,7 +7862,7 @@ bool PlayerObject::hasCompletedCollectionBook(std::string const & bookName) cons // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7885,7 +7885,7 @@ int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionSlotCountInPage(std::string const & pageName, std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionSlotCountInPage(std::string const & pageName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7908,7 +7908,7 @@ int PlayerObject::getCompletedCollectionSlotCountInPage(std::string const & page // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionCountInPage(std::string const & pageName, std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionCountInPage(std::string const & pageName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7931,7 +7931,7 @@ int PlayerObject::getCompletedCollectionCountInPage(std::string const & pageName // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionSlotCountInBook(std::string const & bookName, std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionSlotCountInBook(std::string const & bookName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7954,7 +7954,7 @@ int PlayerObject::getCompletedCollectionSlotCountInBook(std::string const & book // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionCountInBook(std::string const & bookName, std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionCountInBook(std::string const & bookName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -7977,7 +7977,7 @@ int PlayerObject::getCompletedCollectionCountInBook(std::string const & bookName // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionPageCountInBook(std::string const & bookName, std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionPageCountInBook(std::string const & bookName, std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -8000,7 +8000,7 @@ int PlayerObject::getCompletedCollectionPageCountInBook(std::string const & book // ---------------------------------------------------------------------- -int PlayerObject::getCompletedCollectionBookCount(std::vector * collectionInfo /*= NULL*/) const +int PlayerObject::getCompletedCollectionBookCount(std::vector * collectionInfo /*= nullptr*/) const { if (collectionInfo) collectionInfo->clear(); @@ -8103,7 +8103,7 @@ void PlayerObject::updateChatSpamSpatialNumCharacters(NetworkId const & characte if (!isAuthoritative()) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); bool syncChatServer = false; // new interval, reset @@ -8125,7 +8125,7 @@ void PlayerObject::updateChatSpamSpatialNumCharacters(NetworkId const & characte { time_t timeUnsquelch = static_cast(getSecondsUntilUnsquelched()); if (timeUnsquelch > 0) - timeUnsquelch += ::time(NULL); + timeUnsquelch += ::time(nullptr); GenericValueTypeMessage, int>, std::pair > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(character, static_cast(timeUnsquelch)), m_chatSpamTimeEndInterval.get()), std::make_pair(m_chatSpamSpatialNumCharacters.get(), m_chatSpamNonSpatialNumCharacters.get()))); Chat::sendToChatServer(chatStatistics); @@ -8140,7 +8140,7 @@ void PlayerObject::handleChatStatisticsFromChatServer(NetworkId const & characte if (!isAuthoritative()) return; - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); bool syncChatServer = false; // new interval, reset @@ -8168,7 +8168,7 @@ void PlayerObject::handleChatStatisticsFromChatServer(NetworkId const & characte { time_t timeUnsquelch = static_cast(getSecondsUntilUnsquelched()); if (timeUnsquelch > 0) - timeUnsquelch += ::time(NULL); + timeUnsquelch += ::time(nullptr); GenericValueTypeMessage, int>, std::pair > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(character, static_cast(timeUnsquelch)), m_chatSpamTimeEndInterval.get()), std::make_pair(m_chatSpamSpatialNumCharacters.get(), m_chatSpamNonSpatialNumCharacters.get()))); Chat::sendToChatServer(chatStatistics); @@ -8274,7 +8274,7 @@ void PlayerObject::updateGcwDefenderRegionInfo() cityGcwDefenderRegion = gcwDefenderRegion; int const timeJoinedGcwDefenderRegion = cityInfo.getTimeJoinedGcwDefenderRegion(); - timeQualifyForBonus = static_cast(::time(NULL)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400); + timeQualifyForBonus = static_cast(::time(nullptr)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400); if (!PvpData::isNeutralFactionId(cityFaction) && (cityFaction == owner->getPvpFaction()) && (timeJoinedGcwDefenderRegion < timeQualifyForBonus)) { cityGcwDefenderRegionHasBonus = true; @@ -8316,7 +8316,7 @@ void PlayerObject::updateGcwDefenderRegionInfo() int const timeJoinedGcwDefenderRegion = GuildInterface::getTimeJoinedGuildCurrentGcwDefenderRegion(*gi); if (timeQualifyForBonus < 0) - timeQualifyForBonus = static_cast(::time(NULL)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400); + timeQualifyForBonus = static_cast(::time(nullptr)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400); if (!PvpData::isNeutralFactionId(guildFaction) && (guildFaction == owner->getPvpFaction()) && (timeJoinedGcwDefenderRegion < timeQualifyForBonus)) { @@ -8417,7 +8417,7 @@ void PlayerObject::squelch(NetworkId const & squelchedById, std::string const & } else { - m_squelchExpireTime = static_cast(::time(NULL)) + squelchDurationSeconds; + m_squelchExpireTime = static_cast(::time(nullptr)) + squelchDurationSeconds; // persist squelch info setObjVarItem(OBJVAR_SQUELCH_EXPIRE, static_cast(ServerClock::getInstance().getGameTimeSeconds()) + squelchDurationSeconds); @@ -8466,7 +8466,7 @@ void PlayerObject::unsquelch() { CreatureObject * const owner = getCreatureObject(); if (owner) - owner->sendControllerMessageToAuthServer(CM_unsquelch, NULL); + owner->sendControllerMessageToAuthServer(CM_unsquelch, nullptr); } } @@ -8482,7 +8482,7 @@ int PlayerObject::getSecondsUntilUnsquelched() if (m_squelchExpireTime.get() < 0) // squelched indefinitely return -1; - int32 const timeNow = static_cast(::time(NULL)); + int32 const timeNow = static_cast(::time(nullptr)); if (timeNow < m_squelchExpireTime.get()) // still in squelch period return (m_squelchExpireTime.get() - timeNow); @@ -8570,7 +8570,7 @@ void PlayerObject::setAccountNumLotsOverLimitSpam() { m_accountNumLotsOverLimitSpam = m_accountNumLots.get() - owner->getMaxNumberOfLots(); - int const timeNow = static_cast(::time(NULL)); + int const timeNow = static_cast(::time(nullptr)); int violationTime = 0; if (!owner->getObjVars().getItem("lotOverlimit.violation_time", violationTime)) { @@ -9010,7 +9010,7 @@ void PlayerObjectNamespace::grantGcwFactionalPresenceScore(std::string const & g // // for space, give bonus if the player's citizenship city is on the // corresponding ground planet and is the same faction as the player - CityInfo const * ci = NULL; + CityInfo const * ci = nullptr; if (!ServerWorld::isSpaceScene()) { Vector const creaturePosition = co.findPosition_w(); @@ -9132,7 +9132,7 @@ void PlayerObjectNamespace::grantGcwFactionalPresenceScore(std::string const & g playerCitySpaceZone = std::string("space_") + playerCityPlanet; if (playerCitySpaceZone != ServerWorld::getSceneId()) - ci = NULL; + ci = nullptr; } } @@ -9155,7 +9155,7 @@ void PlayerObjectNamespace::grantGcwFactionalPresenceScore(std::string const & g bonus += (cityRank * ConfigServerGame::getGcwFactionalPresenceAlignedCityRankBonusPct()); if (ci->getCreationTime() > 0) - bonus += std::max(0, (static_cast(::time(NULL)) - std::max(1041408000, ci->getCreationTime())) / 31536000 * ConfigServerGame::getGcwFactionalPresenceAlignedCityAgeBonusPct()); + bonus += std::max(0, (static_cast(::time(nullptr)) - std::max(1041408000, ci->getCreationTime())) / 31536000 * ConfigServerGame::getGcwFactionalPresenceAlignedCityAgeBonusPct()); } } diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.h b/engine/server/library/serverGame/src/shared/object/PlayerObject.h index 2298e6bd..da5386d8 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.h +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.h @@ -361,8 +361,8 @@ public: bool getCollectionSlotValue(std::string const & slotName, unsigned long & value) const; bool getCollectionSlotValue(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long & value) const; - bool hasCompletedCollectionSlotPrereq(std::string const & slotName, stdvector::fwd * collectionInfo = NULL) const; - bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, stdvector::fwd * collectionInfo = NULL) const; + bool hasCompletedCollectionSlotPrereq(std::string const & slotName, stdvector::fwd * collectionInfo = nullptr) const; + bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, stdvector::fwd * collectionInfo = nullptr) const; bool hasCompletedCollectionSlot(std::string const & slotName) const; bool hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo) const; @@ -374,15 +374,15 @@ public: bool hasCompletedCollectionBook(std::string const & bookName) const; - int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo = NULL) const; + int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionSlotCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = NULL) const; - int getCompletedCollectionCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = NULL) const; + int getCompletedCollectionSlotCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionCountInPage(std::string const & pageName, stdvector::fwd * collectionInfo = nullptr) const; - int getCompletedCollectionSlotCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = NULL) const; - int getCompletedCollectionCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = NULL) const; - int getCompletedCollectionPageCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = NULL) const; - int getCompletedCollectionBookCount(stdvector::fwd * collectionInfo = NULL) const; + int getCompletedCollectionSlotCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionPageCountInBook(std::string const & bookName, stdvector::fwd * collectionInfo = nullptr) const; + int getCompletedCollectionBookCount(stdvector::fwd * collectionInfo = nullptr) const; void migrateLegacyBadgesToCollection(stdvector::fwd const & badges); diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp index 54e63df9..dca33824 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp @@ -27,7 +27,7 @@ //----------------------------------------------------------------------- -const SharedObjectTemplate * PlayerQuestObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * PlayerQuestObject::m_defaultSharedTemplate = nullptr; namespace PlayerQuestObjectNamespace { @@ -156,7 +156,7 @@ void PlayerQuestObject::removeDefaultTemplate() if(m_defaultSharedTemplate) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp index 9b47248b..398adf07 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp @@ -27,7 +27,7 @@ // ====================================================================== -const SharedObjectTemplate * ResourceContainerObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * ResourceContainerObject::m_defaultSharedTemplate = nullptr; namespace ResourceContainerObjectNamespace { @@ -66,11 +66,11 @@ const SharedObjectTemplate * ResourceContainerObject::getDefaultSharedTemplate(v { static const ConstCharCrcLowerString templateName("object/resource_container/base/shared_resource_container_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast(ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create default shared object template %s", templateName.getString())); + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "ResourceContainerObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -83,10 +83,10 @@ const SharedObjectTemplate * ResourceContainerObject::getDefaultSharedTemplate(v */ void ResourceContainerObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // ResourceContainerObject::removeDefaultTemplate @@ -398,7 +398,7 @@ bool ResourceContainerObject::transferTo(ResourceContainerObject &destination, i * @param destContainer The container into which the new ResourceContainer should be placed, or cms_Invalid if no container * @param arrangementId -1 If destContainer is not slotted, otherwise the ID of the arrangement to use * @param newLocation The coordinates at which to place the new ResourceContainer. (Ignored if it is going into a non-positional container.) - * @param actor The player making the split, or NULL + * @param actor The player making the split, or nullptr */ bool ResourceContainerObject::splitContainer(int amount, const CachedNetworkId &destContainer, int arrangementId, const Vector &newLocation, ServerObject *actor) @@ -407,7 +407,7 @@ bool ResourceContainerObject::splitContainer(int amount, const CachedNetworkId & bool result = false; - ResourceContainerObject *newCrate = NULL; + ResourceContainerObject *newCrate = nullptr; if (destContainer == CachedNetworkId::cms_cachedInvalid) { @@ -420,7 +420,7 @@ bool ResourceContainerObject::splitContainer(int amount, const CachedNetworkId & { // create in volume container ServerObject * destObject = safe_cast(destContainer.getObject()); - if (destObject == NULL) + if (destObject == nullptr) return false; newCrate = dynamic_cast(ServerWorld::createNewObject(getObjectTemplateName(), *destObject, isPersisted())); } @@ -428,10 +428,10 @@ bool ResourceContainerObject::splitContainer(int amount, const CachedNetworkId & { // create in slotted container ServerObject * destObject = safe_cast(destContainer.getObject()); - if (destObject == NULL) + if (destObject == nullptr) return false; const SlottedContainmentProperty* containmentProperty = ContainerInterface::getSlottedContainmentProperty(*destObject); - if (containmentProperty == NULL) + if (containmentProperty == nullptr) return false; const SlottedContainmentProperty::SlotArrangement & slots = containmentProperty->getSlotArrangement(arrangementId); if (slots.empty()) diff --git a/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp index c5efc41b..82e2a710 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp @@ -30,7 +30,7 @@ ResourcePoolObject::ResourcePoolObject(ResourceTypeObject const & resourceType, m_fractalData(resourceType.getFractalData()), m_fractalSeed(fractalSeed), m_depletedTimestamp(resourceType.getDepletedTimestamp()), - m_efficiencyMap(NULL) + m_efficiencyMap(nullptr) { } @@ -39,7 +39,7 @@ ResourcePoolObject::ResourcePoolObject(ResourceTypeObject const & resourceType, ResourcePoolObject::~ResourcePoolObject() { delete m_efficiencyMap; - m_efficiencyMap=NULL; + m_efficiencyMap=nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp index 536c4e4f..d0b9123a 100755 --- a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp @@ -146,7 +146,7 @@ void ResourceTypeObject::setName(const std::string &newName) ResourcePoolObject *ResourceTypeObject::getPoolForPlanet(PlanetObject const &planetObject) const { if (isRecycled()) - return NULL; + return nullptr; std::map::const_iterator i=m_pools.find(planetObject.getNetworkId()); if (i==m_pools.end()) @@ -167,7 +167,7 @@ ResourcePoolObject *ResourceTypeObject::getPoolForPlanet(PlanetObject const &pla m_pools[planetObject.getNetworkId()]=obj; return obj; } - return NULL; // no pool for this planet + return nullptr; // no pool for this planet } } else @@ -377,7 +377,7 @@ ResourceTypeObject const * ResourceTypeObject::getRecycledVersion() const return result; } else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -437,7 +437,7 @@ NetworkId ResourceTypeObject::addImportedResourceType(std::string const & resour static Unicode::String const attributeDelimiters(Unicode::narrowToWide(" ")); Unicode::UnicodeStringVector tokens; static size_t const resourceAttributeIndex = 5; - if ((Unicode::tokenize(Unicode::narrowToWide(resourceData), tokens, &delimiters, NULL)) && (tokens.size() > resourceAttributeIndex)) + if ((Unicode::tokenize(Unicode::narrowToWide(resourceData), tokens, &delimiters, nullptr)) && (tokens.size() > resourceAttributeIndex)) { AddResourceTypeMessageNamespace::ResourceTypeData rtd; rtd.m_depletedTimestamp = 1; @@ -453,7 +453,7 @@ NetworkId ResourceTypeObject::addImportedResourceType(std::string const & resour for (size_t i = resourceAttributeIndex; i < tokens.size(); ++i) { attributeTokens.clear(); - if ((Unicode::tokenize(tokens[i], attributeTokens, &attributeDelimiters, NULL)) && (attributeTokens.size() == 2)) + if ((Unicode::tokenize(tokens[i], attributeTokens, &attributeDelimiters, nullptr)) && (attributeTokens.size() == 2)) { rtd.m_attributes.push_back(std::make_pair(Unicode::wideToNarrow(attributeTokens[0]), ::atoi(Unicode::wideToNarrow(attributeTokens[1]).c_str()))); } diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index d2598408..e96fc5b1 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -507,7 +507,7 @@ using namespace ServerObjectNamespace; // ====================================================================== -const SharedObjectTemplate * ServerObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * ServerObject::m_defaultSharedTemplate = nullptr; float ServerObject::ms_buildingUpdateRadiusMultiplier = 0; // ====================================================================== @@ -691,7 +691,7 @@ void ServerObject::ObserversCountCallback::modified(ServerObject &target, int ol ServerObject::ServerObject(const ServerObjectTemplate* newTemplate, const ObjectNotification ¬ification, bool const hyperspaceOnCreate) : Object (newTemplate, NetworkId::cms_invalid), m_oldPosition (), -m_sharedTemplate (NULL), +m_sharedTemplate (nullptr), m_client (0), m_observers (), m_localFlags (0), @@ -732,7 +732,7 @@ m_serverPackage (), m_serverPackage_np (), m_sharedPackage (), m_sharedPackage_np (), -m_networkUpdateFar (NULL), +m_networkUpdateFar (nullptr), m_triggerVolumes (), m_attributesAttained (), m_attributesInterested (), @@ -765,13 +765,13 @@ m_loadCTSPackedHouses(false) const std::string & sharedTemplateName = newTemplate->getSharedTemplate(); m_sharedTemplate = dynamic_cast(ObjectTemplateList::fetch(sharedTemplateName)); - if (m_sharedTemplate == NULL) + if (m_sharedTemplate == nullptr) { WARNING_STRICT_FATAL(!sharedTemplateName.empty(), ("Template %s has an invalid shared template %s. We will use the default shared template for now.", newTemplate->getName(), sharedTemplateName.c_str())); } - if (getSharedTemplate() != NULL) + if (getSharedTemplate() != nullptr) { m_nameStringId = getSharedTemplate()->getObjectName(); m_descriptionStringId = getSharedTemplate()->getDetailedDescription(); @@ -779,7 +779,7 @@ m_loadCTSPackedHouses(false) m_scriptObject->setOwner(this); - ContainedByProperty *containedBy = new ContainedByProperty(*this, NULL); + ContainedByProperty *containedBy = new ContainedByProperty(*this, nullptr); addProperty(*containedBy); //-- create the SlottedContainment property @@ -787,7 +787,7 @@ m_loadCTSPackedHouses(false) addProperty(*slottedProperty); //-- get ArrangementDescriptor if specified - if (getSharedTemplate() != NULL) + if (getSharedTemplate() != nullptr) { const ArrangementDescriptor *const arrangementDescriptor = getSharedTemplate()->getArrangementDescriptor(); if (arrangementDescriptor) @@ -801,7 +801,7 @@ m_loadCTSPackedHouses(false) } //set up containers on this object if it has any - if (getSharedTemplate() != NULL) + if (getSharedTemplate() != nullptr) { SharedObjectTemplate::ContainerType const containerType = getSharedTemplate()->getContainerType(); @@ -883,7 +883,7 @@ m_loadCTSPackedHouses(false) // add the portal property if one is requested - if (getSharedTemplate() != NULL) + if (getSharedTemplate() != nullptr) { const std::string &portalLayoutFileName = getSharedTemplate()->getPortalLayoutFilename(); if (!portalLayoutFileName.empty()) @@ -952,10 +952,10 @@ ServerObject::~ServerObject() destroyTriggerVolumes(); } - if (m_sharedTemplate != NULL) + if (m_sharedTemplate != nullptr) { m_sharedTemplate->releaseReference(); - m_sharedTemplate = NULL; + m_sharedTemplate = nullptr; } if (getClient()) @@ -982,7 +982,7 @@ ServerObject::~ServerObject() PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject delete script object"); delete m_scriptObject; } - m_scriptObject = NULL; + m_scriptObject = nullptr; gs_objectCount--; @@ -1038,14 +1038,14 @@ ServerObject * ServerObject::getServerObject(NetworkId const & networkId) ServerObject * ServerObject::asServerObject(Object * const object) { - return (object != NULL) ? object->asServerObject() : NULL; + return (object != nullptr) ? object->asServerObject() : nullptr; } //----------------------------------------------------------------------- ServerObject const * ServerObject::asServerObject(Object const * const object) { - return (object != NULL) ? object->asServerObject() : NULL; + return (object != nullptr) ? object->asServerObject() : nullptr; } //----------------------------------------------------------------------- @@ -1255,12 +1255,12 @@ const SharedObjectTemplate * ServerObject::getDefaultSharedTemplate(void) const { static const ConstCharCrcLowerString templateName("object/object/base/shared_object_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create default shared object template %s", templateName.getString())); + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "ServerObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -1280,10 +1280,10 @@ const unsigned long ServerObject::getObjectCount() */ void ServerObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // ServerObject::removeDefaultTemplate @@ -1570,7 +1570,7 @@ bool ServerObject::isInBazaarOrVendor() const { bool inBazaarOrVendor = false; const ServerObject *parent = safe_cast(ContainerInterface::getFirstParentInWorld(*this)); - const ServerObject *grandParent = NULL; + const ServerObject *grandParent = nullptr; if( parent ) { grandParent = safe_cast(ContainerInterface::getFirstParentInWorld(*parent)); @@ -1821,7 +1821,7 @@ void ServerObject::addTriggerVolume(TriggerVolume * t) { if (!t) { - WARNING_STRICT_FATAL(true, ("Cannot add null volume")); + WARNING_STRICT_FATAL(true, ("Cannot add nullptr volume")); return; } m_triggerVolumes.insert(std::make_pair(t->getName(), t)); @@ -1917,7 +1917,7 @@ void ServerObject::serverObjectEndBaselines(bool fromDatabase) onLoadedFromDatabase(); updateWorldSphere(); - if (getScriptObject() != NULL) + if (getScriptObject() != nullptr) { endBaselinesInitializeScript(*this, true); // If the object was created authoritative, trigger if needed @@ -2059,7 +2059,7 @@ void ServerObject::endBaselines() // and that buildout id got changed to some other object, like a rock if (isPlayerControlled() && isAuthoritative() && (immediateContainer->getNetworkId().getValue() < static_cast(0))) { - if (immediateContainer->asCellObject() != NULL || ContainerInterface::getCell(*immediateContainer) != NULL) + if (immediateContainer->asCellObject() != nullptr || ContainerInterface::getCell(*immediateContainer) != nullptr) ObserveTracker::onObjectContainerChanged(*this); else { @@ -2149,7 +2149,7 @@ bool ServerObject::handlePlayerInInteriorSetup(ContainedByProperty *containedBy) containedBy->setContainedBy(NetworkId::cms_invalid); fixOk = portal->fixupObject(*this, saveTransform); - containerHandleUpdateProxies(NULL, safe_cast(ContainerInterface::getContainedByObject(*this))); + containerHandleUpdateProxies(nullptr, safe_cast(ContainerInterface::getContainedByObject(*this))); if (building) building->gainedPlayer(*this); @@ -2306,8 +2306,8 @@ const int ServerObject::getCacheVersion() const const char * ServerObject::getSharedTemplateName() const { - if (getSharedTemplate() == NULL) - return NULL; + if (getSharedTemplate() == nullptr) + return nullptr; return getSharedTemplate()->ObjectTemplate::getName(); } @@ -2535,7 +2535,7 @@ bool ServerObject::serverObjectInitializeFirstTimeObject(ServerObject *cell, Tra if (cell) { Container::ContainerErrorCode tmp = Container::CEC_Success; - if (!ContainerInterface::transferItemToCell(*cell, *this, transform, NULL, tmp)) + if (!ContainerInterface::transferItemToCell(*cell, *this, transform, nullptr, tmp)) { WARNING(true, ("ServerWorld::createNewObjectIntermediate tried to create a new object in a cell, but it failed.")); return false; @@ -2587,7 +2587,7 @@ void ServerObject::initializeFirstTimeObject() //Don't move this declaration of contents out of the loop or you will leak a ref. ServerObjectTemplate::Contents contents; newTemplate->getContents(contents, i); - if (contents.content == NULL) + if (contents.content == nullptr) { DEBUG_WARNING(true, ("No template for contents item %d", i)); continue; @@ -2600,7 +2600,7 @@ void ServerObject::initializeFirstTimeObject() { //We'll persist the contents automatically if the parent object is persisted. ServerObject * newObject = ServerWorld::createNewObject(*(safe_cast(contents.content)), *this,slotId, false); - if (newObject == NULL) + if (newObject == nullptr) { DEBUG_WARNING(true, ("Can't create object from template %s",contents.content->getName())); } @@ -2615,7 +2615,7 @@ void ServerObject::initializeFirstTimeObject() // get the object (which we assume is a volume container) in the // desired slot SlottedContainer * const container = ContainerInterface::getSlottedContainer(*this); - if (container != NULL) + if (container != nullptr) { Container::ContainerErrorCode tmp = Container::CEC_Success; CachedNetworkId equippedObjectId = container->getObjectInSlot(SlotIdManager::findSlotId(CrcLowerString(contents.slotName.c_str())), tmp); @@ -2623,12 +2623,12 @@ void ServerObject::initializeFirstTimeObject() { // put the contents in the volume container ServerObject * equippedObject = safe_cast(equippedObjectId.getObject()); - if (equippedObject != NULL) + if (equippedObject != nullptr) { //We'll persist the contents automatically if the parent object is persisted. ServerObject * newObject = ServerWorld::createNewObject(*(safe_cast(contents.content)), *equippedObject,false); - if (newObject == NULL) + if (newObject == nullptr) { DEBUG_WARNING(true, ("Can't create object from template %s", contents.content->getName())); } @@ -2714,7 +2714,7 @@ void ServerObject::addToWorld() Object::addToWorld(); updateTriggerVolumes(); - if (getScriptObject() != NULL) + if (getScriptObject() != nullptr) getScriptObject()->setOwnerIsLoaded(); onAddedToWorld(); @@ -3012,8 +3012,8 @@ void ServerObject::onContainerTransferComplete(ServerObject *oldContainer, Serve void ServerObject::containerDepersistContents(ServerObject * oldParent, ServerObject * newParent) { - Container * const oldContainer = oldParent ? ContainerInterface::getContainer(*oldParent) : NULL; - Container * const newContainer = newParent ? ContainerInterface::getContainer(*newParent) : NULL; + Container * const oldContainer = oldParent ? ContainerInterface::getContainer(*oldParent) : nullptr; + Container * const newContainer = newParent ? ContainerInterface::getContainer(*newParent) : nullptr; if (oldContainer) oldContainer->internalItemRemoved(*this); @@ -3410,7 +3410,7 @@ void ServerObject::sendToClientsInUpdateRange(const GameNetworkMessage & message ServerObject * const obj = c->getCharacterObject(); - if (obj != NULL) + if (obj != nullptr) { if ( (ConfigServerGame::getSkipUnreliableTransformsForOtherCells() && obj->getAttachedTo() != getAttachedTo()) || (obj->getPosition_w().magnitudeBetweenSquared(getPosition_w()) > minDistanceSquared) @@ -3447,7 +3447,7 @@ void ServerObject::sendToSpecifiedClients(const GameNetworkMessage & message, bo for (std::vector::const_iterator i = clients.begin(); i != clients.end(); ++i) { ServerObject * o = safe_cast(NetworkIdManager::getObjectById(*i)); - if (o != NULL && o->getClient() != NULL) + if (o != nullptr && o->getClient() != nullptr) o->getClient()->send(message, reliable); } } @@ -3685,8 +3685,8 @@ void ServerObject::setParentCell(CellProperty * newCell) CellProperty * oldCell = getParentCell(); - if(oldCell == NULL) oldCell = CellProperty::getWorldCellProperty(); - if(newCell == NULL) newCell = CellProperty::getWorldCellProperty(); + if(oldCell == nullptr) oldCell = CellProperty::getWorldCellProperty(); + if(newCell == nullptr) newCell = CellProperty::getWorldCellProperty(); // ---------- @@ -3707,7 +3707,7 @@ void ServerObject::setParentCell(CellProperty * newCell) newTransform.multiply(oldCellTransform,oldTransform); Container::ContainerErrorCode tmp = Container::CEC_Success; - result = ContainerInterface::transferItemToWorld(*this, newTransform, NULL, tmp); + result = ContainerInterface::transferItemToWorld(*this, newTransform, nullptr, tmp); DEBUG_REPORT_LOG(!result, ("Object %s (id=%s) transfer to world was denied via ContainerInterface::transferItemToWorld()\n", getObjectTemplateName(), getNetworkId().getValueString().c_str())); } @@ -3720,7 +3720,7 @@ void ServerObject::setParentCell(CellProperty * newCell) ServerObject * newCellServerObject = safe_cast(newCellObject); Container::ContainerErrorCode tmp = Container::CEC_Success; - result = ContainerInterface::transferItemToCell(*newCellServerObject, *this, NULL, tmp); + result = ContainerInterface::transferItemToCell(*newCellServerObject, *this, nullptr, tmp); DEBUG_REPORT_LOG(!result, ("Object %s (id=%s) transfer to cell (id=%s) was denied via ContainerInterface::transferItemToCell()\n", getObjectTemplateName(), getNetworkId().getValueString().c_str(), newCellObject->getNetworkId().getValueString().c_str())); } @@ -4024,11 +4024,11 @@ void ServerObject::hearText(ServerObject const &source, MessageQueueSpatialChat CreatureObject * const creatureObject = asCreatureObject(); - if (creatureObject != NULL) + if (creatureObject != nullptr) { PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject != NULL) + if (playerObject != nullptr) { ChatAvatarId playerChatAvatarId(Chat::constructChatAvatarId(source)); Unicode::String playerName(Unicode::narrowToWide(playerChatAvatarId.getFullName())); @@ -4104,7 +4104,7 @@ void ServerObject::performSocial (const MessageQueueSocial & socialMsg) // allow scripts to prevent the player from performing the emote ScriptParams params; - if (getScriptObject() != NULL) + if (getScriptObject() != nullptr) { params.addParam(unicodeSocialTypeName); if (getScriptObject()->trigAllScripts(Scripting::TRIG_PERFORM_EMOTE, params) != SCRIPT_CONTINUE) @@ -4159,7 +4159,7 @@ void ServerObject::performCombatSpam (const MessageQueueCombatSpam & spamMsg, bo target->seeCombatSpam (spamMsg); } } else { - WARNING_STRICT_FATAL (!sendToSelf && !sendToBystanders, ("null target_obj in commandFuncCombatSpam, when sendToTarget was set true")); + WARNING_STRICT_FATAL (!sendToSelf && !sendToBystanders, ("nullptr target_obj in commandFuncCombatSpam, when sendToTarget was set true")); } } @@ -4217,10 +4217,10 @@ void ServerObject::teleportObject(Vector const &position_w, NetworkId const &tar { PortalProperty *portalProp = targetContainerObject->getPortalProperty(); targetContainerObject = 0; // clear in case we have a building that doesn't have the cell - if (portalProp != NULL) + if (portalProp != nullptr) { CellProperty *cellProp = portalProp->getCell(targetCellName.c_str()); - if (cellProp != NULL) + if (cellProp != nullptr) targetContainerObject = safe_cast(&(cellProp->getOwner())); } if (!targetContainerObject) @@ -4312,7 +4312,7 @@ void ServerObject::teleportObject(Vector const &position_w, NetworkId const &tar // Moves the object. If the new area is on a different server, the PlanetServer will change our authority. // What we really want to check here is whether we want to use the ServerController's teleport - // if a player has logged out, but we still have them loaded in game, their client will be null, + // if a player has logged out, but we still have them loaded in game, their client will be nullptr, // but we still want to use the ServerController's teleport method // so, we check against the player creature controller and player ship controller as well ServerController * controller = safe_cast(getController()); @@ -4383,7 +4383,7 @@ void ServerObject::updatePlanetServerInternal(bool) const /** * Attempts to create a synchronized ui object. If the synchronized ui object * does not exist, its creation is attempted via createSynchronizedUi. The default implementation -* of createSynchronizedUi returns null, and renders this method a no-op. +* of createSynchronizedUi returns nullptr, and renders this method a no-op. */ void ServerObject::addSynchronizedUi(const std::vector & clients) { @@ -4396,9 +4396,9 @@ void ServerObject::addSynchronizedUi(const std::vector & clients) { ServerObject * client = safe_cast( NetworkIdManager::getObjectById(*i)); - if (client != NULL) + if (client != nullptr) { - if (client->getClient() != NULL) + if (client->getClient() != nullptr) m_synchronizedUi->addClientObject (*client); else { @@ -4420,7 +4420,7 @@ void ServerObject::addSynchronizedUi(const std::vector & clients) /** * Attempts to add a client to the synchronized ui object. If the synchronized ui object * does not exist, its creation is attempted via createSynchronizedUi. The default implementation -* of createSynchronizedUi returns null, and renders this method a no-op. +* of createSynchronizedUi returns nullptr, and renders this method a no-op. * */ void ServerObject::addSynchronizedUiClient(ServerObject & client) @@ -4466,7 +4466,7 @@ void ServerObject::removeSynchronizedUiClient(const NetworkId & clientId) /** * Subclasses implement this if they have an appropriate synchronized ui object. -* Base class implementation returns null. +* Base class implementation returns nullptr. */ ServerSynchronizedUi * ServerObject::createSynchronizedUi () { @@ -4483,13 +4483,13 @@ ServerSynchronizedUi * ServerObject::createSynchronizedUi () */ void ServerObject::addPendingSynchronizedUi(const ServerObject & uiObject) { - if (getClient() != NULL) + if (getClient() != nullptr) { WARNING(true, ("ServerObject::addPendingSynchronizedUi called on object %s that already has a client", getNetworkId().getValueString().c_str())); return; } - if (m_pendingSyncUi == NULL) + if (m_pendingSyncUi == nullptr) m_pendingSyncUi = new std::vector; m_pendingSyncUi->push_back(uiObject.getNetworkId()); } @@ -5057,7 +5057,7 @@ std::string ServerObject::debugGetMessageToList() const { unsigned long const now = ServerClock::getInstance().getGameTimeSeconds(); std::string result; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); for (Archive::AutoDeltaMap, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end(); ++i) { char temp[256]; @@ -5126,7 +5126,7 @@ unsigned long ServerObject::processQueuedMessageTos(unsigned long effectiveMessa // if the message is going to be recurring, create a // new messageTo to reschedule the recurring message - MessageToPayload * copyOfRecurringMessage = NULL; + MessageToPayload * copyOfRecurringMessage = nullptr; if (message->second.getRecurringTime() > 0) { copyOfRecurringMessage = new MessageToPayload( @@ -5331,7 +5331,7 @@ void ServerObject::handleCMessageTo(const MessageToPayload &message) { //handle unstick static MessageDispatch::Emitter e; - Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_complete, NULL); + Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_complete, nullptr); RequestUnstick r; r.setClientId(getNetworkId()); e.emitMessage(r); @@ -5587,7 +5587,7 @@ bool ServerObject::handleTeleportFixup(bool force) } else if (destContainer != NetworkId::cms_invalid && !force) { - LOG("TeleportFixup", ("Failing teleport fixup because object %s is in a null dest container and force was passed in\n", getNetworkId().getValueString().c_str())); + LOG("TeleportFixup", ("Failing teleport fixup because object %s is in a nullptr dest container and force was passed in\n", getNetworkId().getValueString().c_str())); return false; // going to a container and it wasn't loaded, defer } } @@ -5626,15 +5626,15 @@ void ServerObject::customize(const std::string & customName, int value) if(isAuthoritative()) { CustomizationDataProperty *const cdProperty = safe_cast(getProperty(CustomizationDataProperty::getClassPropertyId())); - if (cdProperty != NULL) + if (cdProperty != nullptr) { CustomizationData *const customizationData = cdProperty->fetchCustomizationData(); - if (customizationData != NULL) + if (customizationData != nullptr) { RangedIntCustomizationVariable * variable = dynamic_cast< RangedIntCustomizationVariable*>(customizationData->findVariable( customName)); - if (variable != NULL) + if (variable != nullptr) variable->setValue(value); else { @@ -5646,7 +5646,7 @@ void ServerObject::customize(const std::string & customName, int value) else { // this shouldn't happen - DEBUG_WARNING(true, ("CustomizationDataProperty returned NULL CustomizationData on fetch.")); + DEBUG_WARNING(true, ("CustomizationDataProperty returned nullptr CustomizationData on fetch.")); } } else @@ -5725,7 +5725,7 @@ bool ServerObject::permanentlyDestroy(DeleteReasons::Enumerator reason) const bool houseDestroyedByScript = (reason == DeleteReasons::Script && buildingObject && buildingObject->isPlayerPlaced()); // tell scripts we want to destroy the object - if (getScriptObject() != NULL && !m_calledTriggerDestroy) + if (getScriptObject() != nullptr && !m_calledTriggerDestroy) { m_calledTriggerDestroy = true; ScriptParams params; @@ -5739,7 +5739,7 @@ bool ServerObject::permanentlyDestroy(DeleteReasons::Enumerator reason) } } - if (isAuthoritative() && (getScriptObject() != NULL) && !m_calledTriggerRemovingFromWorld) + if (isAuthoritative() && (getScriptObject() != nullptr) && !m_calledTriggerRemovingFromWorld) { ScriptParams params; m_calledTriggerRemovingFromWorld = true; @@ -6517,8 +6517,8 @@ void ServerObject::onAllContentsLoaded() if (isAuthoritative()) { - ServerObject *player = NULL; - if ((player = getServerObject(playerId)) != NULL) + ServerObject *player = nullptr; + if ((player = getServerObject(playerId)) != nullptr) { //Tell scripts we are loaded ScriptParams params; @@ -6588,7 +6588,7 @@ void ServerObject::handleDisconnect(bool immediate) { // client has disconnected, log pertinent information about the play session CreatureObject * const creatureObject = asCreatureObject(); - PlayerObject * playerObject = NULL; + PlayerObject * playerObject = nullptr; if (creatureObject) { playerObject = PlayerCreatureController::getPlayerObject(creatureObject); @@ -6927,13 +6927,13 @@ ServerObject * ServerObject::combineResourceContainers(ServerObject &item) { ResourceContainerObject *resourceContainerObject = safe_cast(&item); - if (resourceContainerObject != NULL) + if (resourceContainerObject != nullptr) { // If this is a container, see if it contains another resource container of the same type Container *container = ContainerInterface::getContainer(*this); - if (container != NULL) + if (container != nullptr) { ContainerIterator iterContainer = container->begin(); @@ -6945,12 +6945,12 @@ ServerObject * ServerObject::combineResourceContainers(ServerObject &item) // the item is a resource container if ((containedObject != &item) && - (containedObject != NULL) && + (containedObject != nullptr) && (containedObject->getObjectType() == ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag)) { ResourceContainerObject *containedResourceContainerObject = safe_cast(containedObject); - if ((containedResourceContainerObject != NULL) && + if ((containedResourceContainerObject != nullptr) && (resourceContainerObject->getResourceType() == containedResourceContainerObject->getResourceType())) { // This is a container of similar type, if it is not full, save it to the list @@ -7064,7 +7064,7 @@ bool ServerObject::isContainedBy(const ServerObject & container, bool includeCon // our container is the desired container return true; } - else if (test != NULL && test != this && includeContents) + else if (test != nullptr && test != this && includeContents) { // our container isn't the desired container, see if it is contained return safe_cast(test)->isContainedBy(container, true); @@ -7564,7 +7564,7 @@ void ServerObject::sendDirtyObjectMenuNotification() Controller * const controller = getController(); if (controller) - controller->appendMessage(CM_objectMenuDirty, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT); + controller->appendMessage(CM_objectMenuDirty, 0, nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT); } // ---------------------------------------------------------------------- @@ -7577,7 +7577,7 @@ void ServerObject::sendDirtyAttributesNotification() Controller * const controller = getController(); if (controller) - controller->appendMessage(CM_attributesDirty, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT); + controller->appendMessage(CM_attributesDirty, 0, nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT); } //------------------------------------------------------------------------------------------ @@ -7615,15 +7615,15 @@ void ServerObject::triggerMadeAuthoritative() void ServerObject::setLayer(TerrainGenerator::Layer* layer) { - LayerProperty * layerProperty = NULL; + LayerProperty * layerProperty = nullptr; Property * property = getProperty(LayerProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) layerProperty = safe_cast(property); else layerProperty = new LayerProperty(*this); layerProperty->setLayer(layer); - if (property == NULL) + if (property == nullptr) { addProperty(*layerProperty, true); ObjectTracker::addRunTimeRule(); @@ -7636,12 +7636,12 @@ void ServerObject::setLayer(TerrainGenerator::Layer* layer) TerrainGenerator::Layer* ServerObject::getLayer() const { const Property * property = getProperty(LayerProperty::getClassPropertyId()); - if (property != NULL) + if (property != nullptr) { const LayerProperty * layerProperty = safe_cast(property); return layerProperty->getLayer(); } - return NULL; + return nullptr; } //------------------------------------------------------------------------------------------ @@ -7853,7 +7853,7 @@ void ServerObject::setPatrolPathRoot(const ServerObject & root) // make sure we aren't already a root node Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { if (root.getNetworkId() != getNetworkId()) { @@ -7873,7 +7873,7 @@ void ServerObject::setPatrolPathRoot(const ServerObject & root) { // add the root node to our node list p = getProperty(PatrolPathNodeProperty::getClassPropertyId()); - if (p == NULL) + if (p == nullptr) { p = new PatrolPathNodeProperty(*this); addProperty(*p, true); @@ -7893,15 +7893,15 @@ void ServerObject::setPatrolPathRoot(const ServerObject & root) // we need to add any players in range to our path observer count TriggerVolume * triggerVolume = getNetworkTriggerVolume(); - if (triggerVolume != NULL) + if (triggerVolume != nullptr) { TriggerVolume::ContentsSet const & contents = triggerVolume->getContents(); for (TriggerVolume::ContentsSet::const_iterator i = contents.begin(); i != contents.end(); ++i) { - if (*i != NULL) + if (*i != nullptr) { Client * client = (*i)->getClient(); - if (client != NULL) + if (client != nullptr) { if (!ObserveTracker::isObserving(*client, *this)) ObserveTracker::onClientEnteredNetworkTriggerVolume(*client, *triggerVolume); @@ -7922,14 +7922,14 @@ void ServerObject::setPatrolPathRoot(const ServerObject & root) /** * Returns the root node for a patrol path node. * - * @return the root node, or NULL if this isn't a patrol path node + * @return the root node, or nullptr if this isn't a patrol path node */ const std::set & ServerObject::getPatrolPathRoots() const { static const std::set noRoots; const Property * p = getProperty(PatrolPathNodeProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { return safe_cast(p)->getRoots(); } @@ -7957,7 +7957,7 @@ void ServerObject::addPatrolPathingObject(const ServerObject & ai) } Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { safe_cast(p)->addPatrollingObject(ai); DEBUG_REPORT_LOG(true, ("[patrolpath] add patrol ai %s to root %s\n", @@ -7974,7 +7974,7 @@ void ServerObject::addPatrolPathingObject(const ServerObject & ai) if (roots.size() == 1) { ServerObject * root = safe_cast(roots.begin()->getObject()); - if (root != NULL) + if (root != nullptr) root->addPatrolPathingObject(ai); } else @@ -8004,7 +8004,7 @@ void ServerObject::removePatrolPathingObject(const ServerObject & ai) } Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { safe_cast(p)->removePatrollingObject(ai); DEBUG_REPORT_LOG(true, ("[patrolpath] remove patrol ai %s from root %s\n", @@ -8019,7 +8019,7 @@ void ServerObject::removePatrolPathingObject(const ServerObject & ai) if (roots.size() == 1) { ServerObject * root = safe_cast(roots.begin()->getObject()); - if (root != NULL) + if (root != nullptr) root->removePatrolPathingObject(ai); } else @@ -8049,7 +8049,7 @@ void ServerObject::addPatrolPathObserver() // if we are a root node, increment our observer count Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { PatrolPathRootProperty * pprp = safe_cast(p); pprp->incrementObserverCount(); @@ -8061,10 +8061,10 @@ void ServerObject::addPatrolPathObserver() const std::set > & ai = pprp->getPatrollingObjects(); for (std::set >::const_iterator i = ai.begin(); i != ai.end(); ++i) { - if (*i != NULL) + if (*i != nullptr) { const ServerObject * ai = *i; - if (ai->getController()->asCreatureController() != NULL) + if (ai->getController()->asCreatureController() != nullptr) { const CreatureController * controller = ai->getController()->asCreatureController(); if (controller->getHibernate()) @@ -8086,7 +8086,7 @@ void ServerObject::addPatrolPathObserver() for (std::set::const_iterator i = roots.begin(); i != roots.end(); ++i) { ServerObject * root = safe_cast(i->getObject()); - if (root != NULL) + if (root != nullptr) { root->addPatrolPathObserver(); } @@ -8112,7 +8112,7 @@ void ServerObject::removePatrolPathObserver() // if we are a root node, decrement our observer count Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { PatrolPathRootProperty * pprp = safe_cast(p); pprp->decrementObserverCount(); @@ -8131,7 +8131,7 @@ void ServerObject::removePatrolPathObserver() for (std::set::const_iterator i = roots.begin(); i != roots.end(); ++i) { ServerObject * root = safe_cast(i->getObject()); - if (root != NULL) + if (root != nullptr) { root->removePatrolPathObserver(); } @@ -8152,7 +8152,7 @@ int ServerObject::getPatrolPathObservers() const int observers = 0; const Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId()); - if (p != NULL) + if (p != nullptr) { observers = safe_cast(p)->getObserverCount(); } @@ -8162,7 +8162,7 @@ int ServerObject::getPatrolPathObservers() const for (std::set::const_iterator i = roots.begin(); i != roots.end(); ++i) { const ServerObject * root = safe_cast(i->getObject()); - if (root != NULL && root->isPatrolPathRoot()) + if (root != nullptr && root->isPatrolPathRoot()) { observers += root->getPatrolPathObservers(); } @@ -8175,14 +8175,14 @@ int ServerObject::getPatrolPathObservers() const bool ServerObject::isPatrolPathNode() const { - return (getProperty(PatrolPathNodeProperty::getClassPropertyId()) != NULL) || isPatrolPathRoot(); + return (getProperty(PatrolPathNodeProperty::getClassPropertyId()) != nullptr) || isPatrolPathRoot(); } // ---------------------------------------------------------------------- bool ServerObject::isPatrolPathRoot() const { - return getProperty(PatrolPathRootProperty::getClassPropertyId()) != NULL; + return getProperty(PatrolPathRootProperty::getClassPropertyId()) != nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.h b/engine/server/library/serverGame/src/shared/object/ServerObject.h index 32192ce3..5cdaed82 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.h +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.h @@ -317,7 +317,7 @@ public: // Can this object manipulate other objects. CreatureObject overrides. Base class returns false. // generally an object is allowed to manipulate another object if it is container or "nearby". public: - virtual bool canManipulateObject(ServerObject const &target, bool movingObject, bool checkPermission, bool checkPermissionOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = NULL) const; + virtual bool canManipulateObject(ServerObject const &target, bool movingObject, bool checkPermission, bool checkPermissionOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = nullptr) const; //----------------------------------------------------------------------- // container support @@ -738,7 +738,7 @@ private: static float ms_buildingUpdateRadiusMultiplier; static void setBuildingUpdateRadiusMultiplier(float m); - /** If this object is being controlled by a client, this pointer will be set. NULL otherwise + /** If this object is being controlled by a client, this pointer will be set. nullptr otherwise */ Client * m_client; std::set m_observers; @@ -871,7 +871,7 @@ inline Client * ServerObject::getClient(void) const inline const SharedObjectTemplate * ServerObject::getSharedTemplate() const { - if (m_sharedTemplate != NULL) + if (m_sharedTemplate != nullptr) return m_sharedTemplate; return getDefaultSharedTemplate(); } @@ -936,7 +936,7 @@ inline ServerObject::TriggerVolumeMap & ServerObject::getTriggerVolumeMap() inline const std::set * ServerObject::getTriggerVolumeEntered() const { - return NULL; + return nullptr; } //----------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp index 65655198..b7075ece 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp @@ -162,7 +162,7 @@ void ServerObject::transferAuthoritySceneChange(uint32 pid) client->getIpAddress(), client->isSecure(), client->getStationId(), - NULL, + nullptr, client->getGameFeatures(), client->getSubscriptionFeatures(), client->getAccountFeatureIds(), @@ -265,7 +265,7 @@ void ServerObject::transferAuthorityNoSceneChange(uint32 pid, bool skipLoadScree client->getIpAddress(), client->isSecure(), client->getStationId(), - (observeListIds.empty() ? NULL : &observeListIds), + (observeListIds.empty() ? nullptr : &observeListIds), client->getGameFeatures(), client->getSubscriptionFeatures(), client->getAccountFeatureIds(), diff --git a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp index 5bb2df2f..49c6bd09 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp @@ -577,7 +577,7 @@ ResourceTypeObject const * ServerResourceClassObject::getAResourceType() const if (!m_types.empty()) return m_types.front(); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp index badd8030..2408018b 100755 --- a/engine/server/library/serverGame/src/shared/object/ShipObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp @@ -110,9 +110,9 @@ namespace ShipObjectNamespace typedef std::map ShipTypeShipDataMap; ShipTypeShipDataMap ms_shipTypeShipDataMap; - ShipData const * ms_defaultShipData = NULL; + ShipData const * ms_defaultShipData = nullptr; - ShipComponentDataEngine * ms_defaultEngine = NULL; + ShipComponentDataEngine * ms_defaultEngine = nullptr; unsigned int s_lastShipId = 0; unsigned int const s_maxShipId = 4096; @@ -180,7 +180,7 @@ void ShipObject::install() DataTableManager::addReloadCallback(cs_shipTypeFileName, loadShipTypeDataTable); ShipComponentDescriptor const * const genericEngineDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName(ConstCharCrcString("eng_generic")); - FATAL(genericEngineDescriptor == NULL, ("ShipObject genericEngineDescriptor [eng_generic] not found")); + FATAL(genericEngineDescriptor == nullptr, ("ShipObject genericEngineDescriptor [eng_generic] not found")); ms_defaultEngine = new ShipComponentDataEngine(*genericEngineDescriptor); // mark shipId 0 as used @@ -243,10 +243,10 @@ ShipObject * ShipObject::getContainingShipObject(ServerObject * serverObject) void ShipObjectNamespace::remove() { - ms_defaultShipData = NULL; + ms_defaultShipData = nullptr; delete ms_defaultEngine; - ms_defaultEngine = NULL; + ms_defaultEngine = nullptr; //-- Delete the ship type to ship data map std::for_each(ms_shipTypeShipDataMap.begin(), ms_shipTypeShipDataMap.end(), PointerDeleterPairSecond()); @@ -270,7 +270,7 @@ ShipObject::ShipObject(ServerShipObjectTemplate const *newTemplate) : m_currentRoll(0.f), m_currentChassisHitPoints(0.f), m_maximumChassisHitPoints(0.f), - m_weaponRefireTimers(NULL), + m_weaponRefireTimers(nullptr), m_numberOfHits(0), m_chassisType (0), m_chassisComponentMassMaximum(0.0f), @@ -406,19 +406,19 @@ ShipObject::~ShipObject() nullWatchers(); delete m_boosterAvailableTimer; - m_boosterAvailableTimer = NULL; + m_boosterAvailableTimer = nullptr; if (getLocalFlag(LocalObjectFlags::ShipObject_ShipIdAssigned)) freeShipId(m_shipId.get()); delete m_fireShotQueue; - m_fireShotQueue = NULL; + m_fireShotQueue = nullptr; delete[] m_weaponRefireTimers; - m_weaponRefireTimers = NULL; + m_weaponRefireTimers = nullptr; delete m_nebulas; - m_nebulas = NULL; + m_nebulas = nullptr; delete m_autoAggroImmuneTimer; delete m_turretWeaponIndices; @@ -465,7 +465,7 @@ void ShipObject::endBaselines() NetworkId const & resourceTypeId = (*it).first; ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(resourceTypeId); - if (NULL == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId)) + if (nullptr == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId)) { WARNING(true, ("ShipObject::endBaselines invalid resource type [%s]", resourceTypeId.getValueString().c_str())); continue; @@ -946,7 +946,7 @@ Controller *ShipObject::createDefaultController() /** * Get the ship's pilot, if any. * - * @return the pilot if there is one, otherwise NULL + * @return the pilot if there is one, otherwise nullptr */ CreatureObject *ShipObject::getPilot() { @@ -1180,7 +1180,7 @@ void ShipObject::internalHandleFireShot(Client const *gunnerClient, int const we { if (!gunnerCreature) { - WARNING(true, ("ShipObject::internalHandleFireShot cannot fire missile with a null gunner")); + WARNING(true, ("ShipObject::internalHandleFireShot cannot fire missile with a nullptr gunner")); return; } @@ -1284,14 +1284,14 @@ void ShipObject::fireShotTurretServer(int const weaponIndex, NetworkId const & t Object const * const targetObject = NetworkIdManager::getObjectById(targetId); - if (targetObject == NULL) + if (targetObject == nullptr) { WARNING(true, ("ERROR: The targetId(%s) could not be resolved to an Object. A turret shot will NOT be fired.", targetId.getValueString().c_str())); return; } ServerObject const * const targetServerObject = targetObject->asServerObject(); - ShipObject const * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL; + ShipObject const * const targetShipObject = (targetServerObject != nullptr) ? targetServerObject->asShipObject() : nullptr; if ( !targetShipObject && goodShot) @@ -1299,7 +1299,7 @@ void ShipObject::fireShotTurretServer(int const weaponIndex, NetworkId const & t WARNING(true, ("ERROR: The targetId(%s) could not be resolved to a ShipObject. Perfect shot requested, but there is no way to lead with a perfect shot.", targetId.getValueString().c_str())); } - if ( (targetShipObject != NULL) + if ( (targetShipObject != nullptr) && goodShot) { // If its a good shot, lead perfectly @@ -1335,8 +1335,8 @@ void ShipObject::fireShotTurretServer(int const weaponIndex, NetworkId const & t ShipController const * const ownerShipController = getController()->asShipController(); DEBUG_WARNING(!ownerShipController, ("ERROR: Controller could not be resolved to a ShipController(%s)", getDebugInformation().c_str())); - float const missHalfAngle = (ownerShipController != NULL) ? (ownerShipController->getTurretMissAngle() / 2.0f) : 0.0f; - float const targetRadius = (targetServerObject != NULL) ? targetServerObject->getRadius() : 0.0f; + float const missHalfAngle = (ownerShipController != nullptr) ? (ownerShipController->getTurretMissAngle() / 2.0f) : 0.0f; + float const targetRadius = (targetServerObject != nullptr) ? targetServerObject->getRadius() : 0.0f; Transform transform; transform.roll_l(Random::randomReal() * PI_TIMES_2); @@ -1442,13 +1442,13 @@ void ShipObject::constructFromTemplate() //-- setup ship chassis ShipChassis const * shipChassis = ShipChassis::findShipChassisByName (TemporaryCrcString (shipType.c_str (), true)); - if (shipChassis == NULL) + if (shipChassis == nullptr) { WARNING (true, ("ShipObject::constructFromTemplate failed to find a valid ship chassis for [%s], trying generic", shipType.c_str ())); shipChassis = ShipChassis::findShipChassisByName (TemporaryCrcString ("generic", true)); } - if (shipChassis != NULL) + if (shipChassis != nullptr) m_chassisType = shipChassis->getCrc (); else { @@ -1456,7 +1456,7 @@ void ShipObject::constructFromTemplate() } //set initial slot targetability from the chassis setttings. Code or script can change these at runtime - if(shipChassis != NULL) + if(shipChassis != nullptr) { for (int slot = 0; slot < static_cast(ShipChassisSlotType::SCST_num_types); ++slot) { @@ -1473,7 +1473,7 @@ void ShipObject::constructFromTemplate() { ShipComponentData * const shipComponentData = shipData->m_components[i]; - if (shipComponentData != NULL) + if (shipComponentData != nullptr) { if (!installComponentFromData(i, *shipComponentData)) { std::string chassis = shipChassis->getName().getString(); @@ -1732,7 +1732,7 @@ ShipComponentDataEngine const & ShipObject::getShipDataEngine() const ShipComponentDataEngine const * const engine = safe_cast(shipData->m_components[static_cast(ShipChassisSlotType::SCST_engine)]); - if (engine == NULL) + if (engine == nullptr) return *ms_defaultEngine; return *engine; @@ -1761,9 +1761,9 @@ void ShipObject::handleGunnerChange(ServerObject const &player) } ShipController * const shipController = getController()->asShipController(); - PlayerShipController * const playerShipController = (shipController != NULL) ? shipController->asPlayerShipController() : NULL; + PlayerShipController * const playerShipController = (shipController != nullptr) ? shipController->asPlayerShipController() : nullptr; - if (playerShipController != NULL) + if (playerShipController != nullptr) { playerShipController->updateGunnerWeaponIndex(player.getNetworkId(), gunnerWeaponIndex); } @@ -2152,7 +2152,7 @@ void ShipObjectNamespace::loadShipTypeDataTable(DataTable const &dataTable) //-- find components for (int i = 0; i < static_cast(ShipChassisSlotType::SCST_num_types); ++i) { - shipData->m_components [i] = NULL; + shipData->m_components [i] = nullptr; std::string const & slotName = ShipChassisSlotType::getNameFromType (static_cast(i)); if (!dataTable.doesColumnExist (slotName)) continue; @@ -2164,14 +2164,14 @@ void ShipObjectNamespace::loadShipTypeDataTable(DataTable const &dataTable) uint32 const componentCrc = Crc::normalizeAndCalculate (componentName.c_str ()); ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) WARNING (true, ("ShipObject ship type [%s] specified invalid [%s] component [%s]", name.c_str (), slotName.c_str (), componentName.c_str ())); else shipData->m_components[i] = ShipComponentDataManager::create(*shipComponentDescriptor); ShipComponentData * const shipComponentData = shipData->m_components[i]; - if (shipComponentData == NULL) + if (shipComponentData == nullptr) continue; //-- get common data @@ -2532,18 +2532,18 @@ void ShipObjectNamespace::freeShipId(uint16 shipId) ShipObject const * ShipObject::asShipObject(Object const * object) { - ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject const * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->asShipObject() : NULL; + return (serverObject != nullptr) ? serverObject->asShipObject() : nullptr; } // ---------------------------------------------------------------------- ShipObject * ShipObject::asShipObject(Object * object) { - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->asShipObject() : NULL; + return (serverObject != nullptr) ? serverObject->asShipObject() : nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp index e6f4cb22..667c9ae7 100755 --- a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp +++ b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp @@ -1638,7 +1638,7 @@ bool ShipObject::canInstallComponent (int chassisSlot, TangibleObject const ShipChassisSlot const * const slot = shipChassis->getSlot (static_cast(effectiveCompatibilitySlot)); - if (slot != NULL) + if (slot != nullptr) { if (slot->canAcceptComponent (shipComponentData->getDescriptor ())) { @@ -1721,7 +1721,7 @@ bool ShipObject::installComponent (NetworkId const & installerId, int chassisS void ShipObject::purgeComponent (int chassisSlot) { - IGNORE_RETURN (internalUninstallComponent (NetworkId::cms_invalid, chassisSlot, NULL)); + IGNORE_RETURN (internalUninstallComponent (NetworkId::cms_invalid, chassisSlot, nullptr)); } //---------------------------------------------------------------------- @@ -1731,16 +1731,16 @@ TangibleObject * ShipObject::internalUninstallComponent (NetworkId const if (!isSlotInstalled (chassisSlot)) { WARNING (true, ("ShipObject::internalUninstallComponent failed... no component installed in slot")); - return NULL; + return nullptr; } ShipComponentData * const shipComponentData = createShipComponentData (chassisSlot); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { - WARNING (true, ("ShipObject::internalUninstallComponent failed null data")); + WARNING (true, ("ShipObject::internalUninstallComponent failed nullptr data")); delete shipComponentData; - return NULL; + return nullptr; } if(getScriptObject()) @@ -1751,7 +1751,7 @@ TangibleObject * ShipObject::internalUninstallComponent (NetworkId const p.addParam (containerTarget ? containerTarget->getNetworkId () : NetworkId::cms_invalid); if (getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_UNINSTALLING, p) == SCRIPT_OVERRIDE) - return NULL; + return nullptr; } TangibleObject * tangible = 0; @@ -1765,7 +1765,7 @@ TangibleObject * ShipObject::internalUninstallComponent (NetworkId const { VolumeContainer * volContainer = ContainerInterface::getVolumeContainer(*containerTarget); - if (volContainer == NULL) + if (volContainer == nullptr) return 0; int oldCapacity = volContainer->debugDoNotUseSetCapacity(-1); @@ -1780,21 +1780,21 @@ TangibleObject * ShipObject::internalUninstallComponent (NetworkId const obj = safe_cast(ServerWorld::createNewObject (objectTemplateCrc, *containerTarget, true)); } - if (obj == NULL) + if (obj == nullptr) { WARNING (true, ("ShipObject::internalUninstallComponent failed for slot [%d] because ServerWorld could not create an object for [%d], or container is full", chassisSlot, objectTemplateCrc)); delete shipComponentData; - return NULL; + return nullptr; } tangible = obj->asTangibleObject (); - if (tangible == NULL) + if (tangible == nullptr) { WARNING (true, ("ShipObject::internalUninstallComponent failed for slot [%d] because object template [%d] is not tangible", chassisSlot, objectTemplateCrc)); delete shipComponentData; IGNORE_RETURN (obj->permanentlyDestroy (DeleteReasons::SetupFailed)); - return NULL; + return nullptr; } shipComponentData->writeDataToComponent (*tangible); @@ -1897,7 +1897,7 @@ TangibleObject * ShipObject::uninstallComponent (NetworkId const & uninstallerId bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData const & shipComponentData) { ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ()); - if (shipChassis == NULL) + if (shipChassis == nullptr) { DEBUG_WARNING (true, ("Ship [%s] chassis [%d] is invalid for installing component [%s]", getNetworkId().getValueString().c_str(), @@ -1922,7 +1922,7 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con effectiveCompatibilitySlot = ShipChassisSlotType::SCST_weapon_first+((chassisSlot-ShipChassisSlotType::SCST_weapon_first)&7); ShipChassisSlot const * const slot = shipChassis->getSlot (static_cast(effectiveCompatibilitySlot)); - if (slot == NULL) + if (slot == nullptr) { DEBUG_WARNING (true, ("Ship [%s] chassis [%s] does not support slot [%s] for installing component [%s]", getNetworkId().getValueString().c_str(), @@ -1957,7 +1957,7 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con bool ShipObject::pseudoInstallComponent(int chassisSlot, uint32 componentCrc) { ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { WARNING (true, ("Invalid component name")); return false; @@ -1965,7 +1965,7 @@ bool ShipObject::pseudoInstallComponent(int chassisSlot, uint32 componentCrc) ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*shipComponentDescriptor); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { WARNING(true, ("ShipObject::pseudoInstallComponent invalid descriptor")); return false; @@ -1982,27 +1982,27 @@ bool ShipObject::pseudoInstallComponent(int chassisSlot, uint32 componentCrc) ShipComponentData * ShipObject::createShipComponentData (int chassisSlot) const { - ShipComponentDescriptor const * shipComponentDescriptor = NULL; + ShipComponentDescriptor const * shipComponentDescriptor = nullptr; uint32 const componentCrc = getComponentCrc (chassisSlot); if (componentCrc) { shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { WARNING (true, ("ShipObject::createShipComponentData failed for slot [%d] because component crc [%d] could not map to a component descriptor", chassisSlot, componentCrc)); - return NULL; + return nullptr; } } else - return NULL; + return nullptr; ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*shipComponentDescriptor); - if (shipComponentData == NULL) + if (shipComponentData == nullptr) { WARNING (true, ("ShipObject::createShipComponentData failed for slot [%d] ship Component data could not be constructed", chassisSlot)); delete(shipComponentData); - return NULL; + return nullptr; } if (!shipComponentData->readDataFromShip (chassisSlot, *this)) @@ -2334,7 +2334,7 @@ float ShipObject::computeShipActualSpeedMaximum () const if (hasWings() && hasCondition(TangibleObject::C_wingsOpened)) { ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc(getChassisType()); - if (NULL != shipChassis) + if (nullptr != shipChassis) { float const wingOpenSpeedFactor = shipChassis->getWingOpenSpeedFactor(); rate *= wingOpenSpeedFactor; @@ -2673,7 +2673,7 @@ void ShipObject::handlePowerPulse (float timeElapsedSecs) if (boosterEnergyCurrent <= 0.0f) { IGNORE_RETURN(setComponentActive(ShipChassisSlotType::SCST_booster, false)); - if (pilot != NULL) + if (pilot != nullptr) Chat::sendSystemMessage(*pilot, SharedStringIds::booster_energy_depleted, Unicode::emptyString); restartBoosterTimer(); @@ -3368,7 +3368,7 @@ void ShipObject::setCargoHoldContent(NetworkId const & resourceTypeId, int amoun else { ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(resourceTypeId); - if (NULL == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId)) + if (nullptr == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId)) { WARNING(true, ("ShipObject::setCargoHoldContent invalid resource type [%s]", resourceTypeId.getValueString().c_str())); return; diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp index 8a9dfc3f..35366239 100755 --- a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp @@ -21,7 +21,7 @@ #include "sharedObject/AppearanceTemplateList.h" #include "sharedObject/ObjectTemplateList.h" -const SharedObjectTemplate * StaticObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * StaticObject::m_defaultSharedTemplate = nullptr; //----------------------------------------------------------------------- @@ -39,7 +39,7 @@ StaticObject::StaticObject(const ServerStaticObjectTemplate* newTemplate) : { Appearance * newAppearance = AppearanceTemplateList::createAppearance(appearanceString.c_str()); - if(newAppearance != NULL) + if(newAppearance != nullptr) { setAppearance(newAppearance); } else { @@ -82,13 +82,13 @@ const SharedObjectTemplate * StaticObject::getDefaultSharedTemplate(void) const { static const ConstCharCrcLowerString templateName("object/static/base/shared_static_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "StaticObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -101,10 +101,10 @@ static const ConstCharCrcLowerString templateName("object/static/base/shared_sta */ void StaticObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // StaticObject::removeDefaultTemplate diff --git a/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp index ab9526b4..b9f4cad8 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp @@ -27,10 +27,10 @@ TangibleConditionObserver::TangibleConditionObserver(TangibleObject const *who, TangibleConditionObserver::~TangibleConditionObserver() { - if (m_tangibleObject != NULL) + if (m_tangibleObject != nullptr) { const CreatureObject * creature = m_tangibleObject->asCreatureObject(); - if (creature != NULL) + if (creature != nullptr) { int currentCondition = creature->getCondition(); if ((m_oldCondition & TangibleObject::C_hibernating) != 0 && (currentCondition & TangibleObject::C_hibernating) == 0) @@ -50,8 +50,8 @@ TangibleConditionObserver::~TangibleConditionObserver() if ((wasInvulnerable != isInvulnerable) && !m_tangibleObject->getObservers().empty()) { // did the object's "pvp sync" status change because of the invulnerability change? - bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), wasInvulnerable, (m_tangibleObject->asCreatureObject() != NULL), m_tangibleObject->getPvpFaction()); - bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), isInvulnerable, (m_tangibleObject->asCreatureObject() != NULL), m_tangibleObject->getPvpFaction()); + bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), wasInvulnerable, (m_tangibleObject->asCreatureObject() != nullptr), m_tangibleObject->getPvpFaction()); + bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), isInvulnerable, (m_tangibleObject->asCreatureObject() != nullptr), m_tangibleObject->getPvpFaction()); if (wasPvpSync != isPvpSync) { diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index 196f9ce9..3602f9a6 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -354,13 +354,13 @@ static const std::string NOMOVE_SCRIPT = "item.special.nomove"; static const std::string OBJVAR_DECLINE_DUEL = "decline_duel"; -const SharedObjectTemplate * TangibleObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * TangibleObject::m_defaultSharedTemplate = nullptr; //----------------------------------------------------------------------- TangibleObject::TangibleObject(const ServerTangibleObjectTemplate* newTemplate) : ServerObject(newTemplate), - m_combatData(NULL), + m_combatData(nullptr), m_pvpType(), m_pvpMercenaryType(PvpType_Neutral), m_pvpFutureType(-1), @@ -392,7 +392,7 @@ TangibleObject::TangibleObject(const ServerTangibleObjectTemplate* newTemplate) m_accessList(), m_guildAccessList(), m_effectsMap(), - m_npcConversation(NULL), + m_npcConversation(nullptr), m_conversations() { WARNING_STRICT_FATAL(!getSharedTemplate(), ("Tried to create a TANGIBLE %s object without a shared template!\n", newTemplate->DataResource::getName())); @@ -469,7 +469,7 @@ TangibleObject::TangibleObject(const ServerTangibleObjectTemplate* newTemplate) { Appearance * newAppearance = AppearanceTemplateList::createAppearance(appearanceString.c_str()); - if(newAppearance != NULL) + if(newAppearance != nullptr) { setAppearance(newAppearance); } else { @@ -522,11 +522,11 @@ TangibleObject::~TangibleObject() //-- This must be the first line in the destructor to invalidate any watchers watching this object nullWatchers(); - if (getSynchronizedUi() != NULL) + if (getSynchronizedUi() != nullptr) { CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync != NULL) + if (sync != nullptr) { if (isAuthoritative() && isCraftingTool()) { @@ -561,7 +561,7 @@ TangibleObject::~TangibleObject() CombatTracker::removeDefender(this); - if (m_combatData != NULL) + if (m_combatData != nullptr) { if (isAuthoritative()) { @@ -598,16 +598,16 @@ TangibleObject::~TangibleObject() } delete m_combatData; - m_combatData = NULL; + m_combatData = nullptr; if (!isPlayerControlled()) ObjectTracker::removeCombatAI(); } - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { delete m_npcConversation; - m_npcConversation = NULL; + m_npcConversation = nullptr; } ObjectTracker::removeTangible(); @@ -625,7 +625,7 @@ void TangibleObject::initializeFirstTimeObject() // set up armor from the template const ServerTangibleObjectTemplate * newTemplate = safe_cast< const ServerTangibleObjectTemplate *>(getObjectTemplate()); - if (newTemplate != NULL) + if (newTemplate != nullptr) { setInvulnerable(newTemplate->getInvulnerable()); @@ -634,7 +634,7 @@ void TangibleObject::initializeFirstTimeObject() initializeVisibility(); const ServerArmorTemplate * armorTemplate = newTemplate->getArmor(); - if (armorTemplate != NULL) + if (armorTemplate != nullptr) { int const rating = static_cast(armorTemplate->getRating()); if ( rating < static_cast(ServerArmorTemplate::AR_armorNone) @@ -729,7 +729,7 @@ void TangibleObject::endBaselines() // check for existence of objvar to enable/disable m_logCommandEnqueue CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { queue->setLogCommandEnqueue(getObjVars().hasItem("debuggingLogCommandEnqueue")); } @@ -781,7 +781,7 @@ void TangibleObject::onLoadedFromDatabase() params.addParam(prototypeId, "prototype"); ScriptDictionaryPtr dictionary; getScriptObject()->makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), @@ -973,16 +973,16 @@ TangibleObject * TangibleObject::getTangibleObject(NetworkId const & networkId) TangibleObject * TangibleObject::asTangibleObject(Object * object) { - ServerObject * serverObject = (object != NULL) ? object->asServerObject() : NULL; - return (serverObject != NULL) ? serverObject->asTangibleObject() : NULL; + ServerObject * serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + return (serverObject != nullptr) ? serverObject->asTangibleObject() : nullptr; } //----------------------------------------------------------------------- TangibleObject const * TangibleObject::asTangibleObject(Object const * object) { - ServerObject const * serverObject = (object != NULL) ? object->asServerObject() : NULL; - return (serverObject != NULL) ? serverObject->asTangibleObject() : NULL; + ServerObject const * serverObject = (object != nullptr) ? object->asServerObject() : nullptr; + return (serverObject != nullptr) ? serverObject->asTangibleObject() : nullptr; } //----------------------------------------------------------------------- @@ -1010,13 +1010,13 @@ const SharedObjectTemplate * TangibleObject::getDefaultSharedTemplate(void) cons { static const ConstCharCrcLowerString templateName("object/tangible/base/shared_tangible_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "TangibleObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -1029,10 +1029,10 @@ static const ConstCharCrcLowerString templateName("object/tangible/base/shared_t */ void TangibleObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // TangibleObject::removeDefaultTemplate @@ -1184,7 +1184,7 @@ void TangibleObject::appearanceDataModified(const std::string& value) void TangibleObject::getEquippedItems(uint32 combatBone, std::vector &items) const { SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) return; std::vector itemIds; @@ -1194,10 +1194,10 @@ void TangibleObject::getEquippedItems(uint32 combatBone, std::vector(object); - if (item != NULL) + if (item != nullptr) items.push_back(item); } } @@ -1219,7 +1219,7 @@ TangibleObject * TangibleObject::getRandomEquippedItem(uint32 combatBone) const if (items.empty()) { - return NULL; + return nullptr; } int index = Random::random(0, items.size() - 1); @@ -1401,17 +1401,17 @@ void TangibleObject::conclude() PROFILER_AUTO_BLOCK_DEFINE("TangibleObject::conclude"); // if we are a crafting tool, conclude our prototype and manf schematic - if (getSynchronizedUi() != NULL) + if (getSynchronizedUi() != nullptr) { const CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync != NULL) + if (sync != nullptr) { Object * object = sync->getPrototype().getObject(); - if (object != NULL) + if (object != nullptr) object->conclude(); object = sync->getManfSchematic().getObject(); - if (object != NULL) + if (object != nullptr) object->conclude(); } } @@ -1683,12 +1683,12 @@ void TangibleObject::setPvpMercenaryFaction(Pvp::FactionId factionId, Pvp::PvpTy { if (PvpData::isImperialFactionId(m_pvpMercenaryFaction.get())) { - IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingImperial", static_cast(::time(NULL)))); + IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingImperial", static_cast(::time(nullptr)))); removeObjVarItem("factionalHelper.timeStopHelpingRebel"); } else if (PvpData::isRebelFactionId(m_pvpMercenaryFaction.get())) { - IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingRebel", static_cast(::time(NULL)))); + IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingRebel", static_cast(::time(nullptr)))); removeObjVarItem("factionalHelper.timeStopHelpingImperial"); } } @@ -1821,11 +1821,11 @@ void TangibleObject::onPermanentlyDestroyed() if (isCraftingTool()) { ServerObject * owner = ServerWorld::findObjectByNetworkId(getOwnerId()); - if (owner != NULL && owner->asCreatureObject() != NULL) + if (owner != nullptr && owner->asCreatureObject() != nullptr) { PlayerObject * player = PlayerCreatureController::getPlayerObject( owner->asCreatureObject()); - if (player != NULL && player->isCrafting() && player->getCraftingTool() == getNetworkId()) + if (player != nullptr && player->isCrafting() && player->getCraftingTool() == getNetworkId()) player->stopCrafting(false); } } @@ -1942,11 +1942,11 @@ bool TangibleObject::onContainerAboutToTransfer(ServerObject * destination, Serv } } } - if (destination != NULL && getObjVars().hasItem(OBJVAR_BIO_LINK_ID)) + if (destination != nullptr && getObjVars().hasItem(OBJVAR_BIO_LINK_ID)) { // if this item is bio-linked and a player is trying to equip it, make // sure the link id matches the player's id - if (destination->asCreatureObject() != NULL) + if (destination->asCreatureObject() != nullptr) { // allow holograms to have biolinked items transferred to them int hologramVal = 0; @@ -2058,7 +2058,7 @@ Footprint *TangibleObject::getFootprint() if (property) return property->getFootprint(); else - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -2069,7 +2069,7 @@ Footprint const *TangibleObject::getFootprint() const if (property) return property->getFootprint(); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2151,9 +2151,9 @@ int TangibleObject::alterHitPoints(int delta, bool ignoreInvulnerable, #ifdef _DEBUG char debugBuffer[1024]; const char * craftedString = ""; - Client *client = NULL; + Client *client = nullptr; ServerObject * sourceObject = safe_cast(NetworkIdManager::getObjectById(source)); - if (source != NetworkId::cms_invalid && sourceObject != NULL) + if (source != NetworkId::cms_invalid && sourceObject != nullptr) client = sourceObject->getClient(); #endif @@ -2171,7 +2171,7 @@ int TangibleObject::alterHitPoints(int delta, bool ignoreInvulnerable, "from %d to %d\n", craftedString, getNetworkId().getValueString().c_str(), totalHitPoints, m_damageTaken.get(), totalDamageTaken); DEBUG_REPORT_LOG (true, ("%s", debugBuffer)); - if (source != NetworkId::cms_invalid && client != NULL) + if (source != NetworkId::cms_invalid && client != nullptr) ConsoleMgr::broadcastString(debugBuffer, client); } #endif @@ -2200,7 +2200,7 @@ int TangibleObject::alterHitPoints(int delta, bool ignoreInvulnerable, snprintf(debugBuffer, sizeof(debugBuffer), "%s object %s has been " "disabled\n", craftedString, getNetworkId().getValueString().c_str()); DEBUG_REPORT_LOG (true, ("%s", debugBuffer)); - if (source != NetworkId::cms_invalid && client != NULL) + if (source != NetworkId::cms_invalid && client != nullptr) ConsoleMgr::broadcastString(debugBuffer, client); } #endif @@ -2283,7 +2283,7 @@ void TangibleObject::updatePlanetServerInternal(const bool forceUpdate) const if ((forceUpdate || getPositionChanged()) && (!ContainerInterface::getContainedByObject(*this) || getInterestRadius() > 0)) { Object const * const topmostContainer = ContainerInterface::getTopmostContainer(*this); - FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned NULL\n",getNetworkId().getValueString().c_str())); + FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned nullptr\n",getNetworkId().getValueString().c_str())); Vector const &position = topmostContainer->getPosition_p(); UpdateObjectOnPlanetMessage const msg( @@ -2313,7 +2313,7 @@ void TangibleObject::updatePlanetServerInternal(const bool forceUpdate) const */ void TangibleObject::clearDamageList(void) { - if (m_combatData != NULL) + if (m_combatData != nullptr) { m_combatData->defenseData.damage.clear(); } @@ -2442,7 +2442,7 @@ void TangibleObject::clearHateList() } else { - sendControllerMessageToAuthServer(CM_clearHateList, NULL); + sendControllerMessageToAuthServer(CM_clearHateList, nullptr); } } @@ -2476,7 +2476,7 @@ bool TangibleObject::isHatedBy(Object * const object) bool result = false; TangibleObject * const hatedByTangibleObject = TangibleObject::asTangibleObject(object); - if (hatedByTangibleObject != NULL) + if (hatedByTangibleObject != nullptr) { HateList::UnSortedList const & hateList = hatedByTangibleObject->getUnSortedHateList(); @@ -2534,7 +2534,7 @@ void TangibleObject::resetHateTimer() } else { - sendControllerMessageToAuthServer(CM_resetHateTimer, NULL); + sendControllerMessageToAuthServer(CM_resetHateTimer, nullptr); } } @@ -2625,11 +2625,11 @@ void TangibleObject::setCraftedId(const NetworkId & id) IGNORE_RETURN(setObjVarItem(OBJVAR_CRAFTING_SCHEMATIC, id)); setCondition(C_crafted); const Object * object = NetworkIdManager::getObjectById(id); - if (object != NULL) + if (object != nullptr) { const ManufactureSchematicObject * schematic = dynamic_cast< const ManufactureSchematicObject *>(object); - if (schematic != NULL) + if (schematic != nullptr) m_sourceDraftSchematic = schematic->getDraftSchematic(); } } @@ -2869,7 +2869,7 @@ bool TangibleObject::startCraftingSession(CreatureObject & crafter) UNREF(myIdString); // needed for release mode PlayerObject * crafterPlayer = PlayerCreatureController::getPlayerObject(&crafter); - if (crafterPlayer == NULL) + if (crafterPlayer == nullptr) return false; // make sure we are a crafting tool @@ -2909,7 +2909,7 @@ bool TangibleObject::startCraftingSession(CreatureObject & crafter) // make sure the output slot is empty SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this); - if (slotContainer == NULL) + if (slotContainer == nullptr) { DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString)); return false; @@ -2938,7 +2938,7 @@ bool TangibleObject::startCraftingSession(CreatureObject & crafter) for (iter = schematics.begin(); iter != schematics.end(); ++iter) { const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic((*iter).first.first); - if (schematic != NULL && ((myType & ServerObjectTemplate::CT_genericItem) != 0 || + if (schematic != nullptr && ((myType & ServerObjectTemplate::CT_genericItem) != 0 || ((schematic->getCategory() & myType) != 0))) { // make sure the player has all the skill commands needed for the @@ -3068,11 +3068,11 @@ bool TangibleObject::stopCraftingSession(void) bool TangibleObject::isIngredientInHopper(const NetworkId & ingredientId) const { ServerObject const * const hopper = getIngredientHopper(); - if (hopper == NULL) + if (hopper == nullptr) return false; Object const * const ingredient = CachedNetworkId(ingredientId).getObject(); - if (ingredient == NULL) + if (ingredient == nullptr) return false; return ContainerInterface::isNestedWithin(*ingredient, getNetworkId()); @@ -3098,15 +3098,15 @@ static const SlotId hopperSlotId(SlotIdManager::findSlotId(INGREDIENT_HOPPER_SLO { DEBUG_WARNING(true, ("Tried to get input hopper for non-crafting station " "object %s", myIdString)); - return NULL; + return nullptr; } // get the ingredient hopper SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); - if (container == NULL) + if (container == nullptr) { DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString)); - return NULL; + return nullptr; } Container::ContainerErrorCode tmp = Container::CEC_Success; Container::ContainedItem hopperId = container->getObjectInSlot(hopperSlotId, tmp); @@ -3114,14 +3114,14 @@ static const SlotId hopperSlotId(SlotIdManager::findSlotId(INGREDIENT_HOPPER_SLO { DEBUG_WARNING(true, ("Crafting tool %s does not have a ingredient " "hopper!", myIdString)); - return NULL; + return nullptr; } ServerObject * hopper = safe_cast(hopperId.getObject()); - if (hopper == NULL) + if (hopper == nullptr) { DEBUG_WARNING(true, ("Can't find object for ingredient hopper id %s", hopperId.getValueString().c_str())); - return NULL; + return nullptr; } return hopper; @@ -3150,16 +3150,16 @@ static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME // get output slot SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this); - if (slotContainer == NULL) + if (slotContainer == nullptr) { DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString)); return false; } // make sure the transferer is in the final stage of crafting - if (transferer == NULL) + if (transferer == nullptr) { - DEBUG_WARNING(true, ("addObjectToOutputSlot, NULL transferer")); + DEBUG_WARNING(true, ("addObjectToOutputSlot, nullptr transferer")); return false; } NetworkId crafterVarId(NetworkId::cms_invalid); @@ -3178,14 +3178,14 @@ static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME return false; } CreatureObject const * const creatureTransferer = transferer->asCreatureObject(); - if (creatureTransferer == NULL) + if (creatureTransferer == nullptr) { DEBUG_WARNING(true, ("addObjectToOutputSlot, transferer %s is not a " "creature", transferer->getNetworkId().getValueString().c_str())); return false; } PlayerObject const * const creaturePlayer = PlayerCreatureController::getPlayerObject(creatureTransferer); - if (creaturePlayer == NULL) + if (creaturePlayer == nullptr) return false; if (creaturePlayer->getCraftingStage() != Crafting::CS_finish) @@ -3197,11 +3197,11 @@ static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME } // if the object is our prototype, clear the prototype - if (getSynchronizedUi() != NULL) + if (getSynchronizedUi() != nullptr) { CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync != NULL) + if (sync != nullptr) { if (sync->getPrototype() == object.getNetworkId()) { @@ -3212,7 +3212,7 @@ static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME // put the object in the slot Container::ContainerErrorCode tmp = Container::CEC_Success; - if (!ContainerInterface::transferItemToSlottedContainer(*this, object, outputSlotId, NULL, tmp)) + if (!ContainerInterface::transferItemToSlottedContainer(*this, object, outputSlotId, nullptr, tmp)) { DEBUG_WARNING(true, ("Failed to transfer object %s to crafting " "tool %s", object.getNetworkId().getValueString().c_str(), @@ -3250,7 +3250,7 @@ ManufactureSchematicObject * TangibleObject::getCraftingManufactureSchematic(voi { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); - return NULL; + return nullptr; } SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this); @@ -3264,7 +3264,7 @@ ManufactureSchematicObject * TangibleObject::getCraftingManufactureSchematic(voi else { DEBUG_WARNING(true, ("ManufactureSchematicObject doesn't have a slotted container.")); - return NULL; + return nullptr; } } // TangibleObject::getCraftingManufactureSchematic @@ -3282,17 +3282,17 @@ ManufactureSchematicObject * TangibleObject::removeCraftingManufactureSchematic( UNREF(myIdString); // needed for release mode // make sure we are a crafting tool - if (!isCraftingTool() || getSynchronizedUi() == NULL) + if (!isCraftingTool() || getSynchronizedUi() == nullptr) { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); - return NULL; + return nullptr; } CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync == NULL) - return NULL; + if (sync == nullptr) + return nullptr; ManufactureSchematicObject * schematic = safe_cast( sync->getManfSchematic().getObject()); @@ -3320,7 +3320,7 @@ void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject UNREF(myIdString); // needed for release mode // make sure we are a crafting tool - if (!isCraftingTool() || getSynchronizedUi() == NULL) + if (!isCraftingTool() || getSynchronizedUi() == nullptr) { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); @@ -3329,7 +3329,7 @@ void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync == NULL) + if (sync == nullptr) return; // see if there is already a schematic object set @@ -3339,7 +3339,7 @@ void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject // remove the old schematic ServerObject * object = safe_cast(schematicId.getObject()); - if (object == NULL) + if (object == nullptr) { if (schematicId != NetworkId::cms_invalid) { @@ -3358,13 +3358,13 @@ void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject // the schematic isn't in the world or in a container, so we need to // tell the client about it int stationBonus = 0; - ServerObject * crafter = NULL; + ServerObject * crafter = nullptr; NetworkId crafterId; if (getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER,crafterId)) { crafter = safe_cast(NetworkIdManager::getObjectById(crafterId)); } - if (crafter != NULL) + if (crafter != nullptr) { sync->setManfSchematic(CachedNetworkId(schematic), CachedNetworkId(*crafter), true); @@ -3373,7 +3373,7 @@ void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject // it has const PlayerObject * player = PlayerCreatureController::getPlayerObject( crafter->asCreatureObject()); - if (player != NULL && player->getCraftingStation().getObject() != NULL) + if (player != nullptr && player->getCraftingStation().getObject() != nullptr) { player->getCraftingStation().getObject()->asServerObject()-> getObjVars().getItem(OBJVAR_CRAFTING_STATIONMOD, stationBonus); @@ -3436,11 +3436,11 @@ void TangibleObject::clearCraftingManufactureSchematic(void) } // get our ui - CraftingToolSyncUi * sync = NULL; - if (getSynchronizedUi() != NULL) + CraftingToolSyncUi * sync = nullptr; + if (getSynchronizedUi() != nullptr) sync = dynamic_cast(getSynchronizedUi()); - if (schematicId == CachedNetworkId::cms_cachedInvalid && sync == NULL) + if (schematicId == CachedNetworkId::cms_cachedInvalid && sync == nullptr) { // no schematic return; @@ -3448,7 +3448,7 @@ void TangibleObject::clearCraftingManufactureSchematic(void) if (schematicId == CachedNetworkId::cms_invalid) schematicId = sync->getManfSchematic(); - else if (sync != NULL && sync->getManfSchematic() != CachedNetworkId::cms_invalid && + else if (sync != nullptr && sync->getManfSchematic() != CachedNetworkId::cms_invalid && schematicId != sync->getManfSchematic()) { WARNING(true, ("TangibleObject::clearCraftingManufactureSchematic " @@ -3456,7 +3456,7 @@ void TangibleObject::clearCraftingManufactureSchematic(void) "in its ui!!!", getNetworkId().getValueString().c_str(), schematicId.getValueString().c_str(), sync->getManfSchematic().getValueString().c_str())); - if (schematicId.getObject() != NULL) + if (schematicId.getObject() != nullptr) { schematicId.getObject()->asServerObject()->permanentlyDestroy( DeleteReasons::Consumed); @@ -3472,9 +3472,9 @@ void TangibleObject::clearCraftingManufactureSchematic(void) } // get the schematic - ManufactureSchematicObject * manfSchematic = NULL; + ManufactureSchematicObject * manfSchematic = nullptr; ServerObject * object = safe_cast(schematicId.getObject()); - if (object == NULL && schematicId != CachedNetworkId::cms_invalid) + if (object == nullptr && schematicId != CachedNetworkId::cms_invalid) { WARNING_STRICT_FATAL(true, ("Can't find object for manufactring schematic " "id %s", schematicId.getValueString().c_str())); @@ -3482,7 +3482,7 @@ void TangibleObject::clearCraftingManufactureSchematic(void) else manfSchematic = safe_cast(object); - if (manfSchematic != NULL) + if (manfSchematic != nullptr) { NetworkId crafterId; if (getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER,crafterId)) @@ -3492,7 +3492,7 @@ void TangibleObject::clearCraftingManufactureSchematic(void) // in the tool CreatureObject * const crafter = dynamic_cast(NetworkIdManager::getObjectById(crafterId)); PlayerObject * const crafterPlayer = PlayerCreatureController::getPlayerObject(crafter); - if (!manfSchematic->mustDestroyIngredients() || (crafterPlayer != NULL && + if (!manfSchematic->mustDestroyIngredients() || (crafterPlayer != nullptr && crafterPlayer->getCraftingStage() == Crafting::CS_assembly)) { crafterPlayer->setAllowEmptySlot(true); @@ -3526,9 +3526,9 @@ void TangibleObject::clearCraftingManufactureSchematic(void) } } - if (sync != NULL) + if (sync != nullptr) sync->setManfSchematic(CachedNetworkId::cms_cachedInvalid, CachedNetworkId::cms_cachedInvalid, true); - if (object != NULL) + if (object != nullptr) { object->permanentlyDestroy(DeleteReasons::Consumed); } @@ -3554,17 +3554,17 @@ ServerObject * TangibleObject::getCraftingPrototype(void) const UNREF(myIdString); // needed for release mode // make sure we are a crafting tool - if (!isCraftingTool() || getSynchronizedUi() == NULL) + if (!isCraftingTool() || getSynchronizedUi() == nullptr) { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); - return NULL; + return nullptr; } const CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync == NULL) - return NULL; + if (sync == nullptr) + return nullptr; return safe_cast(sync->getPrototype().getObject()); } // TangibleObject::getCraftingPrototype @@ -3586,7 +3586,7 @@ void TangibleObject::setCraftingPrototype(ServerObject & prototype) UNREF(myIdString); // needed for release mode // make sure we are a crafting tool - if (!isCraftingTool() || getSynchronizedUi() == NULL) + if (!isCraftingTool() || getSynchronizedUi() == nullptr) { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); @@ -3595,7 +3595,7 @@ void TangibleObject::setCraftingPrototype(ServerObject & prototype) CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync == NULL) + if (sync == nullptr) return; // see if there is already a prototype object set @@ -3605,7 +3605,7 @@ void TangibleObject::setCraftingPrototype(ServerObject & prototype) // remove the old prototype ServerObject * object = safe_cast(prototypeId.getObject()); - if (object == NULL) + if (object == nullptr) { if (prototypeId != NetworkId::cms_invalid) { @@ -3624,7 +3624,7 @@ void TangibleObject::setCraftingPrototype(ServerObject & prototype) // about it Container::ContainerErrorCode tmp = Container::CEC_Success; if (!ContainerInterface::transferItemToSlottedContainer(*this, prototype, - getCraftingPrototypeSlotId(), NULL, tmp)) + getCraftingPrototypeSlotId(), nullptr, tmp)) { // see if there is something in the slot, and delete it if there is bool failed = true; @@ -3634,13 +3634,13 @@ void TangibleObject::setCraftingPrototype(ServerObject & prototype) getCraftingPrototypeSlotId(), tmp); if (oldItem != prototype.getNetworkId()) { - if (oldItem.getObject() != NULL) + if (oldItem.getObject() != nullptr) { safe_cast(oldItem.getObject())->permanentlyDestroy( DeleteReasons::Consumed); // try the transfer again if (ContainerInterface::transferItemToSlottedContainer(*this, - prototype, getCraftingPrototypeSlotId(), NULL, tmp)) + prototype, getCraftingPrototypeSlotId(), nullptr, tmp)) { failed = false; } @@ -3678,7 +3678,7 @@ void TangibleObject::clearCraftingPrototype(void) UNREF(myIdString); // needed for release mode // make sure we are a crafting tool - if (!isCraftingTool() || getSynchronizedUi() == NULL) + if (!isCraftingTool() || getSynchronizedUi() == nullptr) { DEBUG_WARNING(true, ("Tried to get non-crafting tool " "object %s", myIdString)); @@ -3687,12 +3687,12 @@ void TangibleObject::clearCraftingPrototype(void) CraftingToolSyncUi * sync = dynamic_cast( getSynchronizedUi()); - if (sync == NULL) + if (sync == nullptr) return; const CachedNetworkId & prototypeId = sync->getPrototype(); ServerObject * object = safe_cast(prototypeId.getObject()); - if (object != NULL) + if (object != nullptr) { object->permanentlyDestroy(DeleteReasons::Consumed); } @@ -3704,7 +3704,7 @@ void TangibleObject::clearCraftingPrototype(void) Container::ContainerErrorCode error; const Container::ContainedItem & contents = container->getObjectInSlot( getCraftingPrototypeSlotId(), error); - if (contents.getObject() != NULL) + if (contents.getObject() != nullptr) { safe_cast(contents.getObject())->permanentlyDestroy( DeleteReasons::Consumed); @@ -3856,7 +3856,7 @@ void TangibleObject::forceExecuteCommand(Command const &command, NetworkId const { CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { queue->cancelCurrentCommand(); } @@ -3948,7 +3948,7 @@ void TangibleObject::initializeVisibility() { const ServerTangibleObjectTemplate * myTemplate = safe_cast< const ServerTangibleObjectTemplate *>(getObjectTemplate()); - if (myTemplate != NULL) + if (myTemplate != nullptr) { bool visible = false; for (size_t i = 0; i < myTemplate->getVisibleFlagsCount(); ++i) @@ -3999,7 +3999,7 @@ void TangibleObject::visibilityDataModified() { // show the object const TriggerVolume * triggerVolume = getTriggerVolume(NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName); - if (triggerVolume != NULL) + if (triggerVolume != nullptr) { std::vector observers; ServerWorld::findPlayerCreaturesInRange(getPosition_w(), triggerVolume->getRadius(), observers); @@ -4017,7 +4017,7 @@ void TangibleObject::visibilityDataModified() if (isVisible() && isHidden() && !m_passiveRevealPlayerCharacter.empty()) { const TriggerVolume * triggerVolume = getTriggerVolume(NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName); - if (triggerVolume != NULL) + if (triggerVolume != nullptr) { std::vector possibleObservers; ServerWorld::findPlayerCreaturesInRange(getPosition_w(), triggerVolume->getRadius(), possibleObservers); @@ -4077,10 +4077,10 @@ bool TangibleObject::isVisibleOnClient(Client const &client) const // if the client's character is grouped with the the owner, then he can see it. const CreatureObject * owner = safe_cast(ownerId.getObject()); - if (owner != NULL) + if (owner != nullptr) { const GroupObject * group = owner->getGroup(); - if (group != NULL) + if (group != nullptr) { if (group->isGroupMember(characterObject->getNetworkId())) return true; @@ -4129,7 +4129,7 @@ static int datatable_max_encumbrance_col = -1; encumbrances.clear(); DataTable * dt = DataTableManager::getTable(DATATABLE_ARMOR, true); - if (dt == NULL) + if (dt == nullptr) return false; else if (datatable_type_col == -1) { @@ -4690,7 +4690,7 @@ void TangibleObject::getAttributesForCraftingTool (AttributeVector & data) const // see if there is an object in the output hopper bool hasPrototype = false; SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this); - if (slotContainer != NULL) + if (slotContainer != nullptr) { Container::ContainerErrorCode tmp = Container::CEC_Success; if (slotContainer->getObjectInSlot(outputSlotId, tmp) != Container::ContainedItem::cms_invalid) @@ -5121,7 +5121,7 @@ void TangibleObject::handleCMessageTo(const MessageToPayload &message) std::string const & sceneId = ServerWorld::getSceneId(); Vector const &position = findPosition_w(); Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(sceneId, position.x, position.z); - if (region != NULL) + if (region != nullptr) regionName = Unicode::wideToNarrow(region->getName()); int const cityId = CityInterface::getCityAtLocation(sceneId, static_cast(position.x), static_cast(position.z), 0); @@ -5248,7 +5248,7 @@ void TangibleObject::setInvulnerable(bool invulnerable) GameScriptObject * const gameScriptObject = getScriptObject(); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams scriptParams; scriptParams.addParam(hasCondition(ServerTangibleObjectTemplate::C_invulnerable)); @@ -5451,8 +5451,8 @@ void TangibleObject::setPvpable(bool pvpable) if ((oldPvpable != pvpable) && !getObservers().empty()) { // did the object's "pvp sync" status change because of the Pvpable change? - bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!oldPvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != NULL), getPvpFaction()); - bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!pvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != NULL), getPvpFaction()); + bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!oldPvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != nullptr), getPvpFaction()); + bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!pvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != nullptr), getPvpFaction()); if (wasPvpSync != isPvpSync) { @@ -5557,8 +5557,8 @@ void TangibleObject::AppearanceDataCallback::modified(TangibleObject &target, co target.appearanceDataModified(value); Object * const objectContainer = ContainerInterface::getContainedByObject(target); - ServerObject * const serverContainer = objectContainer ? objectContainer->asServerObject() : NULL; - TangibleObject * const tangibleContainer = serverContainer ? serverContainer->asTangibleObject() : NULL; + ServerObject * const serverContainer = objectContainer ? objectContainer->asServerObject() : nullptr; + TangibleObject * const tangibleContainer = serverContainer ? serverContainer->asTangibleObject() : nullptr; if(tangibleContainer) tangibleContainer->onContainedItemAppearanceDataModified(target, oldValue, value); } @@ -5802,7 +5802,7 @@ void TangibleObject::commandQueueEnqueue(Command const &command, NetworkId const else { CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { queue->enqueue(command, targetId, params, sequenceId, clearable, priority); } @@ -5820,7 +5820,7 @@ void TangibleObject::commandQueueRemove(uint32 const sequenceId) else { CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { queue->remove(sequenceId); } @@ -5840,7 +5840,7 @@ void TangibleObject::commandQueueClear() bool TangibleObject::commandQueueHasCommandFromGroup(uint32 groupHash) const { CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { return queue->hasCommandFromGroup(groupHash); } @@ -5852,7 +5852,7 @@ bool TangibleObject::commandQueueHasCommandFromGroup(uint32 groupHash) const void TangibleObject::commandQueueClearCommandsFromGroup(uint32 groupHash, bool force) { CommandQueue * const queue = getCommandQueue(); - if (queue != NULL) + if (queue != nullptr) { queue->clearCommandsFromGroup(groupHash, force); } @@ -5895,12 +5895,12 @@ void TangibleObject::CombatStateChangedCallback::modified(TangibleObject & targe AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(target.getController()); - if (aiCreatureController != NULL) + if (aiCreatureController != nullptr) { aiCreatureController->markCombatStartLocation(); } - if (target.getScriptObject() != NULL) + if (target.getScriptObject() != nullptr) { ScriptParams params; IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_ENTERED_COMBAT, params)); @@ -5926,7 +5926,7 @@ void TangibleObject::CombatStateChangedCallback::modified(TangibleObject & targe target.commandQueueClearCommandsFromGroup(COMMAND_GROUP_COMBAT.getCrc()); - if (target.getScriptObject() != NULL) + if (target.getScriptObject() != nullptr) { ScriptParams params; IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_EXITED_COMBAT, params)); @@ -5985,7 +5985,7 @@ int TangibleObject::getPassiveRevealRange(NetworkId const & target) const void TangibleObject::addPassiveReveal(TangibleObject const & target, int range) { - addPassiveReveal(target.getNetworkId(), range, (NULL != PlayerCreatureController::getPlayerObject(target.asCreatureObject()))); + addPassiveReveal(target.getNetworkId(), range, (nullptr != PlayerCreatureController::getPlayerObject(target.asCreatureObject()))); } //---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.h b/engine/server/library/serverGame/src/shared/object/TangibleObject.h index c05f93bf..f4b80817 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.h +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.h @@ -777,7 +777,7 @@ inline uint32 TangibleObject::getSourceDraftSchematic() const inline void TangibleObject::createCombatData() { - if (m_combatData == NULL) + if (m_combatData == nullptr) { m_combatData = new CombatEngineData::CombatData; } diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp index 7f7aafe5..fbf7881e 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp @@ -47,7 +47,7 @@ bool TangibleObject::startNpcConversation(TangibleObject & npc, const std::strin return false; // test if already in a conversation - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) return false; if (starter == NpcConversationData::CS_Player) @@ -120,7 +120,7 @@ void TangibleObject::endNpcConversation() { if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { // I am a player, end my conversation @@ -128,7 +128,7 @@ void TangibleObject::endNpcConversation() if (isPlayerControlled()) { TangibleObject * const npc = safe_cast(m_npcConversation->getNPC().getObject()); - if (npc != NULL) + if (npc != nullptr) { // trigger OnEndNpcConversation ScriptParams params; @@ -157,13 +157,13 @@ void TangibleObject::endNpcConversation() } else { - WARNING(true,("TangibleObject::endNpcConversation: creature %s has a non-null m_npcConversation pointer %p but is not a player-controlled object!", + WARNING(true,("TangibleObject::endNpcConversation: creature %s has a non-nullptr m_npcConversation pointer %p but is not a player-controlled object!", getNetworkId().getValueString().c_str(), m_npcConversation)); m_conversations.clear(); } delete m_npcConversation; - m_npcConversation = NULL; + m_npcConversation = nullptr; } else { @@ -182,14 +182,14 @@ void TangibleObject::endNpcConversation() { NetworkId const & networkId = *it; TangibleObject * const player = dynamic_cast(NetworkIdManager::getObjectById(networkId)); - if (player != NULL) + if (player != nullptr) player->endNpcConversation(); } } } else { - WARNING(true,("TangibleObject::endNpcConversation: creature %s has a null m_npcConversation pointer but is a player-controlled object!", + WARNING(true,("TangibleObject::endNpcConversation: creature %s has a nullptr m_npcConversation pointer but is a player-controlled object!", getNetworkId().getValueString().c_str())); m_conversations.clear(); } @@ -217,7 +217,7 @@ void TangibleObject::endNpcConversation() */ void TangibleObject::clearNpcConversation() { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { m_npcConversation->clearResponses(); } @@ -234,7 +234,7 @@ void TangibleObject::sendNpcConversationMessage(const StringId & stringId, const { if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { NpcConversation::Response response; response.stringId = stringId; @@ -262,7 +262,7 @@ bool TangibleObject::addNpcConversationResponse(const StringId & stringId, const { if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { NpcConversation::Response response; response.stringId = stringId; @@ -293,7 +293,7 @@ bool TangibleObject::removeNpcConversationResponse(const StringId & stringId, co bool result = false; if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { NpcConversation::Response response; response.stringId = stringId; @@ -319,7 +319,7 @@ void TangibleObject::sendNpcConversationResponses() { if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { m_npcConversation->sendResponses(); } @@ -327,7 +327,7 @@ void TangibleObject::sendNpcConversationResponses() else { Controller * const controller = NON_NULL(getController()); - controller->appendMessage(CM_sendNpcConversationResponses, 0.0f, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER); + controller->appendMessage(CM_sendNpcConversationResponses, 0.0f, nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER); } } @@ -342,10 +342,10 @@ void TangibleObject::respondToNpc(int responseIndex) { if (isAuthoritative()) { - if (m_npcConversation != NULL) + if (m_npcConversation != nullptr) { TangibleObject * const npc = safe_cast(m_npcConversation->getNPC().getObject()); - if (npc == NULL) + if (npc == nullptr) { endNpcConversation(); return; @@ -363,7 +363,7 @@ void TangibleObject::respondToNpc(int responseIndex) { Controller * const controller = getController(); if (controller) - controller->appendMessage(CM_npcConversationSelect, static_cast(responseIndex), NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER); + controller->appendMessage(CM_npcConversationSelect, static_cast(responseIndex), nullptr, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER); } } @@ -374,7 +374,7 @@ void TangibleObject::handlePlayerResponseToNpcConversation(const std::string & c if (isAuthoritative()) { TangibleObject * const playerObject = safe_cast(NetworkIdManager::getObjectById(player)); - if (playerObject != NULL) + if (playerObject != nullptr) { // trigger OnNpcConversationResponse ScriptParams params; diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp index 6b283f5e..6e6b8d6c 100755 --- a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp @@ -20,7 +20,7 @@ // objvars for dynamic regions const static std::string OBJVAR_DYNAMIC_REGION("dynamic_region"); -const SharedObjectTemplate * UniverseObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * UniverseObject::m_defaultSharedTemplate = nullptr; // ====================================================================== @@ -56,13 +56,13 @@ const SharedObjectTemplate * UniverseObject::getDefaultSharedTemplate(void) cons { static const ConstCharCrcLowerString templateName("object/universe/base/shared_universe_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "UniverseObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -75,10 +75,10 @@ static const ConstCharCrcLowerString templateName("object/universe/base/shared_u */ void UniverseObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // UniverseObject::removeDefaultTemplate diff --git a/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp index 320d0c0b..b19b7cfb 100755 --- a/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp @@ -25,7 +25,7 @@ //---------------------------------------------------------------------- -const SharedObjectTemplate * WeaponObject::m_defaultSharedTemplate = NULL; +const SharedObjectTemplate * WeaponObject::m_defaultSharedTemplate = nullptr; static const std::string OBJVAR_CERTIFICATION = "weapon.strCertUsed"; @@ -68,13 +68,13 @@ const SharedObjectTemplate * WeaponObject::getDefaultSharedTemplate(void) const { static const ConstCharCrcLowerString templateName("object/weapon/base/shared_weapon_default.iff"); - if (m_defaultSharedTemplate == NULL) + if (m_defaultSharedTemplate == nullptr) { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); - WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create " + WARNING_STRICT_FATAL(m_defaultSharedTemplate == nullptr, ("Cannot create " "default shared object template %s", templateName.getString())); - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) ExitChain::add (removeDefaultTemplate, "WeaponObject::removeDefaultTemplate"); } return m_defaultSharedTemplate; @@ -87,10 +87,10 @@ static const ConstCharCrcLowerString templateName("object/weapon/base/shared_wea */ void WeaponObject::removeDefaultTemplate(void) { - if (m_defaultSharedTemplate != NULL) + if (m_defaultSharedTemplate != nullptr) { m_defaultSharedTemplate->releaseReference(); - m_defaultSharedTemplate = NULL; + m_defaultSharedTemplate = nullptr; } } // WeaponObject::removeDefaultTemplate @@ -323,7 +323,7 @@ WeaponObject * WeaponObject::getWeaponObject(NetworkId const & networkId) { ServerObject * serverObject = ServerObject::getServerObject(networkId); - return (serverObject != NULL) ? serverObject->asWeaponObject() : NULL; + return (serverObject != nullptr) ? serverObject->asWeaponObject() : nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp index a387b645..2e429325 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp @@ -53,7 +53,7 @@ ServerArmorTemplate::~ServerArmorTemplate() for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_specialProtection.clear(); } @@ -105,10 +105,10 @@ Tag ServerArmorTemplate::getTemplateVersion(void) const */ Tag ServerArmorTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerArmorTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerArmorTemplate::getHighestTemplateVersion @@ -122,33 +122,33 @@ ServerArmorTemplate::ArmorRating testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getRating(true); #endif } if (!m_rating.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rating in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter rating has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter rating has not been defined in template %s!", DataResource::getName())); return base->getRating(); } } ArmorRating value = static_cast(m_rating.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -164,26 +164,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIntegrity(true); #endif } if (!m_integrity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); return base->getIntegrity(); } } @@ -193,9 +193,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getIntegrity(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -212,7 +212,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -228,26 +228,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIntegrityMin(true); #endif } if (!m_integrity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); return base->getIntegrityMin(); } } @@ -257,9 +257,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getIntegrityMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -276,7 +276,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -292,26 +292,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIntegrityMax(true); #endif } if (!m_integrity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter integrity has not been defined in template %s!", DataResource::getName())); return base->getIntegrityMax(); } } @@ -321,9 +321,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getIntegrityMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -340,7 +340,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -356,26 +356,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectiveness(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectiveness(); } } @@ -385,9 +385,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectiveness(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -404,7 +404,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -420,26 +420,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectivenessMin(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectivenessMin(); } } @@ -449,9 +449,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectivenessMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -468,7 +468,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -484,26 +484,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectivenessMax(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectivenessMax(); } } @@ -513,9 +513,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectivenessMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -532,7 +532,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -542,28 +542,28 @@ UNREF(testData); void ServerArmorTemplate::getSpecialProtection(SpecialProtection &data, int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_specialProtectionLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); base->getSpecialProtection(data, index); return; } } - if (m_specialProtectionAppend && base != NULL) + if (m_specialProtectionAppend && base != nullptr) { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) @@ -585,28 +585,28 @@ void ServerArmorTemplate::getSpecialProtection(SpecialProtection &data, int inde void ServerArmorTemplate::getSpecialProtectionMin(SpecialProtection &data, int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_specialProtectionLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); base->getSpecialProtectionMin(data, index); return; } } - if (m_specialProtectionAppend && base != NULL) + if (m_specialProtectionAppend && base != nullptr) { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) @@ -628,28 +628,28 @@ void ServerArmorTemplate::getSpecialProtectionMin(SpecialProtection &data, int i void ServerArmorTemplate::getSpecialProtectionMax(SpecialProtection &data, int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_specialProtectionLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName())); base->getSpecialProtectionMax(data, index); return; } } - if (m_specialProtectionAppend && base != NULL) + if (m_specialProtectionAppend && base != nullptr) { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) @@ -673,20 +673,20 @@ size_t ServerArmorTemplate::getSpecialProtectionCount(void) const { if (!m_specialProtectionLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerArmorTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getSpecialProtectionCount(); } size_t count = m_specialProtection.size(); // if we are extending our base template, add it's count - if (m_specialProtectionAppend && m_baseData != NULL) + if (m_specialProtectionAppend && m_baseData != nullptr) { const ServerArmorTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getSpecialProtectionCount(); } @@ -701,26 +701,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVulnerability(true); #endif } if (!m_vulnerability.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); return base->getVulnerability(); } } @@ -730,9 +730,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVulnerability(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -749,7 +749,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -765,26 +765,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVulnerabilityMin(true); #endif } if (!m_vulnerability.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); return base->getVulnerabilityMin(); } } @@ -794,9 +794,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVulnerabilityMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -813,7 +813,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -829,26 +829,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVulnerabilityMax(true); #endif } if (!m_vulnerability.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName())); return base->getVulnerabilityMax(); } } @@ -858,9 +858,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVulnerabilityMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -877,7 +877,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -887,8 +887,8 @@ UNREF(testData); int ServerArmorTemplate::getEncumbrance(int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -896,14 +896,14 @@ int ServerArmorTemplate::getEncumbrance(int index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_encumbrance[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); return base->getEncumbrance(index); } } @@ -913,9 +913,9 @@ int ServerArmorTemplate::getEncumbrance(int index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEncumbrance(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -936,8 +936,8 @@ int ServerArmorTemplate::getEncumbrance(int index) const int ServerArmorTemplate::getEncumbranceMin(int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -945,14 +945,14 @@ int ServerArmorTemplate::getEncumbranceMin(int index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_encumbrance[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); return base->getEncumbranceMin(index); } } @@ -962,9 +962,9 @@ int ServerArmorTemplate::getEncumbranceMin(int index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEncumbranceMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -985,8 +985,8 @@ int ServerArmorTemplate::getEncumbranceMin(int index) const int ServerArmorTemplate::getEncumbranceMax(int index) const { - const ServerArmorTemplate * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -994,14 +994,14 @@ int ServerArmorTemplate::getEncumbranceMax(int index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_encumbrance[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName())); return base->getEncumbranceMax(index); } } @@ -1011,9 +1011,9 @@ int ServerArmorTemplate::getEncumbranceMax(int index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEncumbranceMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1074,12 +1074,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -1114,7 +1114,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_specialProtection.clear(); m_specialProtectionAppend = file.read_bool8(); @@ -1205,33 +1205,33 @@ ServerArmorTemplate::DamageType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getType(true); #endif } if (!m_type.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter type in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter type has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter type has not been defined in template %s!", DataResource::getName())); return base->getType(versionOk); } } DamageType value = static_cast(m_type.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1247,26 +1247,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate::_SpecialProtection * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate::_SpecialProtection * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectiveness(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectiveness(versionOk); } } @@ -1276,9 +1276,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectiveness(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1295,7 +1295,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1311,26 +1311,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate::_SpecialProtection * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate::_SpecialProtection * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectivenessMin(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectivenessMin(versionOk); } } @@ -1340,9 +1340,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectivenessMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1359,7 +1359,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1375,26 +1375,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerArmorTemplate::_SpecialProtection * base = NULL; - if (m_baseData != NULL) + const ServerArmorTemplate::_SpecialProtection * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEffectivenessMax(true); #endif } if (!m_effectiveness.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName())); return base->getEffectivenessMax(versionOk); } } @@ -1404,9 +1404,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getEffectivenessMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1423,7 +1423,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp index 98360e9b..0a63ff2d 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag ServerBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion @@ -150,12 +150,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp index 57086652..57d3ab90 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerBuildingObjectTemplate::getTemplateVersion(void) const */ Tag ServerBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBuildingObjectTemplate::getHighestTemplateVersion @@ -120,26 +120,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaintenanceCost(true); #endif } if (!m_maintenanceCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); return base->getMaintenanceCost(); } } @@ -149,9 +149,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaintenanceCost(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -168,7 +168,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -184,26 +184,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaintenanceCostMin(true); #endif } if (!m_maintenanceCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); return base->getMaintenanceCostMin(); } } @@ -213,9 +213,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaintenanceCostMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -232,7 +232,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -248,26 +248,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaintenanceCostMax(true); #endif } if (!m_maintenanceCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName())); return base->getMaintenanceCostMax(); } } @@ -277,9 +277,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaintenanceCostMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -296,7 +296,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -312,33 +312,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIsPublic(true); #endif } if (!m_isPublic.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter isPublic in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter isPublic has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter isPublic has not been defined in template %s!", DataResource::getName())); return base->getIsPublic(); } } bool value = m_isPublic.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -386,12 +386,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp index 5a35a6f9..0c39dc7c 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp @@ -99,10 +99,10 @@ Tag ServerCellObjectTemplate::getTemplateVersion(void) const */ Tag ServerCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCellObjectTemplate::getHighestTemplateVersion @@ -155,12 +155,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp index 0b59a960..0f328d56 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerCityObjectTemplate::getTemplateVersion(void) const */ Tag ServerCityObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCityObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCityObjectTemplate::getHighestTemplateVersion @@ -151,12 +151,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp index 6daeee45..ba882146 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp @@ -84,10 +84,10 @@ Tag ServerConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag ServerConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerConstructionContractObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp index babf8d0a..f1be807d 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp @@ -56,7 +56,7 @@ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attribMods.clear(); } @@ -108,10 +108,10 @@ Tag ServerCreatureObjectTemplate::getTemplateVersion(void) const */ Tag ServerCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCreatureObjectTemplate::getHighestTemplateVersion @@ -129,32 +129,32 @@ Object * ServerCreatureObjectTemplate::createObject(void) const //@BEGIN TFD const ServerWeaponObjectTemplate * ServerCreatureObjectTemplate::getDefaultWeapon() const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_defaultWeapon.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultWeapon in template %s", DataResource::getName())); - return NULL; + return nullptr; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultWeapon has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultWeapon has not been defined in template %s!", DataResource::getName())); return base->getDefaultWeapon(); } } - const ServerWeaponObjectTemplate * returnValue = NULL; + const ServerWeaponObjectTemplate * returnValue = nullptr; const std::string & templateName = m_defaultWeapon.getValue(); if (!templateName.empty()) { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == NULL) + if (returnValue == nullptr) WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; @@ -162,8 +162,8 @@ const ServerWeaponObjectTemplate * ServerCreatureObjectTemplate::getDefaultWeapo int ServerCreatureObjectTemplate::getAttributes(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -171,14 +171,14 @@ int ServerCreatureObjectTemplate::getAttributes(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getAttributes(index); } } @@ -188,9 +188,9 @@ int ServerCreatureObjectTemplate::getAttributes(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttributes(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -211,8 +211,8 @@ int ServerCreatureObjectTemplate::getAttributes(Attributes index) const int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -220,14 +220,14 @@ int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getAttributesMin(index); } } @@ -237,9 +237,9 @@ int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttributesMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -260,8 +260,8 @@ int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -269,14 +269,14 @@ int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getAttributesMax(index); } } @@ -286,9 +286,9 @@ int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttributesMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -309,8 +309,8 @@ int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -318,14 +318,14 @@ int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMinAttributes(index); } } @@ -335,9 +335,9 @@ int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinAttributes(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -358,8 +358,8 @@ int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -367,14 +367,14 @@ int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMinAttributesMin(index); } } @@ -384,9 +384,9 @@ int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinAttributesMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -407,8 +407,8 @@ int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -416,14 +416,14 @@ int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMinAttributesMax(index); } } @@ -433,9 +433,9 @@ int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinAttributesMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -456,8 +456,8 @@ int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -465,14 +465,14 @@ int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMaxAttributes(index); } } @@ -482,9 +482,9 @@ int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxAttributes(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -505,8 +505,8 @@ int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -514,14 +514,14 @@ int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMaxAttributesMin(index); } } @@ -531,9 +531,9 @@ int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxAttributesMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -554,8 +554,8 @@ int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -563,14 +563,14 @@ int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) getMaxAttributesMax(index); } } @@ -580,9 +580,9 @@ int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxAttributesMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -609,26 +609,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDrainModifier(true); #endif } if (!m_minDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMinDrainModifier(); } } @@ -638,9 +638,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDrainModifier(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -657,7 +657,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -673,26 +673,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDrainModifierMin(true); #endif } if (!m_minDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMinDrainModifierMin(); } } @@ -702,9 +702,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDrainModifierMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -721,7 +721,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -737,26 +737,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDrainModifierMax(true); #endif } if (!m_minDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMinDrainModifierMax(); } } @@ -766,9 +766,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDrainModifierMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -785,7 +785,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -801,26 +801,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDrainModifier(true); #endif } if (!m_maxDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxDrainModifier(); } } @@ -830,9 +830,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDrainModifier(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -849,7 +849,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -865,26 +865,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDrainModifierMin(true); #endif } if (!m_maxDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxDrainModifierMin(); } } @@ -894,9 +894,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDrainModifierMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -913,7 +913,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -929,26 +929,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDrainModifierMax(true); #endif } if (!m_maxDrainModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxDrainModifierMax(); } } @@ -958,9 +958,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDrainModifierMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -977,7 +977,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -993,26 +993,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinFaucetModifier(true); #endif } if (!m_minFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMinFaucetModifier(); } } @@ -1022,9 +1022,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinFaucetModifier(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1041,7 +1041,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1057,26 +1057,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinFaucetModifierMin(true); #endif } if (!m_minFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMinFaucetModifierMin(); } } @@ -1086,9 +1086,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinFaucetModifierMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1105,7 +1105,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1121,26 +1121,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinFaucetModifierMax(true); #endif } if (!m_minFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMinFaucetModifierMax(); } } @@ -1150,9 +1150,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinFaucetModifierMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1169,7 +1169,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1185,26 +1185,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFaucetModifier(true); #endif } if (!m_maxFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxFaucetModifier(); } } @@ -1214,9 +1214,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFaucetModifier(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1233,7 +1233,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1249,26 +1249,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFaucetModifierMin(true); #endif } if (!m_maxFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxFaucetModifierMin(); } } @@ -1278,9 +1278,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFaucetModifierMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1297,7 +1297,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1313,26 +1313,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFaucetModifierMax(true); #endif } if (!m_maxFaucetModifier.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName())); return base->getMaxFaucetModifierMax(); } } @@ -1342,9 +1342,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFaucetModifierMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1361,7 +1361,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1371,28 +1371,28 @@ UNREF(testData); void ServerCreatureObjectTemplate::getAttribMods(AttribMod &data, int index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attribModsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); base->getAttribMods(data, index); return; } } - if (m_attribModsAppend && base != NULL) + if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); if (static_cast(index) < baseCount) @@ -1417,28 +1417,28 @@ void ServerCreatureObjectTemplate::getAttribMods(AttribMod &data, int index) con void ServerCreatureObjectTemplate::getAttribModsMin(AttribMod &data, int index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attribModsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); base->getAttribModsMin(data, index); return; } } - if (m_attribModsAppend && base != NULL) + if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); if (static_cast(index) < baseCount) @@ -1463,28 +1463,28 @@ void ServerCreatureObjectTemplate::getAttribModsMin(AttribMod &data, int index) void ServerCreatureObjectTemplate::getAttribModsMax(AttribMod &data, int index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attribModsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName())); base->getAttribModsMax(data, index); return; } } - if (m_attribModsAppend && base != NULL) + if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); if (static_cast(index) < baseCount) @@ -1511,20 +1511,20 @@ size_t ServerCreatureObjectTemplate::getAttribModsCount(void) const { if (!m_attribModsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getAttribModsCount(); } size_t count = m_attribMods.size(); // if we are extending our base template, add it's count - if (m_attribModsAppend && m_baseData != NULL) + if (m_attribModsAppend && m_baseData != nullptr) { const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getAttribModsCount(); } @@ -1539,26 +1539,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getShockWounds(true); #endif } if (!m_shockWounds.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); return base->getShockWounds(); } } @@ -1568,9 +1568,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getShockWounds(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1587,7 +1587,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1603,26 +1603,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getShockWoundsMin(true); #endif } if (!m_shockWounds.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); return base->getShockWoundsMin(); } } @@ -1632,9 +1632,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getShockWoundsMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1651,7 +1651,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1667,26 +1667,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getShockWoundsMax(true); #endif } if (!m_shockWounds.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName())); return base->getShockWoundsMax(); } } @@ -1696,9 +1696,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getShockWoundsMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1715,7 +1715,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1731,33 +1731,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCanCreateAvatar(true); #endif } if (!m_canCreateAvatar.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter canCreateAvatar in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter canCreateAvatar has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter canCreateAvatar has not been defined in template %s!", DataResource::getName())); return base->getCanCreateAvatar(); } } bool value = m_canCreateAvatar.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1773,33 +1773,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNameGeneratorType(true); #endif } if (!m_nameGeneratorType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter nameGeneratorType in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter nameGeneratorType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter nameGeneratorType has not been defined in template %s!", DataResource::getName())); return base->getNameGeneratorType(); } } const std::string & value = m_nameGeneratorType.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1815,26 +1815,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getApproachTriggerRange(true); #endif } if (!m_approachTriggerRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); return base->getApproachTriggerRange(); } } @@ -1844,9 +1844,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getApproachTriggerRange(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1863,7 +1863,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1879,26 +1879,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getApproachTriggerRangeMin(true); #endif } if (!m_approachTriggerRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); return base->getApproachTriggerRangeMin(); } } @@ -1908,9 +1908,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getApproachTriggerRangeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1927,7 +1927,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1943,26 +1943,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getApproachTriggerRangeMax(true); #endif } if (!m_approachTriggerRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName())); return base->getApproachTriggerRangeMax(); } } @@ -1972,9 +1972,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getApproachTriggerRangeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1991,7 +1991,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2001,8 +2001,8 @@ UNREF(testData); float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2010,14 +2010,14 @@ float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMaxMentalStates(index); } } @@ -2027,9 +2027,9 @@ float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxMentalStates(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2050,8 +2050,8 @@ float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2059,14 +2059,14 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) co DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMaxMentalStatesMin(index); } } @@ -2076,9 +2076,9 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) co if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxMentalStatesMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2099,8 +2099,8 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) co float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2108,14 +2108,14 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) co DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMaxMentalStatesMax(index); } } @@ -2125,9 +2125,9 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) co if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxMentalStatesMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2148,8 +2148,8 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) co float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2157,14 +2157,14 @@ float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) con DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMentalStatesDecay(index); } } @@ -2174,9 +2174,9 @@ float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) con if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMentalStatesDecay(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2197,8 +2197,8 @@ float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) con float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2206,14 +2206,14 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMentalStatesDecayMin(index); } } @@ -2223,9 +2223,9 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMentalStatesDecayMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2246,8 +2246,8 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) const { - const ServerCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2255,14 +2255,14 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) getMentalStatesDecayMax(index); } } @@ -2272,9 +2272,9 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMentalStatesDecayMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2344,12 +2344,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -2430,7 +2430,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attribMods.clear(); m_attribModsAppend = file.read_bool8(); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp index 6ed8a518..5cfd4169 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp @@ -58,7 +58,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); } @@ -67,7 +67,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_skillCommands.clear(); } @@ -76,7 +76,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_manufactureScripts.clear(); } @@ -128,10 +128,10 @@ Tag ServerDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -152,7 +152,7 @@ Object * ServerDraftSchematicObjectTemplate::createObject(void) const WARNING(true, ("Trying to create a draft schematic %s outside the draft " "schematic factory!\n", getName())); - return NULL; + return nullptr; } // ServerDraftSchematicObjectTemplate::createObject /** @@ -188,33 +188,33 @@ ServerDraftSchematicObjectTemplate::CraftingType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCategory(true); #endif } if (!m_category.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter category in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter category has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter category has not been defined in template %s!", DataResource::getName())); return base->getCategory(); } } CraftingType value = static_cast(m_category.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -224,86 +224,86 @@ UNREF(testData); const ServerObjectTemplate * ServerDraftSchematicObjectTemplate::getCraftedObjectTemplate() const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_craftedObjectTemplate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter craftedObjectTemplate in template %s", DataResource::getName())); - return NULL; + return nullptr; } else { - DEBUG_FATAL(base == NULL, ("Template parameter craftedObjectTemplate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter craftedObjectTemplate has not been defined in template %s!", DataResource::getName())); return base->getCraftedObjectTemplate(); } } const std::string & templateName = m_craftedObjectTemplate.getValue(); const ServerObjectTemplate * returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == NULL) + if (returnValue == nullptr) WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); return returnValue; } // ServerDraftSchematicObjectTemplate::getCraftedObjectTemplate const ServerFactoryObjectTemplate * ServerDraftSchematicObjectTemplate::getCrateObjectTemplate() const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_crateObjectTemplate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter crateObjectTemplate in template %s", DataResource::getName())); - return NULL; + return nullptr; } else { - DEBUG_FATAL(base == NULL, ("Template parameter crateObjectTemplate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter crateObjectTemplate has not been defined in template %s!", DataResource::getName())); return base->getCrateObjectTemplate(); } } const std::string & templateName = m_crateObjectTemplate.getValue(); const ServerFactoryObjectTemplate * returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == NULL) + if (returnValue == nullptr) WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); return returnValue; } // ServerDraftSchematicObjectTemplate::getCrateObjectTemplate void ServerDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int index) const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlots(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -335,28 +335,28 @@ void ServerDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde void ServerDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int index) const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlotsMin(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -388,28 +388,28 @@ void ServerDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i void ServerDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int index) const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlotsMax(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -443,20 +443,20 @@ size_t ServerDraftSchematicObjectTemplate::getSlotsCount(void) const { if (!m_slotsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getSlotsCount(); } size_t count = m_slots.size(); // if we are extending our base template, add it's count - if (m_slotsAppend && m_baseData != NULL) + if (m_slotsAppend && m_baseData != nullptr) { const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getSlotsCount(); } @@ -465,27 +465,27 @@ size_t ServerDraftSchematicObjectTemplate::getSlotsCount(void) const const std::string & ServerDraftSchematicObjectTemplate::getSkillCommands(int index) const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_skillCommandsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter skillCommands in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter skillCommands has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter skillCommands has not been defined in template %s!", DataResource::getName())); return base->getSkillCommands(index); } } - if (m_skillCommandsAppend && base != NULL) + if (m_skillCommandsAppend && base != nullptr) { int baseCount = base->getSkillCommandsCount(); if (index < baseCount) @@ -502,20 +502,20 @@ size_t ServerDraftSchematicObjectTemplate::getSkillCommandsCount(void) const { if (!m_skillCommandsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getSkillCommandsCount(); } size_t count = m_skillCommands.size(); // if we are extending our base template, add it's count - if (m_skillCommandsAppend && m_baseData != NULL) + if (m_skillCommandsAppend && m_baseData != nullptr) { const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getSkillCommandsCount(); } @@ -530,33 +530,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDestroyIngredients(true); #endif } if (!m_destroyIngredients.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter destroyIngredients in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter destroyIngredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter destroyIngredients has not been defined in template %s!", DataResource::getName())); return base->getDestroyIngredients(); } } bool value = m_destroyIngredients.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -566,27 +566,27 @@ UNREF(testData); const std::string & ServerDraftSchematicObjectTemplate::getManufactureScripts(int index) const { - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_manufactureScriptsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureScripts in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter manufactureScripts has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter manufactureScripts has not been defined in template %s!", DataResource::getName())); return base->getManufactureScripts(index); } } - if (m_manufactureScriptsAppend && base != NULL) + if (m_manufactureScriptsAppend && base != nullptr) { int baseCount = base->getManufactureScriptsCount(); if (index < baseCount) @@ -603,20 +603,20 @@ size_t ServerDraftSchematicObjectTemplate::getManufactureScriptsCount(void) cons { if (!m_manufactureScriptsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getManufactureScriptsCount(); } size_t count = m_manufactureScripts.size(); // if we are extending our base template, add it's count - if (m_manufactureScriptsAppend && m_baseData != NULL) + if (m_manufactureScriptsAppend && m_baseData != nullptr) { const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getManufactureScriptsCount(); } @@ -631,26 +631,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemsPerContainer(true); #endif } if (!m_itemsPerContainer.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); return base->getItemsPerContainer(); } } @@ -660,9 +660,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemsPerContainer(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -679,7 +679,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -695,26 +695,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemsPerContainerMin(true); #endif } if (!m_itemsPerContainer.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); return base->getItemsPerContainerMin(); } } @@ -724,9 +724,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemsPerContainerMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -743,7 +743,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -759,26 +759,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemsPerContainerMax(true); #endif } if (!m_itemsPerContainer.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName())); return base->getItemsPerContainerMax(); } } @@ -788,9 +788,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemsPerContainerMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -807,7 +807,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -823,26 +823,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getManufactureTime(true); #endif } if (!m_manufactureTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); return base->getManufactureTime(); } } @@ -852,9 +852,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getManufactureTime(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -871,7 +871,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -887,26 +887,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getManufactureTimeMin(true); #endif } if (!m_manufactureTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); return base->getManufactureTimeMin(); } } @@ -916,9 +916,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getManufactureTimeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -935,7 +935,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -951,26 +951,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getManufactureTimeMax(true); #endif } if (!m_manufactureTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName())); return base->getManufactureTimeMax(); } } @@ -980,9 +980,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getManufactureTimeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -999,7 +999,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1015,26 +1015,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPrototypeTime(true); #endif } if (!m_prototypeTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); return base->getPrototypeTime(); } } @@ -1044,9 +1044,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getPrototypeTime(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1063,7 +1063,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1079,26 +1079,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPrototypeTimeMin(true); #endif } if (!m_prototypeTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); return base->getPrototypeTimeMin(); } } @@ -1108,9 +1108,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getPrototypeTimeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1127,7 +1127,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1143,26 +1143,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPrototypeTimeMax(true); #endif } if (!m_prototypeTime.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName())); return base->getPrototypeTimeMax(); } } @@ -1172,9 +1172,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getPrototypeTimeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1191,7 +1191,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1244,12 +1244,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -1284,7 +1284,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); m_slotsAppend = file.read_bool8(); @@ -1303,7 +1303,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_skillCommands.clear(); m_skillCommandsAppend = file.read_bool8(); @@ -1324,7 +1324,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_manufactureScripts.clear(); m_manufactureScriptsAppend = file.read_bool8(); @@ -1376,7 +1376,7 @@ ServerDraftSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot() for (iter = m_options.begin(); iter != m_options.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_options.clear(); } @@ -1418,33 +1418,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getOptional(true); #endif } if (!m_optional.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter optional in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter optional has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter optional has not been defined in template %s!", DataResource::getName())); return base->getOptional(versionOk); } } bool value = m_optional.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1460,33 +1460,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1496,28 +1496,28 @@ UNREF(testData); void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions(Ingredient &data, int index, bool versionOk) const { - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_optionsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter options has not been defined in template %s!", DataResource::getName())); base->getOptions(data, index, versionOk); return; } } - if (m_optionsAppend && base != NULL) + if (m_optionsAppend && base != nullptr) { int baseCount = base->getOptionsCount(); if (index < baseCount) @@ -1547,28 +1547,28 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions(Ingredient void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin(Ingredient &data, int index, bool versionOk) const { - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_optionsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter options has not been defined in template %s!", DataResource::getName())); base->getOptionsMin(data, index, versionOk); return; } } - if (m_optionsAppend && base != NULL) + if (m_optionsAppend && base != nullptr) { int baseCount = base->getOptionsCount(); if (index < baseCount) @@ -1598,28 +1598,28 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin(Ingredie void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMax(Ingredient &data, int index, bool versionOk) const { - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_optionsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter options has not been defined in template %s!", DataResource::getName())); base->getOptionsMax(data, index, versionOk); return; } } - if (m_optionsAppend && base != NULL) + if (m_optionsAppend && base != nullptr) { int baseCount = base->getOptionsCount(); if (index < baseCount) @@ -1651,20 +1651,20 @@ size_t ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsCount(void { if (!m_optionsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getOptionsCount(); } size_t count = m_options.size(); // if we are extending our base template, add it's count - if (m_optionsAppend && m_baseData != NULL) + if (m_optionsAppend && m_baseData != nullptr) { const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getOptionsCount(); } @@ -1679,33 +1679,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getOptionalSkillCommand(true); #endif } if (!m_optionalSkillCommand.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter optionalSkillCommand in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter optionalSkillCommand has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter optionalSkillCommand has not been defined in template %s!", DataResource::getName())); return base->getOptionalSkillCommand(versionOk); } } const std::string & value = m_optionalSkillCommand.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1721,26 +1721,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexity(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexity(versionOk); } } @@ -1750,9 +1750,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexity(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1769,7 +1769,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1785,26 +1785,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMin(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMin(versionOk); } } @@ -1814,9 +1814,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1833,7 +1833,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1849,26 +1849,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMax(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMax(versionOk); } } @@ -1878,9 +1878,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1897,7 +1897,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1913,33 +1913,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAppearance(true); #endif } if (!m_appearance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter appearance in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter appearance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter appearance has not been defined in template %s!", DataResource::getName())); return base->getAppearance(versionOk); } } const std::string & value = m_appearance.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1992,7 +1992,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_options.begin(); iter != m_options.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_options.clear(); m_optionsAppend = file.read_bool8(); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp index 413f930b..21075a19 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerFactoryObjectTemplate::getTemplateVersion(void) const */ Tag ServerFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerFactoryObjectTemplate::getHighestTemplateVersion @@ -149,12 +149,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp index 9f63f2db..d026ef4f 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerGroupObjectTemplate::getTemplateVersion(void) const */ Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGroupObjectTemplate::getHighestTemplateVersion @@ -151,12 +151,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp index 00d26b3f..d7a9bcef 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerGuildObjectTemplate::getTemplateVersion(void) const */ Tag ServerGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGuildObjectTemplate::getHighestTemplateVersion @@ -151,12 +151,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp index a226afb3..16bf4a31 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerHarvesterInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerHarvesterInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion @@ -120,26 +120,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxExtractionRate(true); #endif } if (!m_maxExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getMaxExtractionRate(); } } @@ -149,9 +149,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxExtractionRate(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -168,7 +168,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -184,26 +184,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxExtractionRateMin(true); #endif } if (!m_maxExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getMaxExtractionRateMin(); } } @@ -213,9 +213,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxExtractionRateMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -232,7 +232,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -248,26 +248,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxExtractionRateMax(true); #endif } if (!m_maxExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getMaxExtractionRateMax(); } } @@ -277,9 +277,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxExtractionRateMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -296,7 +296,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -312,26 +312,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentExtractionRate(true); #endif } if (!m_currentExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getCurrentExtractionRate(); } } @@ -341,9 +341,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentExtractionRate(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -360,7 +360,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -376,26 +376,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentExtractionRateMin(true); #endif } if (!m_currentExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getCurrentExtractionRateMin(); } } @@ -405,9 +405,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentExtractionRateMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -424,7 +424,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -440,26 +440,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentExtractionRateMax(true); #endif } if (!m_currentExtractionRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName())); return base->getCurrentExtractionRateMax(); } } @@ -469,9 +469,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentExtractionRateMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -488,7 +488,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -504,26 +504,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHopperSize(true); #endif } if (!m_maxHopperSize.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); return base->getMaxHopperSize(); } } @@ -533,9 +533,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHopperSize(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -552,7 +552,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -568,26 +568,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHopperSizeMin(true); #endif } if (!m_maxHopperSize.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); return base->getMaxHopperSizeMin(); } } @@ -597,9 +597,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHopperSizeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -616,7 +616,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -632,26 +632,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHopperSizeMax(true); #endif } if (!m_maxHopperSize.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName())); return base->getMaxHopperSizeMax(); } } @@ -661,9 +661,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHopperSizeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -680,7 +680,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -696,33 +696,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerHarvesterInstallationObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerHarvesterInstallationObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMasterClassName(true); #endif } if (!m_masterClassName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter masterClassName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter masterClassName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter masterClassName has not been defined in template %s!", DataResource::getName())); return base->getMasterClassName(); } } const std::string & value = m_masterClassName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -774,12 +774,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp index ad1661bb..8bb94ce5 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag ServerInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerInstallationObjectTemplate::getHighestTemplateVersion @@ -150,12 +150,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp index 992bf06d..18cce6b3 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerIntangibleObjectTemplate::getHighestTemplateVersion @@ -120,26 +120,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCount(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCount(); } } @@ -149,9 +149,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCount(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -168,7 +168,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -184,26 +184,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMin(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMin(); } } @@ -213,9 +213,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -232,7 +232,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -248,26 +248,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMax(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMax(); } } @@ -277,9 +277,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -296,7 +296,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -343,12 +343,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -406,7 +406,7 @@ ServerIntangibleObjectTemplate::_Ingredient::~_Ingredient() for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); } @@ -448,33 +448,33 @@ ServerIntangibleObjectTemplate::IngredientType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIngredientType(true); #endif } if (!m_ingredientType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredientType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredientType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredientType has not been defined in template %s!", DataResource::getName())); return base->getIngredientType(versionOk); } } IngredientType value = static_cast(m_ingredientType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -484,28 +484,28 @@ UNREF(testData); void ServerIntangibleObjectTemplate::_Ingredient::getIngredients(SimpleIngredient &data, int index, bool versionOk) const { - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredients(data, index, versionOk); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -528,28 +528,28 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredients(SimpleIngredien void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin(SimpleIngredient &data, int index, bool versionOk) const { - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredientsMin(data, index, versionOk); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -572,28 +572,28 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin(SimpleIngred void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMax(SimpleIngredient &data, int index, bool versionOk) const { - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredientsMax(data, index, versionOk); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -618,20 +618,20 @@ size_t ServerIntangibleObjectTemplate::_Ingredient::getIngredientsCount(void) co { if (!m_ingredientsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerIntangibleObjectTemplate::_Ingredient * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getIngredientsCount(); } size_t count = m_ingredients.size(); // if we are extending our base template, add it's count - if (m_ingredientsAppend && m_baseData != NULL) + if (m_ingredientsAppend && m_baseData != nullptr) { const ServerIntangibleObjectTemplate::_Ingredient * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getIngredientsCount(); } @@ -646,26 +646,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexity(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexity(versionOk); } } @@ -675,9 +675,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexity(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -694,7 +694,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -710,26 +710,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMin(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMin(versionOk); } } @@ -739,9 +739,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -758,7 +758,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -774,26 +774,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMax(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMax(versionOk); } } @@ -803,9 +803,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -822,7 +822,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -838,33 +838,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_Ingredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSkillCommand(true); #endif } if (!m_skillCommand.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter skillCommand in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter skillCommand has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter skillCommand has not been defined in template %s!", DataResource::getName())); return base->getSkillCommand(versionOk); } } const std::string & value = m_skillCommand.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -913,7 +913,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); m_ingredientsAppend = file.read_bool8(); @@ -992,33 +992,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1034,26 +1034,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValue(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValue(versionOk); } } @@ -1063,9 +1063,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1082,7 +1082,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1098,26 +1098,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMin(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMin(versionOk); } } @@ -1127,9 +1127,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1146,7 +1146,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1162,26 +1162,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMax(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMax(versionOk); } } @@ -1191,9 +1191,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1210,7 +1210,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1316,33 +1316,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1358,33 +1358,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getIngredient(true); #endif } if (!m_ingredient.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); return base->getIngredient(versionOk); } } const std::string & value = m_ingredient.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1400,26 +1400,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCount(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCount(versionOk); } } @@ -1429,9 +1429,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCount(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1448,7 +1448,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1464,26 +1464,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMin(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMin(versionOk); } } @@ -1493,9 +1493,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1512,7 +1512,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1528,26 +1528,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL; - if (m_baseData != NULL) + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMax(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMax(versionOk); } } @@ -1557,9 +1557,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1576,7 +1576,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp index 373a81f7..57b4db42 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerManufactureInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerManufactureInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion @@ -149,12 +149,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp index 0f00a74b..3aee1103 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp @@ -54,7 +54,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); } @@ -63,7 +63,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); } @@ -115,17 +115,17 @@ Tag ServerManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion /** * Called when the game tries to create a manf schematic via the default method. - * Manf must be created via a draft schematic, so we always return NULL; + * Manf must be created via a draft schematic, so we always return nullptr; * * @return the object */ @@ -146,17 +146,17 @@ Object * ServerManufactureSchematicObjectTemplate::createObject(const char *cons const ObjectTemplate *const objectTemplate = ObjectTemplateList::fetch(fileName); if (objectTemplate) { - Object * object = NULL; + Object * object = nullptr; const ServerManufactureSchematicObjectTemplate * const manfTemplate = dynamic_cast( objectTemplate); - if (manfTemplate != NULL) + if (manfTemplate != nullptr) object = manfTemplate->createObject(schematic); objectTemplate->releaseReference (); return object; } - return NULL; + return nullptr; } // ServerManufactureSchematicObjectTemplate::createObject /** @@ -178,33 +178,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDraftSchematic(true); #endif } if (!m_draftSchematic.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter draftSchematic in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter draftSchematic has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter draftSchematic has not been defined in template %s!", DataResource::getName())); return base->getDraftSchematic(); } } const std::string & value = m_draftSchematic.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -220,33 +220,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCreator(true); #endif } if (!m_creator.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter creator in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter creator has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter creator has not been defined in template %s!", DataResource::getName())); return base->getCreator(); } } const std::string & value = m_creator.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -256,28 +256,28 @@ UNREF(testData); void ServerManufactureSchematicObjectTemplate::getIngredients(IngredientSlot &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredients(data, index); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -299,28 +299,28 @@ void ServerManufactureSchematicObjectTemplate::getIngredients(IngredientSlot &da void ServerManufactureSchematicObjectTemplate::getIngredientsMin(IngredientSlot &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredientsMin(data, index); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -342,28 +342,28 @@ void ServerManufactureSchematicObjectTemplate::getIngredientsMin(IngredientSlot void ServerManufactureSchematicObjectTemplate::getIngredientsMax(IngredientSlot &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredientsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName())); base->getIngredientsMax(data, index); return; } } - if (m_ingredientsAppend && base != NULL) + if (m_ingredientsAppend && base != nullptr) { int baseCount = base->getIngredientsCount(); if (index < baseCount) @@ -387,20 +387,20 @@ size_t ServerManufactureSchematicObjectTemplate::getIngredientsCount(void) const { if (!m_ingredientsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getIngredientsCount(); } size_t count = m_ingredients.size(); // if we are extending our base template, add it's count - if (m_ingredientsAppend && m_baseData != NULL) + if (m_ingredientsAppend && m_baseData != nullptr) { const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getIngredientsCount(); } @@ -415,26 +415,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemCount(true); #endif } if (!m_itemCount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); return base->getItemCount(); } } @@ -444,9 +444,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemCount(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -463,7 +463,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -479,26 +479,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemCountMin(true); #endif } if (!m_itemCount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); return base->getItemCountMin(); } } @@ -508,9 +508,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemCountMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -527,7 +527,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -543,26 +543,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getItemCountMax(true); #endif } if (!m_itemCount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName())); return base->getItemCountMax(); } } @@ -572,9 +572,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getItemCountMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -591,7 +591,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -601,28 +601,28 @@ UNREF(testData); void ServerManufactureSchematicObjectTemplate::getAttributes(SchematicAttribute &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributes(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -644,28 +644,28 @@ void ServerManufactureSchematicObjectTemplate::getAttributes(SchematicAttribute void ServerManufactureSchematicObjectTemplate::getAttributesMin(SchematicAttribute &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributesMin(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -687,28 +687,28 @@ void ServerManufactureSchematicObjectTemplate::getAttributesMin(SchematicAttribu void ServerManufactureSchematicObjectTemplate::getAttributesMax(SchematicAttribute &data, int index) const { - const ServerManufactureSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributesMax(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -732,20 +732,20 @@ size_t ServerManufactureSchematicObjectTemplate::getAttributesCount(void) const { if (!m_attributesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getAttributesCount(); } size_t count = m_attributes.size(); // if we are extending our base template, add it's count - if (m_attributesAppend && m_baseData != NULL) + if (m_attributesAppend && m_baseData != nullptr) { const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getAttributesCount(); } @@ -793,12 +793,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -831,7 +831,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); m_ingredientsAppend = file.read_bool8(); @@ -852,7 +852,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); m_attributesAppend = file.read_bool8(); @@ -929,33 +929,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -965,22 +965,22 @@ UNREF(testData); void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredient(Ingredient &data, bool versionOk) const { - const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredient.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); base->getIngredient(data, versionOk); return; } @@ -1004,22 +1004,22 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredient(In void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMin(Ingredient &data, bool versionOk) const { - const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredient.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); base->getIngredientMin(data, versionOk); return; } @@ -1043,22 +1043,22 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMin void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax(Ingredient &data, bool versionOk) const { - const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_ingredient.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName())); base->getIngredientMax(data, versionOk); return; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp index 66ee2754..9417be44 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerMissionObjectTemplate::getTemplateVersion(void) const */ Tag ServerMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerMissionObjectTemplate::getHighestTemplateVersion @@ -149,12 +149,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp index 78810b18..5e11c2e7 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -32,7 +32,7 @@ const TriggerVolumeData DefaultTriggerVolumeData; bool ServerObjectTemplate::ms_allowDefaultTemplateParams = true; typedef std::unordered_map > XP_MAP; -static XP_MAP * XpMap = NULL; +static XP_MAP * XpMap = nullptr; /** @@ -74,7 +74,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_scripts.clear(); } @@ -83,7 +83,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_visibleFlags.clear(); } @@ -92,7 +92,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_deleteFlags.clear(); } @@ -101,7 +101,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_moveFlags.clear(); } @@ -110,7 +110,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_contents.begin(); iter != m_contents.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_contents.clear(); } @@ -119,7 +119,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_xpPoints.clear(); } @@ -133,7 +133,7 @@ void ServerObjectTemplate::registerMe(void) { ObjectTemplateList::registerTemplate(ServerObjectTemplate_tag, create); - if (XpMap == NULL) + if (XpMap == nullptr) { XpMap = new XP_MAP(); ExitChain::add(exit, "ServerObjectTemplate"); @@ -208,10 +208,10 @@ void ServerObjectTemplate::registerMe(void) */ void ServerObjectTemplate::exit() { - if (XpMap != NULL) + if (XpMap != nullptr) { delete XpMap; - XpMap = NULL; + XpMap = nullptr; } } // ServerObjectTemplate::exit @@ -252,10 +252,10 @@ Tag ServerObjectTemplate::getTemplateVersion(void) const */ Tag ServerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerObjectTemplate::getHighestTemplateVersion @@ -287,7 +287,7 @@ const std::string & ServerObjectTemplate::getXpString(XpTypes type) { static const std::string emptyString; - if (XpMap != NULL) + if (XpMap != nullptr) { XP_MAP::const_iterator result = XpMap->find(type); if (result != XpMap->end()) @@ -371,33 +371,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSharedTemplate(true); #endif } if (!m_sharedTemplate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter sharedTemplate in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter sharedTemplate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter sharedTemplate has not been defined in template %s!", DataResource::getName())); return base->getSharedTemplate(); } } const std::string & value = m_sharedTemplate.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -407,27 +407,27 @@ UNREF(testData); const std::string & ServerObjectTemplate::getScripts(int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_scriptsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scripts in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scripts has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scripts has not been defined in template %s!", DataResource::getName())); return base->getScripts(index); } } - if (m_scriptsAppend && base != NULL) + if (m_scriptsAppend && base != nullptr) { int baseCount = base->getScriptsCount(); if (index < baseCount) @@ -444,20 +444,20 @@ size_t ServerObjectTemplate::getScriptsCount(void) const { if (!m_scriptsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getScriptsCount(); } size_t count = m_scripts.size(); // if we are extending our base template, add it's count - if (m_scriptsAppend && m_baseData != NULL) + if (m_scriptsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getScriptsCount(); } @@ -466,28 +466,28 @@ size_t ServerObjectTemplate::getScriptsCount(void) const void ServerObjectTemplate::getObjvars(DynamicVariableList &list) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_objvars.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter objvars in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter objvars has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter objvars has not been defined in template %s!", DataResource::getName())); base->getObjvars(list); return; } } - if (m_objvars.isExtendingBaseList() && base != NULL) + if (m_objvars.isExtendingBaseList() && base != nullptr) base->getObjvars(list); m_objvars.getDynamicVariableList(list); } // ServerObjectTemplate::getObjvars @@ -500,26 +500,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVolume(true); #endif } if (!m_volume.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); return base->getVolume(); } } @@ -529,9 +529,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVolume(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -548,7 +548,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -564,26 +564,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVolumeMin(true); #endif } if (!m_volume.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); return base->getVolumeMin(); } } @@ -593,9 +593,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVolumeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -612,7 +612,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -628,26 +628,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVolumeMax(true); #endif } if (!m_volume.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter volume has not been defined in template %s!", DataResource::getName())); return base->getVolumeMax(); } } @@ -657,9 +657,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getVolumeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -676,7 +676,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -686,27 +686,27 @@ UNREF(testData); ServerObjectTemplate::VisibleFlags ServerObjectTemplate::getVisibleFlags(int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_visibleFlagsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter visibleFlags in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter visibleFlags has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter visibleFlags has not been defined in template %s!", DataResource::getName())); return base->getVisibleFlags(index); } } - if (m_visibleFlagsAppend && base != NULL) + if (m_visibleFlagsAppend && base != nullptr) { int baseCount = base->getVisibleFlagsCount(); if (index < baseCount) @@ -722,20 +722,20 @@ size_t ServerObjectTemplate::getVisibleFlagsCount(void) const { if (!m_visibleFlagsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getVisibleFlagsCount(); } size_t count = m_visibleFlags.size(); // if we are extending our base template, add it's count - if (m_visibleFlagsAppend && m_baseData != NULL) + if (m_visibleFlagsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getVisibleFlagsCount(); } @@ -744,27 +744,27 @@ size_t ServerObjectTemplate::getVisibleFlagsCount(void) const ServerObjectTemplate::DeleteFlags ServerObjectTemplate::getDeleteFlags(int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_deleteFlagsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter deleteFlags in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter deleteFlags has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter deleteFlags has not been defined in template %s!", DataResource::getName())); return base->getDeleteFlags(index); } } - if (m_deleteFlagsAppend && base != NULL) + if (m_deleteFlagsAppend && base != nullptr) { int baseCount = base->getDeleteFlagsCount(); if (index < baseCount) @@ -780,20 +780,20 @@ size_t ServerObjectTemplate::getDeleteFlagsCount(void) const { if (!m_deleteFlagsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getDeleteFlagsCount(); } size_t count = m_deleteFlags.size(); // if we are extending our base template, add it's count - if (m_deleteFlagsAppend && m_baseData != NULL) + if (m_deleteFlagsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getDeleteFlagsCount(); } @@ -802,27 +802,27 @@ size_t ServerObjectTemplate::getDeleteFlagsCount(void) const ServerObjectTemplate::MoveFlags ServerObjectTemplate::getMoveFlags(int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_moveFlagsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter moveFlags in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter moveFlags has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter moveFlags has not been defined in template %s!", DataResource::getName())); return base->getMoveFlags(index); } } - if (m_moveFlagsAppend && base != NULL) + if (m_moveFlagsAppend && base != nullptr) { int baseCount = base->getMoveFlagsCount(); if (index < baseCount) @@ -838,20 +838,20 @@ size_t ServerObjectTemplate::getMoveFlagsCount(void) const { if (!m_moveFlagsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getMoveFlagsCount(); } size_t count = m_moveFlags.size(); // if we are extending our base template, add it's count - if (m_moveFlagsAppend && m_baseData != NULL) + if (m_moveFlagsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getMoveFlagsCount(); } @@ -866,33 +866,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInvulnerable(true); #endif } if (!m_invulnerable.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter invulnerable in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter invulnerable has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter invulnerable has not been defined in template %s!", DataResource::getName())); return base->getInvulnerable(); } } bool value = m_invulnerable.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -908,26 +908,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexity(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexity(); } } @@ -937,9 +937,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexity(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -956,7 +956,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -972,26 +972,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMin(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMin(); } } @@ -1001,9 +1001,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1020,7 +1020,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1036,26 +1036,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getComplexityMax(true); #endif } if (!m_complexity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter complexity has not been defined in template %s!", DataResource::getName())); return base->getComplexityMax(); } } @@ -1065,9 +1065,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getComplexityMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1084,7 +1084,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1100,26 +1100,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTintIndex(true); #endif } if (!m_tintIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); return base->getTintIndex(); } } @@ -1129,9 +1129,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTintIndex(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1148,7 +1148,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1164,26 +1164,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTintIndexMin(true); #endif } if (!m_tintIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); return base->getTintIndexMin(); } } @@ -1193,9 +1193,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTintIndexMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1212,7 +1212,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1228,26 +1228,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTintIndexMax(true); #endif } if (!m_tintIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName())); return base->getTintIndexMax(); } } @@ -1257,9 +1257,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTintIndexMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1276,7 +1276,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1286,8 +1286,8 @@ UNREF(testData); float ServerObjectTemplate::getUpdateRanges(UpdateRanges index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -1295,14 +1295,14 @@ float ServerObjectTemplate::getUpdateRanges(UpdateRanges index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_updateRanges[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); return base->getUpdateRanges(index); } } @@ -1312,9 +1312,9 @@ float ServerObjectTemplate::getUpdateRanges(UpdateRanges index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getUpdateRanges(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1335,8 +1335,8 @@ float ServerObjectTemplate::getUpdateRanges(UpdateRanges index) const float ServerObjectTemplate::getUpdateRangesMin(UpdateRanges index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -1344,14 +1344,14 @@ float ServerObjectTemplate::getUpdateRangesMin(UpdateRanges index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_updateRanges[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); return base->getUpdateRangesMin(index); } } @@ -1361,9 +1361,9 @@ float ServerObjectTemplate::getUpdateRangesMin(UpdateRanges index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getUpdateRangesMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1384,8 +1384,8 @@ float ServerObjectTemplate::getUpdateRangesMin(UpdateRanges index) const float ServerObjectTemplate::getUpdateRangesMax(UpdateRanges index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -1393,14 +1393,14 @@ float ServerObjectTemplate::getUpdateRangesMax(UpdateRanges index) const DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range")); if (!m_updateRanges[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName())); return base->getUpdateRangesMax(index); } } @@ -1410,9 +1410,9 @@ float ServerObjectTemplate::getUpdateRangesMax(UpdateRanges index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getUpdateRangesMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1433,28 +1433,28 @@ float ServerObjectTemplate::getUpdateRangesMax(UpdateRanges index) const void ServerObjectTemplate::getContents(Contents &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_contentsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); base->getContents(data, index); return; } } - if (m_contentsAppend && base != NULL) + if (m_contentsAppend && base != nullptr) { int baseCount = base->getContentsCount(); if (index < baseCount) @@ -1477,28 +1477,28 @@ void ServerObjectTemplate::getContents(Contents &data, int index) const void ServerObjectTemplate::getContentsMin(Contents &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_contentsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); base->getContentsMin(data, index); return; } } - if (m_contentsAppend && base != NULL) + if (m_contentsAppend && base != nullptr) { int baseCount = base->getContentsCount(); if (index < baseCount) @@ -1521,28 +1521,28 @@ void ServerObjectTemplate::getContentsMin(Contents &data, int index) const void ServerObjectTemplate::getContentsMax(Contents &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_contentsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter contents has not been defined in template %s!", DataResource::getName())); base->getContentsMax(data, index); return; } } - if (m_contentsAppend && base != NULL) + if (m_contentsAppend && base != nullptr) { int baseCount = base->getContentsCount(); if (index < baseCount) @@ -1567,20 +1567,20 @@ size_t ServerObjectTemplate::getContentsCount(void) const { if (!m_contentsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getContentsCount(); } size_t count = m_contents.size(); // if we are extending our base template, add it's count - if (m_contentsAppend && m_baseData != NULL) + if (m_contentsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getContentsCount(); } @@ -1589,28 +1589,28 @@ size_t ServerObjectTemplate::getContentsCount(void) const void ServerObjectTemplate::getXpPoints(Xp &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_xpPointsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); base->getXpPoints(data, index); return; } } - if (m_xpPointsAppend && base != NULL) + if (m_xpPointsAppend && base != nullptr) { int baseCount = base->getXpPointsCount(); if (index < baseCount) @@ -1633,28 +1633,28 @@ void ServerObjectTemplate::getXpPoints(Xp &data, int index) const void ServerObjectTemplate::getXpPointsMin(Xp &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_xpPointsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); base->getXpPointsMin(data, index); return; } } - if (m_xpPointsAppend && base != NULL) + if (m_xpPointsAppend && base != nullptr) { int baseCount = base->getXpPointsCount(); if (index < baseCount) @@ -1677,28 +1677,28 @@ void ServerObjectTemplate::getXpPointsMin(Xp &data, int index) const void ServerObjectTemplate::getXpPointsMax(Xp &data, int index) const { - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_xpPointsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName())); base->getXpPointsMax(data, index); return; } } - if (m_xpPointsAppend && base != NULL) + if (m_xpPointsAppend && base != nullptr) { int baseCount = base->getXpPointsCount(); if (index < baseCount) @@ -1723,20 +1723,20 @@ size_t ServerObjectTemplate::getXpPointsCount(void) const { if (!m_xpPointsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getXpPointsCount(); } size_t count = m_xpPoints.size(); // if we are extending our base template, add it's count - if (m_xpPointsAppend && m_baseData != NULL) + if (m_xpPointsAppend && m_baseData != nullptr) { const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getXpPointsCount(); } @@ -1751,33 +1751,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPersistByDefault(true); #endif } if (!m_persistByDefault.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter persistByDefault in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter persistByDefault has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter persistByDefault has not been defined in template %s!", DataResource::getName())); return base->getPersistByDefault(); } } bool value = m_persistByDefault.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1793,33 +1793,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPersistContents(true); #endif } if (!m_persistContents.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter persistContents in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter persistContents has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter persistContents has not been defined in template %s!", DataResource::getName())); return base->getPersistContents(); } } bool value = m_persistContents.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1872,12 +1872,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -1908,7 +1908,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_scripts.clear(); m_scriptsAppend = file.read_bool8(); @@ -1931,7 +1931,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_visibleFlags.clear(); m_visibleFlagsAppend = file.read_bool8(); @@ -1950,7 +1950,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_deleteFlags.clear(); m_deleteFlagsAppend = file.read_bool8(); @@ -1969,7 +1969,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_moveFlags.clear(); m_moveFlagsAppend = file.read_bool8(); @@ -2008,7 +2008,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_contents.begin(); iter != m_contents.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_contents.clear(); m_contentsAppend = file.read_bool8(); @@ -2027,7 +2027,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_xpPoints.clear(); m_xpPointsAppend = file.read_bool8(); @@ -2106,33 +2106,33 @@ ServerObjectTemplate::Attributes testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTarget(true); #endif } if (!m_target.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter target in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter target has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter target has not been defined in template %s!", DataResource::getName())); return base->getTarget(versionOk); } } Attributes value = static_cast(m_target.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2148,26 +2148,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValue(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValue(versionOk); } } @@ -2177,9 +2177,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2196,7 +2196,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2212,26 +2212,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMin(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMin(versionOk); } } @@ -2241,9 +2241,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2260,7 +2260,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2276,26 +2276,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMax(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMax(versionOk); } } @@ -2305,9 +2305,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2324,7 +2324,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2340,26 +2340,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTime(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTime(versionOk); } } @@ -2369,9 +2369,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTime(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2388,7 +2388,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2404,26 +2404,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeMin(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTimeMin(versionOk); } } @@ -2433,9 +2433,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2452,7 +2452,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2468,26 +2468,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeMax(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTimeMax(versionOk); } } @@ -2497,9 +2497,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2516,7 +2516,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2532,26 +2532,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValue(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValue(versionOk); } } @@ -2561,9 +2561,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2580,7 +2580,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2596,26 +2596,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValueMin(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValueMin(versionOk); } } @@ -2625,9 +2625,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2644,7 +2644,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2660,26 +2660,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValueMax(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValueMax(versionOk); } } @@ -2689,9 +2689,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2708,7 +2708,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2724,26 +2724,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecay(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecay(versionOk); } } @@ -2753,9 +2753,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecay(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2772,7 +2772,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2788,26 +2788,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecayMin(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecayMin(versionOk); } } @@ -2817,9 +2817,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecayMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2836,7 +2836,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2852,26 +2852,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_AttribMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_AttribMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecayMax(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecayMax(versionOk); } } @@ -2881,9 +2881,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecayMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2900,7 +2900,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2972,7 +2972,7 @@ char paramName[MAX_NAME_SIZE]; */ ServerObjectTemplate::Contents::Contents(void) { - content = NULL; + content = nullptr; } // ServerObjectTemplate::Contents::Contents() /** @@ -2983,7 +2983,7 @@ ServerObjectTemplate::Contents::Contents(const ServerObjectTemplate::Contents & equipObject(source.equipObject), content(source.content) { - if (content != NULL) + if (content != nullptr) const_cast(content)->addReference(); } // ServerObjectTemplate::Contents::Contents(const ServerObjectTemplate::Contents &) @@ -2992,10 +2992,10 @@ ServerObjectTemplate::Contents::Contents(const ServerObjectTemplate::Contents & */ ServerObjectTemplate::Contents::~Contents() { - if (content != NULL) + if (content != nullptr) { content->releaseReference(); - content = NULL; + content = nullptr; } } // ServerObjectTemplate::Contents::~Contents @@ -3065,33 +3065,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerObjectTemplate::_Contents * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Contents * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlotName(true); #endif } if (!m_slotName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slotName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slotName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slotName has not been defined in template %s!", DataResource::getName())); return base->getSlotName(versionOk); } } const std::string & value = m_slotName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3107,33 +3107,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerObjectTemplate::_Contents * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Contents * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getEquipObject(true); #endif } if (!m_equipObject.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter equipObject in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter equipObject has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter equipObject has not been defined in template %s!", DataResource::getName())); return base->getEquipObject(versionOk); } } bool value = m_equipObject.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3143,32 +3143,32 @@ UNREF(testData); const ServerObjectTemplate * ServerObjectTemplate::_Contents::getContent(bool versionOk) const { - const ServerObjectTemplate::_Contents * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Contents * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_content.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter content in template %s", DataResource::getName())); - return NULL; + return nullptr; } else { - DEBUG_FATAL(base == NULL, ("Template parameter content has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter content has not been defined in template %s!", DataResource::getName())); return base->getContent(versionOk); } } - const ServerObjectTemplate * returnValue = NULL; + const ServerObjectTemplate * returnValue = nullptr; const std::string & templateName = m_content.getValue(); if (!templateName.empty()) { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == NULL) + if (returnValue == nullptr) WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; @@ -3273,33 +3273,33 @@ ServerObjectTemplate::MentalStates testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTarget(true); #endif } if (!m_target.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter target in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter target has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter target has not been defined in template %s!", DataResource::getName())); return base->getTarget(versionOk); } } MentalStates value = static_cast(m_target.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3315,26 +3315,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValue(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValue(versionOk); } } @@ -3344,9 +3344,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3363,7 +3363,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3379,26 +3379,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMin(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMin(versionOk); } } @@ -3408,9 +3408,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3427,7 +3427,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3443,26 +3443,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMax(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMax(versionOk); } } @@ -3472,9 +3472,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3491,7 +3491,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3507,26 +3507,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTime(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTime(versionOk); } } @@ -3536,9 +3536,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTime(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3555,7 +3555,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3571,26 +3571,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeMin(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTimeMin(versionOk); } } @@ -3600,9 +3600,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3619,7 +3619,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3635,26 +3635,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeMax(true); #endif } if (!m_time.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter time has not been defined in template %s!", DataResource::getName())); return base->getTimeMax(versionOk); } } @@ -3664,9 +3664,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3683,7 +3683,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3699,26 +3699,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValue(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValue(versionOk); } } @@ -3728,9 +3728,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3747,7 +3747,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3763,26 +3763,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValueMin(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValueMin(versionOk); } } @@ -3792,9 +3792,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3811,7 +3811,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3827,26 +3827,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTimeAtValueMax(true); #endif } if (!m_timeAtValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName())); return base->getTimeAtValueMax(versionOk); } } @@ -3856,9 +3856,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTimeAtValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3875,7 +3875,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3891,26 +3891,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecay(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecay(versionOk); } } @@ -3920,9 +3920,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecay(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3939,7 +3939,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3955,26 +3955,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecayMin(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecayMin(versionOk); } } @@ -3984,9 +3984,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecayMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4003,7 +4003,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4019,26 +4019,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerObjectTemplate::_MentalStateMod * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_MentalStateMod * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDecayMax(true); #endif } if (!m_decay.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter decay has not been defined in template %s!", DataResource::getName())); return base->getDecayMax(versionOk); } } @@ -4048,9 +4048,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDecayMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4067,7 +4067,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4185,33 +4185,33 @@ ServerObjectTemplate::XpTypes testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getType(true); #endif } if (!m_type.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter type in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter type has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter type has not been defined in template %s!", DataResource::getName())); return base->getType(versionOk); } } XpTypes value = static_cast(m_type.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4227,26 +4227,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLevel(true); #endif } if (!m_level.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter level has not been defined in template %s!", DataResource::getName())); return base->getLevel(versionOk); } } @@ -4256,9 +4256,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLevel(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4275,7 +4275,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4291,26 +4291,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLevelMin(true); #endif } if (!m_level.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter level has not been defined in template %s!", DataResource::getName())); return base->getLevelMin(versionOk); } } @@ -4320,9 +4320,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLevelMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4339,7 +4339,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4355,26 +4355,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLevelMax(true); #endif } if (!m_level.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter level has not been defined in template %s!", DataResource::getName())); return base->getLevelMax(versionOk); } } @@ -4384,9 +4384,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLevelMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4403,7 +4403,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4419,26 +4419,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValue(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValue(versionOk); } } @@ -4448,9 +4448,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4467,7 +4467,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4483,26 +4483,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMin(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMin(versionOk); } } @@ -4512,9 +4512,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4531,7 +4531,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -4547,26 +4547,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerObjectTemplate::_Xp * base = NULL; - if (m_baseData != NULL) + const ServerObjectTemplate::_Xp * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMax(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMax(versionOk); } } @@ -4576,9 +4576,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -4595,7 +4595,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp index 985007c1..3c4e1053 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerPlanetObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlanetObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlanetObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlanetObjectTemplate::getHighestTemplateVersion @@ -120,33 +120,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerPlanetObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerPlanetObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPlanetName(true); #endif } if (!m_planetName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter planetName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter planetName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter planetName has not been defined in template %s!", DataResource::getName())); return base->getPlanetName(); } } const std::string & value = m_planetName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -192,12 +192,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp index 9051a1f9..effe5904 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerPlayerObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerObjectTemplate::getHighestTemplateVersion @@ -151,12 +151,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp index ea316d04..5949f691 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerQuestObjectTemplate::getHighestTemplateVersion @@ -152,12 +152,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp index bdd03637..a5512489 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceContainerObjectTemplate::getHighestTemplateVersion @@ -120,26 +120,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerResourceContainerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerResourceContainerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxResources(true); #endif } if (!m_maxResources.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); return base->getMaxResources(); } } @@ -149,9 +149,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxResources(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -168,7 +168,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -184,26 +184,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerResourceContainerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerResourceContainerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxResourcesMin(true); #endif } if (!m_maxResources.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); return base->getMaxResourcesMin(); } } @@ -213,9 +213,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxResourcesMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -232,7 +232,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -248,26 +248,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerResourceContainerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerResourceContainerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxResourcesMax(true); #endif } if (!m_maxResources.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName())); return base->getMaxResourcesMax(); } } @@ -277,9 +277,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxResourcesMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -296,7 +296,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -343,12 +343,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp index 1acde7a0..a2d12972 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag ServerShipObjectTemplate::getTemplateVersion(void) const */ Tag ServerShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerShipObjectTemplate::getHighestTemplateVersion @@ -121,33 +121,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerShipObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerShipObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getShipType(true); #endif } if (!m_shipType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter shipType in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter shipType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter shipType has not been defined in template %s!", DataResource::getName())); return base->getShipType(); } } const std::string & value = m_shipType.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -193,12 +193,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp index 767901e7..f2e49fba 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerStaticObjectTemplate::getTemplateVersion(void) const */ Tag ServerStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerStaticObjectTemplate::getHighestTemplateVersion @@ -120,33 +120,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerStaticObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerStaticObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClientOnlyBuildout(true); #endif } if (!m_clientOnlyBuildout.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clientOnlyBuildout in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter clientOnlyBuildout has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clientOnlyBuildout has not been defined in template %s!", DataResource::getName())); return base->getClientOnlyBuildout(); } } bool value = m_clientOnlyBuildout.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -192,12 +192,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp index 39d5e817..3bdb728d 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp @@ -53,7 +53,7 @@ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumes.clear(); } @@ -105,10 +105,10 @@ Tag ServerTangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTangibleObjectTemplate::getHighestTemplateVersion @@ -126,27 +126,27 @@ Object * ServerTangibleObjectTemplate::createObject(void) const //@BEGIN TFD const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int index) const { - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_triggerVolumesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter triggerVolumes in template %s", DataResource::getName())); return DefaultTriggerVolumeData; } else { - DEBUG_FATAL(base == NULL, ("Template parameter triggerVolumes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter triggerVolumes has not been defined in template %s!", DataResource::getName())); return base->getTriggerVolumes(index); } } - if (m_triggerVolumesAppend && base != NULL) + if (m_triggerVolumesAppend && base != nullptr) { int baseCount = base->getTriggerVolumesCount(); if (index < baseCount) @@ -164,20 +164,20 @@ size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const { if (!m_triggerVolumesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getTriggerVolumesCount(); } size_t count = m_triggerVolumes.size(); // if we are extending our base template, add it's count - if (m_triggerVolumesAppend && m_baseData != NULL) + if (m_triggerVolumesAppend && m_baseData != nullptr) { const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getTriggerVolumesCount(); } @@ -192,33 +192,33 @@ ServerTangibleObjectTemplate::CombatSkeleton testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCombatSkeleton(true); #endif } if (!m_combatSkeleton.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter combatSkeleton in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter combatSkeleton has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter combatSkeleton has not been defined in template %s!", DataResource::getName())); return base->getCombatSkeleton(); } } CombatSkeleton value = static_cast(m_combatSkeleton.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -234,26 +234,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHitPoints(true); #endif } if (!m_maxHitPoints.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); return base->getMaxHitPoints(); } } @@ -263,9 +263,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHitPoints(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -282,7 +282,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -298,26 +298,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHitPointsMin(true); #endif } if (!m_maxHitPoints.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); return base->getMaxHitPointsMin(); } } @@ -327,9 +327,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHitPointsMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -346,7 +346,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -362,26 +362,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxHitPointsMax(true); #endif } if (!m_maxHitPoints.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName())); return base->getMaxHitPointsMax(); } } @@ -391,9 +391,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxHitPointsMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -410,7 +410,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -420,32 +420,32 @@ UNREF(testData); const ServerArmorTemplate * ServerTangibleObjectTemplate::getArmor() const { - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_armor.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter armor in template %s", DataResource::getName())); - return NULL; + return nullptr; } else { - DEBUG_FATAL(base == NULL, ("Template parameter armor has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter armor has not been defined in template %s!", DataResource::getName())); return base->getArmor(); } } - const ServerArmorTemplate * returnValue = NULL; + const ServerArmorTemplate * returnValue = nullptr; const std::string & templateName = m_armor.getValue(); if (!templateName.empty()) { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == NULL) + if (returnValue == nullptr) WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; @@ -459,26 +459,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInterestRadius(true); #endif } if (!m_interestRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); return base->getInterestRadius(); } } @@ -488,9 +488,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getInterestRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -507,7 +507,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -523,26 +523,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInterestRadiusMin(true); #endif } if (!m_interestRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); return base->getInterestRadiusMin(); } } @@ -552,9 +552,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getInterestRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -571,7 +571,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -587,26 +587,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInterestRadiusMax(true); #endif } if (!m_interestRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName())); return base->getInterestRadiusMax(); } } @@ -616,9 +616,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getInterestRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -635,7 +635,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -651,26 +651,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCount(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCount(); } } @@ -680,9 +680,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCount(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -699,7 +699,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -715,26 +715,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMin(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMin(); } } @@ -744,9 +744,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -763,7 +763,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -779,26 +779,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCountMax(true); #endif } if (!m_count.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter count has not been defined in template %s!", DataResource::getName())); return base->getCountMax(); } } @@ -808,9 +808,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCountMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -827,7 +827,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -843,26 +843,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCondition(true); #endif } if (!m_condition.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); return base->getCondition(); } } @@ -872,9 +872,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCondition(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -891,7 +891,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -907,26 +907,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConditionMin(true); #endif } if (!m_condition.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); return base->getConditionMin(); } } @@ -936,9 +936,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getConditionMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -955,7 +955,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -971,26 +971,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConditionMax(true); #endif } if (!m_condition.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter condition has not been defined in template %s!", DataResource::getName())); return base->getConditionMax(); } } @@ -1000,9 +1000,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getConditionMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1019,7 +1019,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1035,33 +1035,33 @@ bool testDataValue = false; UNREF(testData); #endif - const ServerTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWantSawAttackTriggers(true); #endif } if (!m_wantSawAttackTriggers.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter wantSawAttackTriggers in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter wantSawAttackTriggers has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter wantSawAttackTriggers has not been defined in template %s!", DataResource::getName())); return base->getWantSawAttackTriggers(); } } bool value = m_wantSawAttackTriggers.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1116,12 +1116,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -1150,7 +1150,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumes.clear(); m_triggerVolumesAppend = file.read_bool8(); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp index 03a16459..9bba2b4b 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerUniverseObjectTemplate::getTemplateVersion(void) const */ Tag ServerUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUniverseObjectTemplate::getHighestTemplateVersion @@ -149,12 +149,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp index 501b241a..838e7107 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerVehicleObjectTemplate::getTemplateVersion(void) const */ Tag ServerVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerVehicleObjectTemplate::getHighestTemplateVersion @@ -120,33 +120,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getFuelType(true); #endif } if (!m_fuelType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter fuelType in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter fuelType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter fuelType has not been defined in template %s!", DataResource::getName())); return base->getFuelType(); } } const std::string & value = m_fuelType.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -162,26 +162,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentFuel(true); #endif } if (!m_currentFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); return base->getCurrentFuel(); } } @@ -191,9 +191,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentFuel(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -210,7 +210,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -226,26 +226,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentFuelMin(true); #endif } if (!m_currentFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); return base->getCurrentFuelMin(); } } @@ -255,9 +255,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentFuelMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -274,7 +274,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -290,26 +290,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCurrentFuelMax(true); #endif } if (!m_currentFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName())); return base->getCurrentFuelMax(); } } @@ -319,9 +319,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCurrentFuelMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -338,7 +338,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -354,26 +354,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFuel(true); #endif } if (!m_maxFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); return base->getMaxFuel(); } } @@ -383,9 +383,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFuel(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -402,7 +402,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -418,26 +418,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFuelMin(true); #endif } if (!m_maxFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); return base->getMaxFuelMin(); } } @@ -447,9 +447,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFuelMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -466,7 +466,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -482,26 +482,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxFuelMax(true); #endif } if (!m_maxFuel.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName())); return base->getMaxFuelMax(); } } @@ -511,9 +511,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxFuelMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -530,7 +530,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -546,26 +546,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConsumpsion(true); #endif } if (!m_consumpsion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); return base->getConsumpsion(); } } @@ -575,9 +575,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getConsumpsion(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -594,7 +594,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -610,26 +610,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConsumpsionMin(true); #endif } if (!m_consumpsion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); return base->getConsumpsionMin(); } } @@ -639,9 +639,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getConsumpsionMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -658,7 +658,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -674,26 +674,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConsumpsionMax(true); #endif } if (!m_consumpsion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName())); return base->getConsumpsionMax(); } } @@ -703,9 +703,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getConsumpsionMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -722,7 +722,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -774,12 +774,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp index 8d4bbfa0..bf2ee2cb 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp @@ -93,10 +93,10 @@ Tag ServerWeaponObjectTemplate::getTemplateVersion(void) const */ Tag ServerWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWeaponObjectTemplate::getHighestTemplateVersion @@ -120,33 +120,33 @@ ServerWeaponObjectTemplate::WeaponType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWeaponType(true); #endif } if (!m_weaponType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter weaponType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter weaponType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter weaponType has not been defined in template %s!", DataResource::getName())); return base->getWeaponType(); } } WeaponType value = static_cast(m_weaponType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -162,33 +162,33 @@ ServerWeaponObjectTemplate::AttackType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackType(true); #endif } if (!m_attackType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackType has not been defined in template %s!", DataResource::getName())); return base->getAttackType(); } } AttackType value = static_cast(m_attackType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -204,33 +204,33 @@ ServerWeaponObjectTemplate::DamageType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDamageType(true); #endif } if (!m_damageType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter damageType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter damageType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter damageType has not been defined in template %s!", DataResource::getName())); return base->getDamageType(); } } DamageType value = static_cast(m_damageType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -246,33 +246,33 @@ ServerWeaponObjectTemplate::DamageType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getElementalType(true); #endif } if (!m_elementalType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter elementalType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter elementalType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter elementalType has not been defined in template %s!", DataResource::getName())); return base->getElementalType(); } } DamageType value = static_cast(m_elementalType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -288,26 +288,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getElementalValue(true); #endif } if (!m_elementalValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); return base->getElementalValue(); } } @@ -317,9 +317,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getElementalValue(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -336,7 +336,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -352,26 +352,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getElementalValueMin(true); #endif } if (!m_elementalValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); return base->getElementalValueMin(); } } @@ -381,9 +381,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getElementalValueMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -400,7 +400,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -416,26 +416,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getElementalValueMax(true); #endif } if (!m_elementalValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName())); return base->getElementalValueMax(); } } @@ -445,9 +445,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getElementalValueMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -464,7 +464,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -480,26 +480,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDamageAmount(true); #endif } if (!m_minDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMinDamageAmount(); } } @@ -509,9 +509,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDamageAmount(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -528,7 +528,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -544,26 +544,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDamageAmountMin(true); #endif } if (!m_minDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMinDamageAmountMin(); } } @@ -573,9 +573,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDamageAmountMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -592,7 +592,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -608,26 +608,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinDamageAmountMax(true); #endif } if (!m_minDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMinDamageAmountMax(); } } @@ -637,9 +637,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinDamageAmountMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -656,7 +656,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -672,26 +672,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDamageAmount(true); #endif } if (!m_maxDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMaxDamageAmount(); } } @@ -701,9 +701,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDamageAmount(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -720,7 +720,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -736,26 +736,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDamageAmountMin(true); #endif } if (!m_maxDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMaxDamageAmountMin(); } } @@ -765,9 +765,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDamageAmountMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -784,7 +784,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -800,26 +800,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxDamageAmountMax(true); #endif } if (!m_maxDamageAmount.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName())); return base->getMaxDamageAmountMax(); } } @@ -829,9 +829,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxDamageAmountMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -848,7 +848,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -864,26 +864,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackSpeed(true); #endif } if (!m_attackSpeed.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); return base->getAttackSpeed(); } } @@ -893,9 +893,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackSpeed(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -912,7 +912,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -928,26 +928,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackSpeedMin(true); #endif } if (!m_attackSpeed.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); return base->getAttackSpeedMin(); } } @@ -957,9 +957,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackSpeedMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -976,7 +976,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -992,26 +992,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackSpeedMax(true); #endif } if (!m_attackSpeed.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName())); return base->getAttackSpeedMax(); } } @@ -1021,9 +1021,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackSpeedMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1040,7 +1040,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1056,26 +1056,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAudibleRange(true); #endif } if (!m_audibleRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); return base->getAudibleRange(); } } @@ -1085,9 +1085,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAudibleRange(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1104,7 +1104,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1120,26 +1120,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAudibleRangeMin(true); #endif } if (!m_audibleRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); return base->getAudibleRangeMin(); } } @@ -1149,9 +1149,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAudibleRangeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1168,7 +1168,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1184,26 +1184,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAudibleRangeMax(true); #endif } if (!m_audibleRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName())); return base->getAudibleRangeMax(); } } @@ -1213,9 +1213,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAudibleRangeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1232,7 +1232,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1248,26 +1248,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinRange(true); #endif } if (!m_minRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); return base->getMinRange(); } } @@ -1277,9 +1277,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinRange(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1296,7 +1296,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1312,26 +1312,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinRangeMin(true); #endif } if (!m_minRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); return base->getMinRangeMin(); } } @@ -1341,9 +1341,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinRangeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1360,7 +1360,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1376,26 +1376,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinRangeMax(true); #endif } if (!m_minRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minRange has not been defined in template %s!", DataResource::getName())); return base->getMinRangeMax(); } } @@ -1405,9 +1405,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinRangeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1424,7 +1424,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1440,26 +1440,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxRange(true); #endif } if (!m_maxRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); return base->getMaxRange(); } } @@ -1469,9 +1469,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxRange(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1488,7 +1488,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1504,26 +1504,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxRangeMin(true); #endif } if (!m_maxRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); return base->getMaxRangeMin(); } } @@ -1533,9 +1533,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxRangeMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1552,7 +1552,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1568,26 +1568,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxRangeMax(true); #endif } if (!m_maxRange.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName())); return base->getMaxRangeMax(); } } @@ -1597,9 +1597,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxRangeMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1616,7 +1616,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1632,26 +1632,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDamageRadius(true); #endif } if (!m_damageRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); return base->getDamageRadius(); } } @@ -1661,9 +1661,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDamageRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1680,7 +1680,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1696,26 +1696,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDamageRadiusMin(true); #endif } if (!m_damageRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); return base->getDamageRadiusMin(); } } @@ -1725,9 +1725,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDamageRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1744,7 +1744,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1760,26 +1760,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDamageRadiusMax(true); #endif } if (!m_damageRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName())); return base->getDamageRadiusMax(); } } @@ -1789,9 +1789,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDamageRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1808,7 +1808,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1824,26 +1824,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWoundChance(true); #endif } if (!m_woundChance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); return base->getWoundChance(); } } @@ -1853,9 +1853,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWoundChance(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1872,7 +1872,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1888,26 +1888,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWoundChanceMin(true); #endif } if (!m_woundChance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); return base->getWoundChanceMin(); } } @@ -1917,9 +1917,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWoundChanceMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1936,7 +1936,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1952,26 +1952,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWoundChanceMax(true); #endif } if (!m_woundChance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName())); return base->getWoundChanceMax(); } } @@ -1981,9 +1981,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWoundChanceMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2000,7 +2000,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2016,26 +2016,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackCost(true); #endif } if (!m_attackCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); return base->getAttackCost(); } } @@ -2045,9 +2045,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackCost(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2064,7 +2064,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2080,26 +2080,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackCostMin(true); #endif } if (!m_attackCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); return base->getAttackCostMin(); } } @@ -2109,9 +2109,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackCostMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2128,7 +2128,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2144,26 +2144,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackCostMax(true); #endif } if (!m_attackCost.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName())); return base->getAttackCostMax(); } } @@ -2173,9 +2173,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAttackCostMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2192,7 +2192,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2208,26 +2208,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAccuracy(true); #endif } if (!m_accuracy.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); return base->getAccuracy(); } } @@ -2237,9 +2237,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccuracy(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2256,7 +2256,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2272,26 +2272,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAccuracyMin(true); #endif } if (!m_accuracy.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); return base->getAccuracyMin(); } } @@ -2301,9 +2301,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccuracyMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2320,7 +2320,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2336,26 +2336,26 @@ int testDataValue = 0; UNREF(testData); #endif - const ServerWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const ServerWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAccuracyMax(true); #endif } if (!m_accuracy.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName())); return base->getAccuracyMax(); } } @@ -2365,9 +2365,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccuracyMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2384,7 +2384,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2455,12 +2455,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp index 4ee70d19..0fc6ff30 100755 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag ServerXpManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerXpManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerXpManagerObjectTemplate::getHighestTemplateVersion @@ -111,7 +111,7 @@ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const Object * ServerXpManagerObjectTemplate::createObject(void) const { // return new XpManagerObject(this); - return NULL; + return nullptr; } // ServerXpManagerObjectTemplate::createObject //@BEGIN TFD @@ -152,12 +152,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp b/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp index 4de849cd..d6e291ae 100755 --- a/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp +++ b/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp @@ -613,7 +613,7 @@ void Pvp::updateTimedFlags(const void *context) unsigned long const updateTimeMs = static_cast(ConfigServerGame::getPvpUpdateTimeMs()); PvpInternal::updateTimedFlags(updateTimeMs); - getScheduler().setCallback(Pvp::updateTimedFlags, NULL, updateTimeMs); + getScheduler().setCallback(Pvp::updateTimedFlags, nullptr, updateTimeMs); } // ---------------------------------------------------------------------- @@ -754,7 +754,7 @@ Pvp::GcwScoreCategory const * Pvp::getGcwScoreCategory(std::string const & score if (iterFind != s_gcwScoreCategory.end()) return iterFind->second; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -765,7 +765,7 @@ Pvp::GcwScoreCategory const * Pvp::getGcwScoreDefaultCategoryForPlanet(std::stri if (iterFind != s_gcwScoreDefaultCategoryForPlanet.end()) return iterFind->second; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp index 440b0ed7..d0c4212f 100755 --- a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp +++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp @@ -27,8 +27,8 @@ namespace PvpRuleSetBaseNamespace // if object is authoritative, then apply repercussions immediately; // otherwise, forward repercussions over to the authoritative server - PvpUpdateObserver * o = NULL; - MessageQueuePvpCommand * messageQueuePvpCommand = NULL; + PvpUpdateObserver * o = nullptr; + MessageQueuePvpCommand * messageQueuePvpCommand = nullptr; if (actor.isAuthoritative()) o = new PvpUpdateObserver(&actor, Archive::ADOO_generic); diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp index 70f55095..d333bbb0 100755 --- a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp +++ b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp @@ -81,7 +81,7 @@ PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDel m_pvpFaction = who->getPvpFaction(); // get client visible status for everyone observing this object (including itself) - if ((s_objectsProcessedThisFrame.count(who->getNetworkId()) == 0) && satisfyPvpSyncCondition(who->isNonPvpObject(), who->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who->asCreatureObject() != NULL), who->getPvpFaction())) + if ((s_objectsProcessedThisFrame.count(who->getNetworkId()) == 0) && satisfyPvpSyncCondition(who->isNonPvpObject(), who->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who->asCreatureObject() != nullptr), who->getPvpFaction())) { std::set const &clients = who->getObservers(); for (std::set::const_iterator i = clients.begin(); i != clients.end(); ++i) @@ -146,8 +146,8 @@ PvpUpdateObserver::~PvpUpdateObserver() PvpData::isRebelFactionId(m_obj->getPvpFaction())) { // did the object's "pvp sync" status change because of the faction change? - bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != NULL), m_pvpFaction); - bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != NULL), m_obj->getPvpFaction()); + bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != nullptr), m_pvpFaction); + bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != nullptr), m_obj->getPvpFaction()); if (wasPvpSync != isPvpSync) { @@ -173,7 +173,7 @@ PvpUpdateObserver::~PvpUpdateObserver() void PvpUpdateObserver::updatePvpStatusCache(Client const *client, TangibleObject const &who, uint32 flags, uint32 factionId) { - if (!client || !who.getNetworkId().isValid() || !PvpUpdateObserver::satisfyPvpSyncCondition(who.isNonPvpObject(), who.hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who.asCreatureObject() != NULL), who.getPvpFaction())) + if (!client || !who.getNetworkId().isValid() || !PvpUpdateObserver::satisfyPvpSyncCondition(who.isNonPvpObject(), who.hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who.asCreatureObject() != nullptr), who.getPvpFaction())) return; s_pvpUpdateObserverCache[client][who.getNetworkId()] = std::make_pair(flags, factionId); diff --git a/engine/server/library/serverGame/src/shared/region/Region.cpp b/engine/server/library/serverGame/src/shared/region/Region.cpp index fc74229a..c24a3500 100755 --- a/engine/server/library/serverGame/src/shared/region/Region.cpp +++ b/engine/server/library/serverGame/src/shared/region/Region.cpp @@ -22,7 +22,7 @@ static std::map s_nameCrcRegionMap; * Class constructor for a static region. */ Region::Region() : - m_bounds(NULL), + m_bounds(nullptr), m_dynamicRegionId(), m_name(), m_nameCrc(0), @@ -49,7 +49,7 @@ Region::Region() : * @param dynamicRegionId the id of the dynamic region object */ Region::Region(const CachedNetworkId & dynamicRegionId) : - m_bounds(NULL), + m_bounds(nullptr), m_dynamicRegionId(dynamicRegionId), m_name(), m_nameCrc(0), @@ -83,7 +83,7 @@ Region::~Region() } delete const_cast(m_bounds); - m_bounds = NULL; + m_bounds = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp index 6cbb7710..d8f734a6 100755 --- a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp +++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp @@ -82,7 +82,7 @@ struct RegionMaster::RegionData MxCifQuadTree * tree; RegionsMappedByName nameMap; - RegionData() : tree(NULL), nameMap() {} + RegionData() : tree(nullptr), nameMap() {} }; namespace RegionMasterNamspace @@ -133,7 +133,7 @@ void RegionMaster::exit() i1 != ms_planetRegions.end(); ++i1) { delete (*i1).second.tree; - (*i1).second.tree = NULL; + (*i1).second.tree = nullptr; } ms_planetRegions.clear(); } @@ -143,7 +143,7 @@ void RegionMaster::exit() i2 != ms_staticRegions.end(); ++i2) { delete const_cast(*i2); - *i2 = NULL; + *i2 = nullptr; } ms_staticRegions.clear(); } @@ -153,7 +153,7 @@ void RegionMaster::exit() i2 != ms_dynamicRegions.end(); ++i2) { delete const_cast(*i2); - *i2 = NULL; + *i2 = nullptr; } ms_dynamicRegions.clear(); } @@ -178,7 +178,7 @@ void RegionMaster::readRegionDataTables() const char * regionFilesName = ConfigServerGame::getRegionFilesName(); DataTable * const regionFilesTable = DataTableManager::getTable(regionFilesName, true); - if (regionFilesTable == NULL) + if (regionFilesTable == nullptr) { WARNING(true, ("RegionMaster::readRegionDataTables could not open file %s, static regions will not be read!", regionFilesName)); return; @@ -197,14 +197,14 @@ void RegionMaster::readRegionDataTables() float regionMaxY = regionFilesTable->getFloatValue (5, i); DataTable * const regionTable = DataTableManager::getTable(regionFileName, true); - if (regionTable == NULL) + if (regionTable == nullptr) { WARNING(true, ("RegionMaster::readRegionDataTables could not open region file %s.", regionFileName.c_str())); continue; } RegionData & regionData = ms_planetRegions[planetName]; - if (regionData.tree == NULL) + if (regionData.tree == nullptr) { regionData.tree = new MxCifQuadTree(regionMinX, regionMinY, regionMaxX, regionMaxY, ConfigServerGame::getRegionTreeDepth()); } @@ -246,7 +246,7 @@ void RegionMaster::readRegionDataTables() } // create a rectangular or circular region and add it to the region tree - Region * region = NULL; + Region * region = nullptr; switch (geometry) { case RG_rectagle: @@ -284,7 +284,7 @@ void RegionMaster::readRegionDataTables() continue; } // set the rest of the region's data - if (region != NULL) + if (region != nullptr) { region->setName(name); region->setPlanet(planetName); @@ -400,7 +400,7 @@ void RegionMaster::createNewDynamicRegion(float minX, float minZ, * @param visible visible flag * @param notify notify flag * - * @return the new region, or NULL on error + * @return the new region, or nullptr on error */ void RegionMaster::createNewDynamicRegion(float centerX, float centerZ, float radius, const Unicode::String & name, const std::string & planet, int pvp, @@ -512,7 +512,7 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source) if (!ms_installed) { WARNING(true, ("RegionMaster::addDynamicRegion, not installed")); - return NULL; + return nullptr; } DynamicVariableList::NestedList regionObjvars(source.getObjVars(),OBJVAR_DYNAMIC_REGION); @@ -521,124 +521,124 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source) if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_PLANET,planet)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no planet data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } Unicode::String name; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_NAME,name)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no name data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } if (name.empty()) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has empty " "name data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int geometry = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_GEOMETRY,geometry)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "geometry data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } float minX; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MINX,minX)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "minX data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } float minY; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MINY,minY)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "minY data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } float maxX; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAXX,maxX)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "maxX data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } float maxY; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAXY,maxY)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "maxY data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int pvp=0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_PVP,pvp)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "pvp data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int geography=0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_GEOGRAPHY,geography)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "geography data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int minDifficulty = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MIN_DIFFICULTY, minDifficulty)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "min difficulty data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int maxDifficulty = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAX_DIFFICULTY, maxDifficulty)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "max difficulty data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int spawn = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_SPAWN,spawn)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "spawn data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int mission = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MISSION,mission)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "mission data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int buildable = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_BUILDABLE,buildable)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "buildable data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int municipal = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MUNICIPAL,municipal)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "municipal data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int visible = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_VISIBLE,visible)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "visible data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } int notify = 0; if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_NOTIFY,notify)) { DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no " "notify data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } // find the appropriate region data for the planet @@ -650,14 +650,14 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source) WARNING(true, ("RegionMaster::addDynamicRegion object %s gave unknown " "planet %s for its region", source.getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(planet).c_str())); - return NULL; + return nullptr; } RegionData & regionData = (*result).second; - if (regionData.tree == NULL) + if (regionData.tree == nullptr) { WARNING_STRICT_FATAL(true, ("RegionMaster::addDynamicRegion planet %s " "has no tree defined!", Unicode::wideToNarrow(planet).c_str())); - return NULL; + return nullptr; } // make sure the region name is unique @@ -666,11 +666,11 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source) WARNING(true, ("RegionMaster::addDynamicRegion object %s is trying " "to add duplicate region %s", source.getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(name).c_str())); - return NULL; + return nullptr; } // create a rectangular or circular region and add it to the region tree - Region * region = NULL; + Region * region = nullptr; switch (geometry) { case RG_rectagle: @@ -706,14 +706,14 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source) DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has unknown " "geometry type", source.getNetworkId().getValueString().c_str(), geometry)); - return NULL; + return nullptr; } - if (region == NULL) + if (region == nullptr) { WARNING(true, ("RegionMaster::readRegionDataTables could " "not add region defined by object %s to region tree", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } // set the rest of the region's data @@ -803,7 +803,7 @@ void RegionMaster::removeDynamicRegion(const UniverseObject & source) return; } RegionData & regionData = (*dataResult).second; - if (regionData.tree == NULL) + if (regionData.tree == nullptr) { WARNING_STRICT_FATAL(true, ("RegionMaster::addDynamicRegion planet %s " "has no tree defined!", Unicode::wideToNarrow(planet).c_str())); @@ -888,7 +888,7 @@ const Region * RegionMaster::getDynamicRegionFromObject(const UniverseObject & s if (!ms_installed) { WARNING(true, ("RegionMaster::getDynamicRegionFromObject, not installed")); - return NULL; + return nullptr; } DynamicVariableList::NestedList regionObjVars(source.getObjVars(),OBJVAR_DYNAMIC_REGION); @@ -898,14 +898,14 @@ const Region * RegionMaster::getDynamicRegionFromObject(const UniverseObject & s { DEBUG_WARNING(true, ("RegionMaster::getDynamicRegionFromObject object %s has no " "planet data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } Unicode::String name; if (!regionObjVars.getItem(OBJVAR_DYNAMIC_REGION_NAME,name)) { DEBUG_WARNING(true, ("RegionMaster::getDynamicRegionFromObject object %s has no " "name data", source.getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } return getRegionByName(Unicode::wideToNarrow(planet), name); @@ -921,17 +921,17 @@ Region * RegionMaster::getRegionByName(const std::string & planetName, const Uni if (!ms_installed) { WARNING(true, ("RegionMaster::getRegionByName, not installed")); - return NULL; + return nullptr; } const RegionData & regionData = ms_planetRegions[planetName]; - if (regionData.tree != NULL) + if (regionData.tree != nullptr) { RegionsMappedByName::const_iterator result = regionData.nameMap.find(regionName); if (result != regionData.nameMap.end()) return (*result).second; } - return NULL; + return nullptr; } // RegionMaster::getRegionByName //---------------------------------------------------------------------- @@ -944,18 +944,18 @@ const Region * RegionMaster::getSmallestRegionAtPoint(const std::string & planet if (!ms_installed) { WARNING(true, ("RegionMaster::getSmallestRegionAtPoint, not installed")); - return NULL; + return nullptr; } std::vector regions; getRegionsAtPoint(planet, x, z, regions); float area = 0; - const Region * region = NULL; + const Region * region = nullptr; for (std::vector::const_iterator iter = regions.begin(); iter != regions.end(); ++iter) { - if (region == NULL) + if (region == nullptr) { region = *iter; area = region->getArea(); @@ -983,19 +983,19 @@ const Region * RegionMaster::getSmallestVisibleRegionAtPoint(const std::string & if (!ms_installed) { WARNING(true, ("RegionMaster::getSmallestRegionAtPoint, not installed")); - return NULL; + return nullptr; } std::vector regions; getRegionsAtPoint(planet, x, z, regions); float area = 0; - const Region * region = NULL; + const Region * region = nullptr; for (std::vector::const_iterator iter = regions.begin(); iter != regions.end(); ++iter) { if ((*iter)->isVisible()) { - if (region == NULL) + if (region == nullptr) { region = *iter; area = region->getArea(); @@ -1036,7 +1036,7 @@ void RegionMaster::getRegionsAtPoint(const std::string & planet, float x, float } const RegionData & regionData = ms_planetRegions[planet]; - if (regionData.tree != NULL) + if (regionData.tree != nullptr) { std::vector objects; regionData.tree->getObjectsAt(x, z, objects); @@ -1065,7 +1065,7 @@ void RegionMaster::getRegionsForPlanet(const std::string & planetName, } const RegionData & regionData = ms_planetRegions[planetName]; - if (regionData.tree != NULL) + if (regionData.tree != nullptr) { std::vector objects; regionData.tree->getAllObjects(objects); @@ -1222,7 +1222,7 @@ bool RegionMaster::setDynamicSpawnRegionObjectData(UniverseObject & object, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify, std::string spawntable, int duration) { - time_t const birthEpoch = ::time(NULL); + time_t const birthEpoch = ::time(nullptr); time_t const endEpoch = birthEpoch + (duration * 60); // Duration is in minutes. object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_NAME, name); diff --git a/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp b/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp index cac26554..93c8f549 100755 --- a/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp +++ b/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp @@ -132,7 +132,7 @@ bool SurveySystem::TaskSurvey::run() Client const * client = GameServer::getInstance().getClient(m_playerId); ResourceTypeObject const * typeObj = ServerUniverse::getInstance().getResourceTypeByName(*m_resourceTypeName); ResourceClassObject const * parentClass = ServerUniverse::getInstance().getResourceClassByName(*m_parentResourceClassName); - ResourcePoolObject const * pool = typeObj ? typeObj->getPoolForCurrentPlanet() : NULL; + ResourcePoolObject const * pool = typeObj ? typeObj->getPoolForCurrentPlanet() : nullptr; int distBetweenPoints = m_surveyRange / (m_numPoints - 1); // -1 is so that we get points at both ends int radius = m_surveyRange / 2; diff --git a/engine/server/library/serverGame/src/shared/space/Missile.cpp b/engine/server/library/serverGame/src/shared/space/Missile.cpp index bd4400a5..67582022 100755 --- a/engine/server/library/serverGame/src/shared/space/Missile.cpp +++ b/engine/server/library/serverGame/src/shared/space/Missile.cpp @@ -304,7 +304,7 @@ ServerObject * Missile::getSourceServerObject() const if (sourceObject) return sourceObject->asServerObject(); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -315,7 +315,7 @@ ServerObject * Missile::getTargetServerObject() const if (targetObject) return targetObject->asServerObject(); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/space/MissileManager.cpp b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp index ab30ae81..512696ff 100755 --- a/engine/server/library/serverGame/src/shared/space/MissileManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp @@ -21,7 +21,7 @@ // ====================================================================== -MissileManager * MissileManager::ms_instance = NULL; +MissileManager * MissileManager::ms_instance = nullptr; // ====================================================================== @@ -37,7 +37,7 @@ void MissileManager::install() void MissileManager::remove() { delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- @@ -217,7 +217,7 @@ Missile * MissileManager::getMissile(int missileId) if (i!=m_missiles.end()) return i->second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -228,7 +228,7 @@ const Missile * MissileManager::getConstMissile(int missileId) const if (i!=m_missiles.end()) return i->second; else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -241,13 +241,13 @@ int MissileManager::getNearestUnlockedMissileForTarget(const NetworkId &target) { const std::pair range=m_missilesForTarget.equal_range(target); - const Missile *targetedMissile=NULL; + const Missile *targetedMissile=nullptr; for (MissilesForTargetType::const_iterator i=range.first; i!=range.second; ++i) { const Missile * const missile=getConstMissile(i->second); DEBUG_FATAL(!missile,("Programmer bug: Missile %i was in m_missilesForTarget, but was not in m_missiles",i->second)); if (missile && missile->getState() == Missile::MS_Launched && - (!targetedMissile || (missile->getImpactTime() < targetedMissile->getImpactTime()))) //lint !e774: missile is non-null in debug mode + (!targetedMissile || (missile->getImpactTime() < targetedMissile->getImpactTime()))) //lint !e774: missile is non-nullptr in debug mode targetedMissile = missile; } @@ -315,7 +315,7 @@ const MissileManager::MissileTypeDataRecord * MissileManager::getMissileTypeData if (i!=m_missileTypeData.end()) return &(i->second); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp index 432d57f6..910cbcc3 100755 --- a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp +++ b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp @@ -89,7 +89,7 @@ void NebulaManagerServer::update(float elapsedTime) void NebulaManagerServer::enqueueLightning(NebulaLightningData const & nebulaLightningData) { Nebula const * const nebula = NebulaManager::getNebulaById(nebulaLightningData.nebulaId); - if (nebula == NULL) + if (nebula == nullptr) { WARNING(true, ("NebulaManagerServer::enqueueLightning invalid nebula [%d]", nebulaLightningData.nebulaId)); return; @@ -164,7 +164,7 @@ void NebulaManagerServer::handleEnqueuedLightningEvents() NebulaLightningData const & nebulaLightningData = (*it); Nebula const * const nebula = NebulaManager::getNebulaById(nebulaLightningData.nebulaId); - if (nebula == NULL) + if (nebula == nullptr) { it = s_lightningDataVector.erase(it); continue; @@ -203,7 +203,7 @@ void NebulaManagerServer::handleEnqueuedLightningEvents() ServerObject const * const serverHitObject = hitObject->asServerObject(); ShipObject const * const shipHitObject = serverHitObject->asShipObject(); - if (shipHitObject != NULL) + if (shipHitObject != nullptr) { NetworkIdTimeMap::const_iterator const oit = s_objectsRecentlyHitByLightning.find(CachedNetworkId(*hitObject)); if (oit == s_objectsRecentlyHitByLightning.end() || (*oit).second < clockTimeMs) @@ -304,7 +304,7 @@ void NebulaManagerServer::generateLightningEvents(float elapsedTime) void NebulaManagerServer::handleEnvironmentalDamage(ServerObject & victim, int nebulaId) { Nebula const * const nebula = NebulaManager::getNebulaById(nebulaId); - if (nebula == NULL) + if (nebula == nullptr) return; float const environmentalDamageFrequency = nebula->getEnvironmentalDamageFrequency(); diff --git a/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp index 61ff31b3..2354ae60 100755 --- a/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp @@ -85,7 +85,7 @@ namespace ProjectileManagerNamespace //---------------------------------------------------------------------- Projectile() : - m_owner(NULL), + m_owner(nullptr), m_weaponIndex(0), m_projectileIndex(0), m_targetedComponent(0), @@ -155,7 +155,7 @@ namespace ProjectileManagerNamespace ColliderList collidedWith; CollisionWorld::getDatabase()->queryFor(static_cast(SpatialDatabase::Q_Physicals), CellProperty::getWorldCellProperty(), true, projectileCapsule_w, collidedWith); - Object * closestObject = NULL; + Object * closestObject = nullptr; float smallestTime = 0.0f; Vector collisionPosition_o; @@ -166,14 +166,14 @@ namespace ProjectileManagerNamespace { // find which object it collided with first, and when BaseExtent const * const extent_l = (*i)->getExtent_l(); - if (extent_l == NULL) - WARNING(true, ("ProjectileManager collided with object with null extent. [%s], appearance=[%s]", collider.getDebugName(), collider.getAppearanceTemplateName())); + if (extent_l == nullptr) + WARNING(true, ("ProjectileManager collided with object with nullptr extent. [%s], appearance=[%s]", collider.getDebugName(), collider.getAppearanceTemplateName())); else { Vector const start_o = collider.rotateTranslate_w2o(projectilePosition_w); Vector const end_o = collider.rotateTranslate_w2o(projectilePosition_w + projectilePath); float time; - if (extent_l->intersect(start_o, end_o, NULL, &time)) + if (extent_l->intersect(start_o, end_o, nullptr, &time)) { if (!closestObject || time < smallestTime) { @@ -415,7 +415,7 @@ void ProjectileManager::update(float timePassed) // static ShipObject * const shipObject = projectile.getOwner(); - if (NULL == shipObject) + if (nullptr == shipObject) { WARNING(true, ("ProjectileManager beam weapon [%d] for ship id [%s], ship object no longer exists.", weaponIndex, shipId.getValueString().c_str())); } diff --git a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp index 1a0cfa50..09fb57d0 100755 --- a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp @@ -116,10 +116,10 @@ ServerAsteroidManager::FieldHandle ServerAsteroidManager::generateField(Asteroid return BAD_HANDLE; } - ServerObject * newAsteroid = NULL; + ServerObject * newAsteroid = nullptr; //TODO disable server-rotation for now, it apparently spams the client horribly -// RotationDynamics * rotationDynamics = NULL; +// RotationDynamics * rotationDynamics = nullptr; for(std::vector::iterator i = asteroidDatas.begin(); i != asteroidDatas.end(); ++i) { @@ -274,7 +274,7 @@ void ServerAsteroidManager::getServerAsteroidData(std::vector & /*OUT*/ for(std::vector::iterator i = ms_asteroids.begin(); i != ms_asteroids.end(); ++i) { Object const * const o = NetworkIdManager::getObjectById(*i); - ServerObject const * const so = o ? o->asServerObject() : NULL; + ServerObject const * const so = o ? o->asServerObject() : nullptr; if(so) { spheres.push_back(so->getSphereExtent()); @@ -297,9 +297,9 @@ void ServerAsteroidManager::sendServerAsteroidDataToPlayer(NetworkId const & pla MessageQueueGenericValueType > * const msg = new MessageQueueGenericValueType >(spheres); Object * const o = NetworkIdManager::getObjectById(player); - ServerObject * const so = o ? o->asServerObject() : NULL; - CreatureObject * const co = so ? so->asCreatureObject() : NULL; - Client const * const client = co ? co->getClient() : NULL; + ServerObject * const so = o ? o->asServerObject() : nullptr; + CreatureObject * const co = so ? so->asCreatureObject() : nullptr; + Client const * const client = co ? co->getClient() : nullptr; if(client && co && co->isAuthoritative()) { co->getController()->appendMessage(static_cast(CM_serverAsteroidDebugData), 0.0f, msg, diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp index b0817411..0fc6e7a6 100755 --- a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp +++ b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp @@ -89,7 +89,7 @@ void ServerShipComponentData::writeDataToShip (int const chassisSlot, Ship bool ServerShipComponentData::readDataFromComponent (TangibleObject const & component) { - if (component.getObjectTemplate () == NULL) + if (component.getObjectTemplate () == nullptr) { WARNING (true, ("ShipComponentData [%s] has no object template", component.getNetworkId ().getValueString ().c_str ())); return false; @@ -137,13 +137,13 @@ bool ServerShipComponentData::readDataFromComponent (TangibleObject const & comp void ServerShipComponentData::writeDataToComponent (TangibleObject & component) const { - if (m_descriptor == NULL) + if (m_descriptor == nullptr) { - WARNING (true, ("ShipComponentData::writeDataToComponent [%s] null descriptor", component.getNetworkId ().getValueString ().c_str ())); + WARNING (true, ("ShipComponentData::writeDataToComponent [%s] nullptr descriptor", component.getNetworkId ().getValueString ().c_str ())); return; } - if (component.getObjectTemplate () == NULL) + if (component.getObjectTemplate () == nullptr) { WARNING (true, ("ShipComponentData::writeDataToComponent [%s] has no object template", component.getNetworkId ().getValueString ().c_str ())); return; @@ -180,7 +180,7 @@ void ServerShipComponentData::writeDataToComponent (TangibleObject & component) void ServerShipComponentData::printDebugString (Unicode::String & result, Unicode::String const & padding) const { - if (m_descriptor == NULL) + if (m_descriptor == nullptr) return; char buf [2048]; diff --git a/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp index aca06580..81586895 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp @@ -60,8 +60,8 @@ void ShipAiEnemySearchManagerNamespace::checkForEnemies(ShipObject &ship) if (shipController) { - AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; - float const aggroRadiusSquared = sqr((aiShipController != NULL) ? aiShipController->getAggroRadius() : 512.0f); // 512.0f is the distance at which turrets on player ships start getting targets + AiShipController * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; + float const aggroRadiusSquared = sqr((aiShipController != nullptr) ? aiShipController->getAggroRadius() : 512.0f); // 512.0f is the distance at which turrets on player ships start getting targets Vector const shipPosition_w = ship.getPosition_w(); static std::vector s_visibilityList; @@ -117,7 +117,7 @@ void ShipAiEnemySearchManagerNamespace::checkForEnemies(ShipObject &ship) ShipObject * const enemy = s_enemyList[randomIndex]; ShipController * const enemyShipController = enemy->getController()->asShipController(); - if (enemyShipController != NULL) + if (enemyShipController != nullptr) { // Limit the number of ships that can attack a single enemy diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp index ba495697..bf76572c 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp @@ -165,7 +165,7 @@ void ShipComponentDataCargoHold::printDebugString (Unicode::String & result int const amount = (*it).second; ResourceTypeObject const * const resourceType = ServerUniverse::getInstance().getResourceTypeById(id); - std::string const resourceName = resourceType ? resourceType->getResourceName() : "NULL RESOURCE"; + std::string const resourceName = resourceType ? resourceType->getResourceName() : "nullptr RESOURCE"; snprintf(buf, buf_size, "%s %15s (%s): %3d\n", nPad.c_str (), id.getValueString().c_str(), resourceName.c_str(), amount); result += Unicode::narrowToWide(buf); diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp index 60053125..74e9e4f6 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp @@ -42,16 +42,16 @@ ShipComponentData * ShipComponentDataManager::create (TangibleObject const & com ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (component.getObjectTemplate ()->getCrcName ().getCrc ()); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { WARNING (true, ("ShipComponentDataManager [%s] [%s] is not a component", component.getNetworkId ().getValueString ().c_str (), component.getObjectTemplateName())); - return NULL; + return nullptr; } ShipComponentData * const shipComponent = create (*shipComponentDescriptor); if (!shipComponent) - return NULL; + return nullptr; shipComponent->readDataFromComponent (component); return shipComponent; @@ -61,7 +61,7 @@ ShipComponentData * ShipComponentDataManager::create (TangibleObject const & com ShipComponentData * ShipComponentDataManager::create (ShipComponentDescriptor const & shipComponentDescriptor) { - ShipComponentData * shipComponent = NULL; + ShipComponentData * shipComponent = nullptr; switch (shipComponentDescriptor.getComponentType ()) { @@ -106,7 +106,7 @@ ShipComponentData * ShipComponentDataManager::create (ShipComponentDescriptor co break; default: WARNING (true, ("ShipComponentDataManager::create descriptor has type [%d] invalid", shipComponentDescriptor.getComponentType ())); - return NULL; + return nullptr; } return shipComponent; diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp index 9411fb1b..98f76860 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp @@ -41,14 +41,14 @@ void ShipInternalDamageOverTime::setDamageThreshold(float damageThreshold) ShipObject * const ShipInternalDamageOverTime::getShipObject() const { Object * const object = m_shipId.getObject(); - if (object != NULL && object->isAuthoritative()) + if (object != nullptr && object->isAuthoritative()) { ServerObject * const serverObject = object->asServerObject(); - if (serverObject != NULL) + if (serverObject != nullptr) return serverObject->asShipObject(); } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -56,7 +56,7 @@ ShipObject * const ShipInternalDamageOverTime::getShipObject() const bool ShipInternalDamageOverTime::checkValidity(float & hpCurrent, float & hpMaximum) const { ShipObject * const ship = getShipObject(); - if (ship == NULL) + if (ship == nullptr) return false; if (m_chassisSlot < 0 || m_chassisSlot > ShipChassisSlotType::SCST_num_types) @@ -91,7 +91,7 @@ bool ShipInternalDamageOverTime::checkValidity(float & hpCurrent, float & hpMaxi bool ShipInternalDamageOverTime::applyDamage(float elapsedTime, float & damageApplied) const { ShipObject * const ship = getShipObject(); - if (ship == NULL) + if (ship == nullptr) return false; float hpCurrent = 0.0f; diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp index 3cc0f54f..475b2504 100755 --- a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp @@ -39,7 +39,7 @@ namespace ShipInternalDamageOverTimeManagerNamespace { GameScriptObject * const gameScriptObject = ship.getScriptObject(); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams p; p.addParam(idot.getChassisSlot()); @@ -56,7 +56,7 @@ namespace ShipInternalDamageOverTimeManagerNamespace { GameScriptObject * const gameScriptObject = ship.getScriptObject(); - if (gameScriptObject != NULL) + if (gameScriptObject != nullptr) { ScriptParams p; p.addParam(idot.getChassisSlot()); @@ -128,7 +128,7 @@ void ShipInternalDamageOverTimeManager::update(float elapsedTime) ShipObject * const shipObject = idot.getShipObject(); - if (NULL != shipObject) + if (nullptr != shipObject) notifyIdotDamage(*shipObject, idot, damageApplied); } } @@ -150,7 +150,7 @@ void ShipInternalDamageOverTimeManager::update(float elapsedTime) ShipInternalDamageOverTime const & expiredIdot = *it; ShipObject * const shipObject = expiredIdot.getShipObject(); - if (shipObject != NULL) + if (shipObject != nullptr) notifyIdotRemoval(*shipObject, expiredIdot); } } @@ -219,7 +219,7 @@ bool ShipInternalDamageOverTimeManager::removeEntry(ShipObject const & ship, int IGNORE_RETURN(s_idotVector.erase(lowerBound)); ShipObject * const shipObject = lowerBoundIdot.getShipObject(); - if (shipObject != NULL) + if (shipObject != nullptr) notifyIdotRemoval(*shipObject, lowerBoundIdot); return true; @@ -235,13 +235,13 @@ ShipInternalDamageOverTime const * const ShipInternalDamageOverTimeManager::find //-- there is no lower bound, the idot is not in the vector if (lowerBound == s_idotVector.end()) - return NULL; + return nullptr; ShipInternalDamageOverTime & lowerBoundIdot = *lowerBound; //-- the lower bound sorts greater than the new idot, therefore this is a new insertion if (idot < lowerBoundIdot) - return NULL; + return nullptr; return &lowerBoundIdot; } diff --git a/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp index de7693e5..d344d963 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp @@ -68,7 +68,7 @@ void SpaceAttackSquad::onAddUnit(NetworkId const & unit) { AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { aiShipController->setAttackSquad(this); } @@ -96,7 +96,7 @@ void SpaceAttackSquad::onNewLeader(NetworkId const & /*oldLeader*/) { AiShipController * const newLeaderAiShipController = AiShipController::getAiShipController(getLeader()); - if (newLeaderAiShipController != NULL) + if (newLeaderAiShipController != nullptr) { m_leaderOffsetPosition_l = -newLeaderAiShipController->getFormationPosition_l(); } @@ -116,7 +116,7 @@ void SpaceAttackSquad::onSetUnitFormationPosition_l(NetworkId const & unit, Vect { AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { aiShipController->setAttackFormationPosition_l(position_l); } @@ -154,7 +154,7 @@ CachedNetworkId const & SpaceAttackSquad::getPrimaryAttackTarget() const { Object * const leaderObject = getLeader().getObject(); - if (leaderObject != NULL) + if (leaderObject != nullptr) { AiShipController * const leaderAiShipController = AiShipController::asAiShipController(leaderObject->getController()); @@ -163,7 +163,7 @@ CachedNetworkId const & SpaceAttackSquad::getPrimaryAttackTarget() const #ifdef _DEBUG FormattedString<1024> fs; - char const * const text = fs.sprintf("SpaceAttackSquad::getPrimaryAttackTarget() ERROR: Why is the attack squad leader(%s) object NULL?", getLeader().getValueString().c_str()); + char const * const text = fs.sprintf("SpaceAttackSquad::getPrimaryAttackTarget() ERROR: Why is the attack squad leader(%s) object nullptr?", getLeader().getValueString().c_str()); DEBUG_WARNING(true, (text)); LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text)); #endif // _DEBUG @@ -176,7 +176,7 @@ bool SpaceAttackSquad::isAttacking() const { Object * const leaderObject = getLeader().getObject(); - if (leaderObject != NULL) + if (leaderObject != nullptr) { AiShipController * const leaderAiShipController = AiShipController::asAiShipController(leaderObject->getController()); @@ -185,7 +185,7 @@ bool SpaceAttackSquad::isAttacking() const #ifdef _DEBUG FormattedString<1024> fs; - char const * const text = fs.sprintf("SpaceAttackSquad::isAttacking() ERROR: Why is the attack squad leader(%s) object NULL?", getLeader().getValueString().c_str()); + char const * const text = fs.sprintf("SpaceAttackSquad::isAttacking() ERROR: Why is the attack squad leader(%s) object nullptr?", getLeader().getValueString().c_str()); DEBUG_WARNING(true, (text)); LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text)); #endif // _DEBUG @@ -231,7 +231,7 @@ int SpaceAttackSquad::getMaxNumberOfUnits() const NetworkId const & unit = unitMap.begin()->first; AiShipController * const unitAiShipController = AiShipController::getAiShipController(unit); - if (unitAiShipController != NULL) + if (unitAiShipController != nullptr) { if (unitAiShipController->getAttackOrders() == AiShipController::AO_holdFire) { @@ -282,10 +282,10 @@ void SpaceAttackSquad::calculateAttackRanges() { CachedNetworkId const & unit = iterUnitMap->first; Object * const unitObject = unit.getObject(); - ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL; - ShipObject * const unitShipObject = (unitServerObject != NULL) ? unitServerObject->asShipObject() : NULL; + ServerObject * const unitServerObject = (unitObject != nullptr) ? unitObject->asServerObject() : nullptr; + ShipObject * const unitShipObject = (unitServerObject != nullptr) ? unitServerObject->asShipObject() : nullptr; - if (unitShipObject != NULL) + if (unitShipObject != nullptr) { m_projectileAttackRange = std::min(m_projectileAttackRange, unitShipObject->getApproximateAttackRange()); @@ -328,10 +328,10 @@ void SpaceAttackSquad::assignNewLeader() { CachedNetworkId const & unit = iterUnitMap->first; Object * const unitObject = unit.getObject(); - ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL; - ShipObject * const unitShipObject = (unitServerObject != NULL) ? unitServerObject->asShipObject() : NULL; + ServerObject * const unitServerObject = (unitObject != nullptr) ? unitObject->asServerObject() : nullptr; + ShipObject * const unitShipObject = (unitServerObject != nullptr) ? unitServerObject->asShipObject() : nullptr; - if (unitShipObject != NULL) + if (unitShipObject != nullptr) { if (unitShipObject->isComponentFunctional(ShipChassisSlotType::SCST_engine)) { diff --git a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp index c836be74..4e4a9821 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp @@ -78,7 +78,7 @@ namespace SpaceDockingManagerNamespace explicit DockableShip(Object const & object) : m_dockPadList() { - if (object.getAppearance() != NULL) + if (object.getAppearance() != nullptr) { // What dock pads do we have, and what are their radii @@ -176,7 +176,7 @@ float SpaceDockingManagerNamespace::getCollisionRadius(Object const & object) CollisionProperty const * const collisionProperty = object.getCollisionProperty(); float radius = 0.0f; - if (collisionProperty != NULL) + if (collisionProperty != nullptr) { radius = collisionProperty->getBoundingSphere_l().getRadius(); } @@ -257,7 +257,7 @@ bool SpaceDockingManagerNamespace::getHardPoints(Object const & object, char con hardPointList.clear(); - if (object.getAppearance() != NULL) + if (object.getAppearance() != nullptr) { int hardPointIndex = 1; bool done = false; diff --git a/engine/server/library/serverGame/src/shared/space/SpacePath.cpp b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp index 6c50cee8..9834532b 100755 --- a/engine/server/library/serverGame/src/shared/space/SpacePath.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp @@ -96,7 +96,7 @@ bool SpacePath::isEmpty() const // ---------------------------------------------------------------------- void SpacePath::addReference(void const * const object, float const objectSize) { - DEBUG_FATAL(object == NULL, ("Passing a NULL object into path 0x%p.", this)); + DEBUG_FATAL(object == nullptr, ("Passing a nullptr object into path 0x%p.", this)); ++m_referenceCount; @@ -112,7 +112,7 @@ void SpacePath::addReference(void const * const object, float const objectSize) // ---------------------------------------------------------------------- void SpacePath::releaseReference(void const * const object) { - DEBUG_FATAL(object == NULL, ("Passing a NULL object into path 0x%p.", this)); + DEBUG_FATAL(object == nullptr, ("Passing a nullptr object into path 0x%p.", this)); if (--m_referenceCount < 0) { @@ -178,7 +178,7 @@ bool SpacePath::refine(int & pathRefinementsAvailable) Vector avoidancePosition_w; - bool const pathAdjusted = SpaceAvoidanceManager::getAvoidancePosition(currentTransform, collisionRadius, sweepVector, nextPosition_w, avoidancePosition_w, NULL); + bool const pathAdjusted = SpaceAvoidanceManager::getAvoidancePosition(currentTransform, collisionRadius, sweepVector, nextPosition_w, avoidancePosition_w, nullptr); if (pathAdjusted) { newTransform.setPosition_p(avoidancePosition_w); @@ -278,7 +278,7 @@ void SpacePath::requestPathResize() // ---------------------------------------------------------------------- bool SpacePath::updateCollisionRadius(void const * const object, float const objectSize) { - DEBUG_FATAL(object == NULL, ("Passing a NULL object into path(0x%p) updateCollisionRadius.", this)); + DEBUG_FATAL(object == nullptr, ("Passing a nullptr object into path(0x%p) updateCollisionRadius.", this)); bool requiresPathUpdate = false; diff --git a/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp b/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp index 79256ad5..2d9d088c 100755 --- a/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp @@ -59,9 +59,9 @@ void SpacePathManager::remove() // ---------------------------------------------------------------------- SpacePath * SpacePathManager::fetch(SpacePath * const path, void const * const object, float const objectRadius) { - SpacePath * result = NULL; + SpacePath * result = nullptr; - if (path == NULL) + if (path == nullptr) { // This is a new path, add it to the list @@ -105,7 +105,7 @@ SpacePath * SpacePathManager::fetch(SpacePath * const path, void const * const o // ---------------------------------------------------------------------- void SpacePathManager::release(SpacePath * const path, void const * const object) { - if (path == NULL) + if (path == nullptr) { return; } diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp index 332188c6..9b998274 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp @@ -95,7 +95,7 @@ void SpaceSquad::remove() // ---------------------------------------------------------------------- SpaceSquad::SpaceSquad() : Squad() - , m_guardTarget(NULL) + , m_guardTarget(nullptr) , m_guardedByList(new SpaceSquadList) , m_attackSquadList(new AttackSquadList) , m_guarding(false) @@ -109,10 +109,10 @@ SpaceSquad::~SpaceSquad() { // The the squad that I am guarding that I am no longer guarding it - if (m_guardTarget != NULL) + if (m_guardTarget != nullptr) { removeGuardTarget(); - m_guardTarget = NULL; + m_guardTarget = nullptr; } // Tell all the squads guarding me that I am not longer guardable @@ -156,7 +156,7 @@ SpacePath * SpaceSquad::getPath() const AiShipController * const aiShipController = AiShipController::getAiShipController(getLeader()); - return NULL != aiShipController ? aiShipController->getPath() : NULL; + return nullptr != aiShipController ? aiShipController->getPath() : nullptr; } // ---------------------------------------------------------------------- @@ -194,7 +194,7 @@ void SpaceSquad::track(Object const & target) const // ---------------------------------------------------------------------- void SpaceSquad::moveTo(SpacePath * const path) const { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::moveTo() squadId(%d) path(0x%p) pathSize(%u)", getId(), path, (path != NULL) ? path->getTransformList().size() : 0)); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::moveTo() squadId(%d) path(0x%p) pathSize(%u)", getId(), path, (path != nullptr) ? path->getTransformList().size() : 0)); UnitMap const & unitMap = getUnitMap(); UnitMap::const_iterator iterUnitMap = unitMap.begin(); @@ -210,7 +210,7 @@ void SpaceSquad::moveTo(SpacePath * const path) const // ---------------------------------------------------------------------- void SpaceSquad::addPatrolPath(SpacePath * const path) const { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::addPatrolPath() squadId(%d) squadSize(%u) path(0x%p) pathSize(%u)", getId(), getUnitMap().size(), path, (path != NULL) ? path->getTransformList().size() : 0)); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::addPatrolPath() squadId(%d) squadSize(%u) path(0x%p) pathSize(%u)", getId(), getUnitMap().size(), path, (path != nullptr) ? path->getTransformList().size() : 0)); UnitMap const & unitMap = getUnitMap(); UnitMap::const_iterator iterUnitMap = unitMap.begin(); @@ -293,7 +293,7 @@ bool SpaceSquad::setGuardTarget(int const squadId) #endif // _DEBUG } - return (m_guardTarget != NULL); + return (m_guardTarget != nullptr); } // ---------------------------------------------------------------------- @@ -305,14 +305,14 @@ SpaceSquad * SpaceSquad::getGuardTarget() // ---------------------------------------------------------------------- void SpaceSquad::removeGuardTarget() { - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::removeGuardTarget() squadId(%d) guardedBySquad(%d)", getId(), (m_guardTarget != NULL) ? m_guardTarget->getId() : 0)); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::removeGuardTarget() squadId(%d) guardedBySquad(%d)", getId(), (m_guardTarget != nullptr) ? m_guardTarget->getId() : 0)); //-- Tell the guard target it's no longer being guarded - if (m_guardTarget != NULL) + if (m_guardTarget != nullptr) { m_guardTarget->removeGuardedBy(*this); - m_guardTarget = NULL; + m_guardTarget = nullptr; } } @@ -360,7 +360,7 @@ void SpaceSquad::onAddUnit(NetworkId const & unit) { AiShipController * unitAiShipController = AiShipController::getAiShipController(unit); - if (unitAiShipController != NULL) + if (unitAiShipController != nullptr) { unitAiShipController->setSquad(this); @@ -391,12 +391,12 @@ void SpaceSquad::onNewLeader(NetworkId const & oldLeader) { AiShipController * const newLeaderAiShipController = AiShipController::getAiShipController(getLeader()); - if (newLeaderAiShipController != NULL) + if (newLeaderAiShipController != nullptr) { AiShipController * const oldLeaderAiShipController = AiShipController::getAiShipController(oldLeader); - LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (oldLeaderAiShipController == NULL) && (getUnitCount() > 1), "space_debug_ai", ("Squad::onNewLeader() ERROR: The old leader(%s) could not resolve to an AiShipController.", oldLeader.getValueString().c_str())); + LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (oldLeaderAiShipController == nullptr) && (getUnitCount() > 1), "space_debug_ai", ("Squad::onNewLeader() ERROR: The old leader(%s) could not resolve to an AiShipController.", oldLeader.getValueString().c_str())); - if (oldLeaderAiShipController != NULL) + if (oldLeaderAiShipController != nullptr) { newLeaderAiShipController->setCurrentPathIndex(oldLeaderAiShipController->getCurrentPathIndex()); } @@ -420,7 +420,7 @@ void SpaceSquad::onSetUnitFormationPosition_l(NetworkId const & unit, Vector con { AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { aiShipController->setFormationPosition_l(position_l); } @@ -457,13 +457,13 @@ void SpaceSquad::alter(float const deltaSeconds) AiShipController const * const leaderAiShipController = AiShipController::getAiShipController(getLeader()); - if (leaderAiShipController != NULL) + if (leaderAiShipController != nullptr) { if (isGuarding()) { SpaceSquad * const guardTarget = getGuardTarget(); - if (guardTarget != NULL) + if (guardTarget != nullptr) { m_leashAnchorPosition_w = guardTarget->getSquadPosition_w(); } @@ -499,7 +499,7 @@ void SpaceSquad::assignNewLeader() CachedNetworkId const & unit = iterUnitMap->first; AiShipController const * const unitAiShipController = AiShipController::getAiShipController(unit); - if (unitAiShipController != NULL) + if (unitAiShipController != nullptr) { if ( unitAiShipController->getShipOwner()->isComponentFunctional(ShipChassisSlotType::SCST_engine) && !unitAiShipController->isAttacking() @@ -550,7 +550,7 @@ bool SpaceSquad::isGuarding() const && !m_guardTarget) { FormattedString<1024> fs; - char const * const text = fs.sprintf("SpaceSquad::isGuarding() squadId(%d) ERROR: Why are we guarding a NULL guard target?", getId()); + char const * const text = fs.sprintf("SpaceSquad::isGuarding() squadId(%d) ERROR: Why are we guarding a nullptr guard target?", getId()); DEBUG_WARNING(true, (text)); LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text)); } @@ -572,7 +572,7 @@ bool SpaceSquad::isAttackTargetListEmpty() const NetworkId const & unit = iterUnitMap->first; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if ( (aiShipController != NULL) + if ( (aiShipController != nullptr) && !aiShipController->getAttackTargetList().isEmpty()) { result = false; @@ -623,10 +623,10 @@ Vector SpaceSquad::getAvoidanceVector(ShipObject const & unit) const } Object * const squadUnitObject = squadUnit.getObject(); - ServerObject * const squadUnitServerObject = (squadUnitObject != NULL) ? squadUnitObject->asServerObject() : NULL; - ShipObject * const squadUnitShipObject = (squadUnitServerObject != NULL) ? squadUnitServerObject->asShipObject() : NULL; + ServerObject * const squadUnitServerObject = (squadUnitObject != nullptr) ? squadUnitObject->asServerObject() : nullptr; + ShipObject * const squadUnitShipObject = (squadUnitServerObject != nullptr) ? squadUnitServerObject->asShipObject() : nullptr; - if (squadUnitShipObject != NULL) + if (squadUnitShipObject != nullptr) { Vector const & unitPosition_w = unit.getPosition_w(); Vector const & squadUnitPosition_w = squadUnitShipObject->getPosition_w(); @@ -760,7 +760,7 @@ float SpaceSquad::getLargestShipRadius() const { CachedNetworkId const & unit = iterUnitMap->first; Object const * const unitObject = unit.getObject(); - ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : NULL; + ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : nullptr; if (unitServerObject) { @@ -787,7 +787,7 @@ void SpaceSquad::refreshPathInfo() const { CachedNetworkId const & unit = iterUnitMap->first; Object const * const unitObject = unit.getObject(); - ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : NULL; + ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : nullptr; if (unitObject && unitServerObject) { IGNORE_RETURN(path->updateCollisionRadius(unitObject, unitServerObject->getRadius())); diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp index 3a93d451..f2dc3552 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp @@ -194,7 +194,7 @@ bool SpaceSquadManager::setSquadId(NetworkId const & unit, int const newSquadId) bool result = false; AiShipController * const aiShipController = AiShipController::getAiShipController(unit); - if (aiShipController != NULL) + if (aiShipController != nullptr) { result = true; @@ -239,7 +239,7 @@ bool SpaceSquadManager::setSquadId(NetworkId const & unit, int const newSquadId) // ---------------------------------------------------------------------- SpaceSquad * SpaceSquadManager::getSquad(int const squadId) { - SpaceSquad * result = NULL; + SpaceSquad * result = nullptr; SquadList::const_iterator iterSpaceSquadList = s_squadList.find(squadId); if (iterSpaceSquadList != s_squadList.end()) diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp index 9113d33f..70f5bbef 100755 --- a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp @@ -141,7 +141,7 @@ void SpaceVisibilityManager::addClient(Client & client, ServerObject & observing DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::addClient(Client & client, %s);\n",observingObject.getNetworkId().getValueString().c_str())); TrackedObjectsType::iterator i=ms_trackedObjects.find(observingObject.getNetworkId()); - TrackedObject *to=NULL; + TrackedObject *to=nullptr; if (i!=ms_trackedObjects.end()) { to=i->second; @@ -244,7 +244,7 @@ void SpaceVisibilityManager::removeObject(ServerObject & object) if (!vis) //lint !e774 //always false (in debug build only) return; delete vis; - vis=NULL; + vis=nullptr; object.removeNotification(VisibleObjectNotification::getInstance(),true); } @@ -534,7 +534,7 @@ TrackedObject::TrackedObject(const ServerObject &object, int updateRadius) : m_object(object), m_updateRadius(updateRadius), m_currentLocation(NodeId(object.getPosition_w())), - m_clients(NULL) + m_clients(nullptr) { ms_trackedObjects[object.getNetworkId()]=this; addToNodesInRange(*this, m_currentLocation, updateRadius); @@ -554,7 +554,7 @@ TrackedObject::~TrackedObject() } delete m_clients; - m_clients=NULL; + m_clients=nullptr; } removeFromNodesInRange(*this, m_currentLocation, m_updateRadius); @@ -572,7 +572,7 @@ const CachedNetworkId & TrackedObject::getNetworkId() const bool TrackedObject::hasClients() const { - return (m_clients != NULL); + return (m_clients != nullptr); } // ---------------------------------------------------------------------- @@ -594,7 +594,7 @@ void TrackedObject::removeClient(Client &client) if (m_clients->empty()) { delete m_clients; - m_clients=NULL; + m_clients=nullptr; getNode(m_currentLocation).removeObservingObject(*this); } diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp index ca2e7048..b074a95d 100755 --- a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp +++ b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp @@ -87,7 +87,7 @@ namespace InstallationSynchronizedUiNamespace InstallationResourceData makeInstallationResourceData (const NetworkId & id, const Vector & position) { ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeById(id); - ResourcePoolObject const * const pool = rto ? rto->getPoolForCurrentPlanet() : NULL; + ResourcePoolObject const * const pool = rto ? rto->getPoolForCurrentPlanet() : nullptr; if (rto && pool) { std::string const & resourceTypeParent = rto->getParentClass().getResourceClassName(); @@ -219,7 +219,7 @@ void InstallationSynchronizedUi::resetResourcePools () HarvesterInstallationObject * const harvester = dynamic_cast(getOwner ()); NOT_NULL (harvester); - if (harvester) //lint !e774 // harvester is not NULL in debug + if (harvester) //lint !e774 // harvester is not nullptr in debug { std::vector const & pools = harvester->getSurveyTypes(); for (std::vector::const_iterator i=pools.begin(); i!=pools.end(); ++i) diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp index a0b2f63b..c486c67f 100755 --- a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp +++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp @@ -385,7 +385,7 @@ void ServerSecureTrade::completeTrade() } if (dynamic_cast(item)) { - if (!ContainerInterface::canTransferTo(recipientInventory, *item, NULL, errorCode)) + if (!ContainerInterface::canTransferTo(recipientInventory, *item, nullptr, errorCode)) { ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode); ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode); @@ -397,7 +397,7 @@ void ServerSecureTrade::completeTrade() } else { - if (!ContainerInterface::canTransferTo(recipientDatapad, *item, NULL, errorCode)) + if (!ContainerInterface::canTransferTo(recipientDatapad, *item, nullptr, errorCode)) { ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode); ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode); @@ -423,7 +423,7 @@ void ServerSecureTrade::completeTrade() } if (dynamic_cast(item)) { - if (!ContainerInterface::canTransferTo(initiatorInventory, *item, NULL, errorCode)) + if (!ContainerInterface::canTransferTo(initiatorInventory, *item, nullptr, errorCode)) { ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode); ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode); @@ -434,7 +434,7 @@ void ServerSecureTrade::completeTrade() } else { - if (!ContainerInterface::canTransferTo(initiatorDatapad, *item, NULL, errorCode)) + if (!ContainerInterface::canTransferTo(initiatorDatapad, *item, nullptr, errorCode)) { ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode); ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode); @@ -516,7 +516,7 @@ void ServerSecureTrade::completeTrade() NOT_NULL(item); if (dynamic_cast(item)) { - if (!ContainerInterface::transferItemToVolumeContainer(*recipientInventory, *item, NULL, errorCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*recipientInventory, *item, nullptr, errorCode)) { DEBUG_FATAL(true, ("Secure trade transfer failure in initiator transfer!!\n")); LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str())); @@ -529,7 +529,7 @@ void ServerSecureTrade::completeTrade() } else { - if (!ContainerInterface::transferItemToVolumeContainer(*recipientDatapad, *item, NULL, errorCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*recipientDatapad, *item, nullptr, errorCode)) { DEBUG_FATAL(true, ("Secure trade transfer failure in initiator transfer!!\n")); LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str())); @@ -550,7 +550,7 @@ void ServerSecureTrade::completeTrade() NOT_NULL(item); if (dynamic_cast(item)) { - if (!ContainerInterface::transferItemToVolumeContainer(*initiatorInventory, *item, NULL, errorCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*initiatorInventory, *item, nullptr, errorCode)) { DEBUG_FATAL(true, ("Secure trade transfer failure in recipient transfer!!\n")); LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str())); @@ -564,7 +564,7 @@ void ServerSecureTrade::completeTrade() } else { - if (!ContainerInterface::transferItemToVolumeContainer(*initiatorDatapad, *item, NULL, errorCode)) + if (!ContainerInterface::transferItemToVolumeContainer(*initiatorDatapad, *item, nullptr, errorCode)) { DEBUG_FATAL(true, ("Secure trade transfer failure in recipient transfer!!\n")); LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str())); @@ -602,12 +602,12 @@ void ServerSecureTrade::logTradeitemContents(const CreatureObject & to, const ServerObject & item, const CreatureObject & from) const { const Container * container = ContainerInterface::getContainer(item); - if (container != NULL) + if (container != nullptr) { for (ContainerConstIterator i = container->begin(); i != container->end(); ++i) { const Object * o = (*i).getObject(); - if (o != NULL) + if (o != nullptr) { const ServerObject * content = safe_cast(o); LOG("CustomerService", ("Trade:%s received %s contained in %s from %s", diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp index 525fc1b6..2f314ed8 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp @@ -14,7 +14,7 @@ GameNetworkMessage("TaskConnectionIdMessage"), serverType(static_cast(id)), commandLine(pCommandLine), clusterName(pClusterName), -currentEpochTime(static_cast(::time(NULL))) +currentEpochTime(static_cast(::time(nullptr))) { addVariable(serverType); addVariable(commandLine); diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp index b7417e7b..f51e9f06 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp @@ -10,7 +10,7 @@ // ====================================================================== -AccountFeatureIdResponse::AccountFeatureIdResponse(NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map const & featureIds, std::map const & sessionFeatureIdsData, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/) : +AccountFeatureIdResponse::AccountFeatureIdResponse(NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map const & featureIds, std::map const & sessionFeatureIdsData, const char * sessionResultString /*= nullptr*/, const char * sessionResultText /*= nullptr*/) : GameNetworkMessage("AccountFeatureIdResponse"), m_requester(requester), m_gameServer(gameServer), diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h index 3bf69cd3..356d75e6 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h @@ -19,7 +19,7 @@ class AccountFeatureIdResponse : public GameNetworkMessage { public: - AccountFeatureIdResponse (NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map const & featureIds, std::map const & sessionFeatureIdsData, const char * sessionResultString = NULL, const char * sessionResultText = NULL); + AccountFeatureIdResponse (NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map const & featureIds, std::map const & sessionFeatureIdsData, const char * sessionResultString = nullptr, const char * sessionResultText = nullptr); AccountFeatureIdResponse (Archive::ReadIterator & source); virtual ~AccountFeatureIdResponse (); diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp index 55ec5da9..5a118fce 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp @@ -10,7 +10,7 @@ // ====================================================================== -AdjustAccountFeatureIdResponse::AdjustAccountFeatureIdResponse(NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/) : +AdjustAccountFeatureIdResponse::AdjustAccountFeatureIdResponse(NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString /*= nullptr*/, const char * sessionResultText /*= nullptr*/) : GameNetworkMessage("AdjustAccountFeatureIdResponse"), m_requestingPlayer(requestingPlayer), m_gameServer(gameServer), diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h index 940937ac..cecf0530 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h @@ -18,7 +18,7 @@ class AdjustAccountFeatureIdResponse : public GameNetworkMessage { public: - AdjustAccountFeatureIdResponse (NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString = NULL, const char * sessionResultText = NULL); + AdjustAccountFeatureIdResponse (NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString = nullptr, const char * sessionResultText = nullptr); AdjustAccountFeatureIdResponse (Archive::ReadIterator & source); virtual ~AdjustAccountFeatureIdResponse (); @@ -37,7 +37,7 @@ public: bool getResultCameFromSession() const; std::string const & getSessionResultString() const; std::string const & getSessionResultText() const; - void setSessionResultCode(unsigned int resultCode, const char * sessionResultString = NULL, const char * sessionResultText = NULL); + void setSessionResultCode(unsigned int resultCode, const char * sessionResultString = nullptr, const char * sessionResultText = nullptr); private: Archive::AutoVariable m_requestingPlayer; @@ -169,7 +169,7 @@ inline std::string const & AdjustAccountFeatureIdResponse::getSessionResultText( // ---------------------------------------------------------------------- -inline void AdjustAccountFeatureIdResponse::setSessionResultCode(unsigned int resultCode, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/) +inline void AdjustAccountFeatureIdResponse::setSessionResultCode(unsigned int resultCode, const char * sessionResultString /*= nullptr*/, const char * sessionResultText /*= nullptr*/) { m_resultCode.set(resultCode); diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp index 92b86d2c..34c3de3f 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp @@ -19,7 +19,7 @@ RequestSceneTransfer::RequestSceneTransfer(const NetworkId &oid, const std::stri m_containerName(), m_scriptCallback() { - if (scriptCallback != NULL) + if (scriptCallback != nullptr) m_scriptCallback.set(scriptCallback); addVariable(m_oid); @@ -45,7 +45,7 @@ RequestSceneTransfer::RequestSceneTransfer(const NetworkId &oid, const std::stri m_containerName(containerName), m_scriptCallback() { - if (scriptCallback != NULL) + if (scriptCallback != nullptr) m_scriptCallback.set(scriptCallback); addVariable(m_oid); diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h index e7780d16..0fc2e843 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h +++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h @@ -21,8 +21,8 @@ class RequestSceneTransfer : public GameNetworkMessage { public: - RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &containerId, const char * scriptCallback = NULL); - RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &buildingId, const std::string &containerName, const char * scriptCallback = NULL); + RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &containerId, const char * scriptCallback = nullptr); + RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &buildingId, const std::string &containerName, const char * scriptCallback = nullptr); RequestSceneTransfer(Archive::ReadIterator & source); ~RequestSceneTransfer(); diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp index d976dd62..007706a8 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp @@ -254,7 +254,7 @@ namespace SetupServerNetworkMessagesNamespace } MessageQueue::Data* unpackNothing(Archive::ReadIterator &) { - return NULL; + return nullptr; } void packVectorNetworkIdVector(const MessageQueue::Data * data, Archive::ByteStream & target) diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp index 95dc3fd7..74213208 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp @@ -37,9 +37,9 @@ void AiCreatureStateMessage::pack(MessageQueue::Data const * const data, Archive { AiCreatureStateMessage const * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { - if (GameServerMessageInterface::getInstance() != NULL) + if (GameServerMessageInterface::getInstance() != nullptr) { GameServerMessageInterface::getInstance()->pack(target, *msg); } @@ -52,7 +52,7 @@ MessageQueue::Data * AiCreatureStateMessage::unpack(Archive::ReadIterator & sour { AiCreatureStateMessage * msg = new AiCreatureStateMessage(); - if (GameServerMessageInterface::getInstance() != NULL) + if (GameServerMessageInterface::getInstance() != nullptr) { GameServerMessageInterface::getInstance()->unpack(source, *msg); } diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp index fde8e298..c87b7c66 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp @@ -61,7 +61,7 @@ void AiMovementMessage::pack(const MessageQueue::Data* const data, Archive::Byte const AiMovementMessage * const msg = safe_cast (data); if (msg) { - if (GameServerMessageInterface::getInstance() != NULL) + if (GameServerMessageInterface::getInstance() != nullptr) GameServerMessageInterface::getInstance()->pack(target, *msg); } } @@ -72,7 +72,7 @@ MessageQueue::Data* AiMovementMessage::unpack(Archive::ReadIterator & source) { AiMovementMessage * msg = new AiMovementMessage(); - if (GameServerMessageInterface::getInstance() != NULL) + if (GameServerMessageInterface::getInstance() != nullptr) GameServerMessageInterface::getInstance()->unpack(source, *msg); return msg; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp index 5872a21e..e898606f 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp @@ -13,7 +13,7 @@ //----------------------------------------------------------------------- -GameServerMessageInterface * GameServerMessageInterface::ms_instance = NULL; +GameServerMessageInterface * GameServerMessageInterface::ms_instance = nullptr; //======================================================================= @@ -27,14 +27,14 @@ GameServerMessageInterface::GameServerMessageInterface() GameServerMessageInterface::~GameServerMessageInterface() { if (ms_instance == this) - ms_instance = NULL; + ms_instance = nullptr; } //----------------------------------------------------------------------- void GameServerMessageInterface::setInstance(GameServerMessageInterface * instance) { - if (ms_instance == NULL) + if (ms_instance == nullptr) ms_instance = instance; else if (ms_instance != instance) { diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp index bd4cae1a..8aa0309a 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp @@ -64,11 +64,11 @@ RenameCharacterMessageEx::RenameCharacterMessageEx(RenameCharacterMessageSource static Unicode::String const delimiters(Unicode::narrowToWide(" ")); Unicode::UnicodeStringVector newNameTokens; - if (!Unicode::tokenize(newName, newNameTokens, &delimiters, NULL)) + if (!Unicode::tokenize(newName, newNameTokens, &delimiters, nullptr)) newNameTokens.clear(); Unicode::UnicodeStringVector oldNameTokens; - if (!Unicode::tokenize(oldName, oldNameTokens, &delimiters, NULL)) + if (!Unicode::tokenize(oldName, oldNameTokens, &delimiters, nullptr)) oldNameTokens.clear(); m_lastNameChangeOnly.set(((newNameTokens.size() >= 1) && (oldNameTokens.size() >= 1) && Unicode::caseInsensitiveCompare(newNameTokens[0], oldNameTokens[0]))); diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraph.cpp b/engine/server/library/serverPathfinding/src/shared/CityPathGraph.cpp index 2f14d0ac..8ec08af5 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraph.cpp +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraph.cpp @@ -72,13 +72,13 @@ CityPathGraph::CityPathGraph ( int cityToken ) CityPathGraph::~CityPathGraph() { delete m_namedNodes; - m_namedNodes = NULL; + m_namedNodes = nullptr; delete m_nodeTree; - m_nodeTree = NULL; + m_nodeTree = nullptr; delete m_dirtyBoxes; - m_dirtyBoxes = NULL; + m_dirtyBoxes = nullptr; } // ---------------------------------------------------------------------- @@ -92,7 +92,7 @@ int CityPathGraph::addNode ( DynamicPathNode * newNode ) int index = DynamicPathGraph::addNode(newNode); SpatialHandle * handle = m_nodeTree->addObject( cityNode ); - if (handle != NULL) + if (handle != nullptr) { if (cityNode->getName() != Unicode::emptyString) { @@ -134,7 +134,7 @@ void CityPathGraph::removeNode ( int nodeIndex ) SpatialHandle * handle = cityNode->getSpatialHandle(); - if (m_namedNodes != NULL) + if (m_namedNodes != nullptr) { std::map >::iterator found = m_namedNodes->find(cityNode->getName()); if (found != m_namedNodes->end()) @@ -146,7 +146,7 @@ void CityPathGraph::removeNode ( int nodeIndex ) } m_nodeTree->removeObject( handle ); - cityNode->setSpatialHandle(NULL); + cityNode->setSpatialHandle(nullptr); DynamicPathGraph::removeNode(nodeIndex); } @@ -160,7 +160,7 @@ void CityPathGraph::destroyNode ( int nodeIndex ) { CityPathNode * cityNode = _getNode(nodeIndex); - if(cityNode == NULL) return; + if(cityNode == nullptr) return; // ---------- // Remember which nodes were adjacent to the node we're removing @@ -185,7 +185,7 @@ void CityPathGraph::destroyNode ( int nodeIndex ) m_nodeTree->removeObject( handle ); - cityNode->setSpatialHandle(NULL); + cityNode->setSpatialHandle(nullptr); // ---------- // Remove the node @@ -217,7 +217,7 @@ void CityPathGraph::moveNode ( int nodeIndex, Vector const & newPosition ) { CityPathNode * cityNode = _getNode(nodeIndex); - if(cityNode == NULL) return; + if(cityNode == nullptr) return; // ---------- // Remember which nodes were adjacent to the node we're removing @@ -272,7 +272,7 @@ void CityPathGraph::relinkNode ( int nodeIndex ) { CityPathNode * nodeA = _getNode(nodeIndex); - if(nodeA == NULL) return; + if(nodeA == nullptr) return; // ---------- @@ -293,16 +293,16 @@ void CityPathGraph::relinkNode ( int nodeIndex ) { CityPathNode * nodeB = _getNode(i); - if(nodeB == NULL) continue; + if(nodeB == nullptr) continue; if(nodeA == nodeB) continue; PathNodeType typeB = nodeB->getType(); if(typeB != PNT_CityBuildingEntrance) continue; - if(nodeA->getCreatorObject() == NULL) continue; + if(nodeA->getCreatorObject() == nullptr) continue; - if(nodeB->getCreatorObject() == NULL) continue; + if(nodeB->getCreatorObject() == nullptr) continue; if(nodeA->getCreatorObject() != nodeB->getCreatorObject()) continue; @@ -330,16 +330,16 @@ void CityPathGraph::relinkNode ( int nodeIndex ) { CityPathNode * nodeB = _getNode(i); - if(nodeB == NULL) continue; + if(nodeB == nullptr) continue; if(nodeA == nodeB) continue; PathNodeType typeB = nodeB->getType(); if(typeB != PNT_CityBuilding) continue; - if(nodeA->getCreatorObject() == NULL) continue; + if(nodeA->getCreatorObject() == nullptr) continue; - if(nodeB->getCreatorObject() == NULL) continue; + if(nodeB->getCreatorObject() == nullptr) continue; if(nodeA->getCreatorObject() != nodeB->getCreatorObject()) continue; @@ -367,7 +367,7 @@ void CityPathGraph::relinkNode ( int nodeIndex ) { CityPathNode * nodeB = static_cast(results[i]); - if(nodeB == NULL) continue; + if(nodeB == nullptr) continue; if(nodeA == nodeB) continue; PathNodeType typeB = nodeB->getType(); @@ -420,7 +420,7 @@ void CityPathGraph::relinkNode ( int nodeIndex ) { CityPathNode * neighborNode = _getNode(neighborList[i]); - if(neighborNode != NULL) + if(neighborNode != nullptr) { neighborNode->markRedundantEdges(); neighborNode->removeMarkedEdges(); @@ -467,11 +467,11 @@ CityPathNode * CityPathGraph::findNodeForObject ( ServerObject const & object ) { CityPathNode * node = _getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; ServerObject const * source = node->getSourceObject(); - if(source == NULL) continue; + if(source == nullptr) continue; if(source == &object) { @@ -479,7 +479,7 @@ CityPathNode * CityPathGraph::findNodeForObject ( ServerObject const & object ) } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -492,11 +492,11 @@ CityPathNode const * CityPathGraph::findNodeForObject ( ServerObject const & obj { CityPathNode const * node = _getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; ServerObject const * source = node->getSourceObject(); - if(source == NULL) continue; + if(source == nullptr) continue; if(source == &object) { @@ -504,15 +504,15 @@ CityPathNode const * CityPathGraph::findNodeForObject ( ServerObject const & obj } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- CityPathNode * CityPathGraph::findNearestNodeForName( Unicode::String const & nodeName, Vector const & pos ) { - if (m_namedNodes == NULL) - return NULL; + if (m_namedNodes == nullptr) + return nullptr; std::map >::iterator found = m_namedNodes->find(nodeName); if (found != m_namedNodes->end() && !found->second.empty()) @@ -521,12 +521,12 @@ CityPathNode * CityPathGraph::findNearestNodeForName( Unicode::String const & no if (nodes.size() == 1) return *(nodes.begin()); - CityPathNode * node = NULL; + CityPathNode * node = nullptr; float distance = FLT_MAX; for (std::set::iterator i = nodes.begin(); i != nodes.end(); ++i) { float testDistance = pos.magnitudeBetweenSquared((*i)->getPosition_w()); - if (node == NULL || testDistance < distance) + if (node == nullptr || testDistance < distance) { distance = testDistance; node = *i; @@ -535,15 +535,15 @@ CityPathNode * CityPathGraph::findNearestNodeForName( Unicode::String const & no return node; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- CityPathNode const * CityPathGraph::findNearestNodeForName( Unicode::String const & nodeName, Vector const & pos ) const { - if (m_namedNodes == NULL) - return NULL; + if (m_namedNodes == nullptr) + return nullptr; std::map >::const_iterator found = m_namedNodes->find(nodeName); if (found != m_namedNodes->end() && !found->second.empty()) @@ -552,12 +552,12 @@ CityPathNode const * CityPathGraph::findNearestNodeForName( Unicode::String cons if (nodes.size() == 1) return *(nodes.begin()); - CityPathNode const * node = NULL; + CityPathNode const * node = nullptr; float distance = FLT_MAX; for (std::set::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { float testDistance = pos.magnitudeBetweenSquared((*i)->getPosition_w()); - if (node == NULL || testDistance < distance) + if (node == nullptr || testDistance < distance) { distance = testDistance; node = *i; @@ -566,14 +566,14 @@ CityPathNode const * CityPathGraph::findNearestNodeForName( Unicode::String cons return node; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- int CityPathGraph::findNearestNode ( Vector const & position ) const { - PathNode * temp = NULL; + PathNode * temp = nullptr; float dummy1 = REAL_MAX; float dummy2 = REAL_MAX; @@ -713,7 +713,7 @@ int CityPathGraph::getNeighborCode ( int whichNode ) const { CityPathNode const * node = _getNode(whichNode); - if(node == NULL) return 0; + if(node == nullptr) return 0; int edgeCount = node->getEdgeCount(); @@ -725,7 +725,7 @@ int CityPathGraph::getNeighborCode ( int whichNode ) const CityPathNode const * neighbor = _getNode(neighborId); - if(neighbor == NULL) continue; + if(neighbor == nullptr) continue; int neighborInt = reinterpret_cast(neighbor); diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp index 3e511c3c..9194452e 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp +++ b/engine/server/library/serverPathfinding/src/shared/CityPathGraphManager.cpp @@ -58,7 +58,7 @@ struct RegionCacheEntry { RegionCacheEntry ( void ) - : m_shape(), m_graph(NULL) + : m_shape(), m_graph(nullptr) { } @@ -143,7 +143,7 @@ void CityPathGraphManager::update ( float time ) CityPathGraph * graph = g_regionCache[g_scrubberGraphIndex].m_graph; - if(graph == NULL) return; + if(graph == nullptr) return; if(g_scrubberNodeIndex >= graph->getNodeCount()) { @@ -156,7 +156,7 @@ void CityPathGraphManager::update ( float time ) g_scrubberNodeIndex++; - if(node == NULL) return; + if(node == nullptr) return; if(!node->sanityCheck(false)) { @@ -233,14 +233,14 @@ Region const * getCityRegionFor( Vector const & position ) return results[0]; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- int getCityTokenFor ( Region const * region ) { - if(region == NULL) return -1; + if(region == nullptr) return -1; Unicode::String const & name = region->getName(); @@ -294,7 +294,7 @@ bool checkRegionCache ( Vector const & position, CityPathGraph * & outGraph ) bool addToRegionCache ( MultiShape const & shape, CityPathGraph * graph ) { - if(graph == NULL) return false; + if(graph == nullptr) return false; RegionCacheEntry entry(shape,graph); @@ -325,12 +325,12 @@ bool addToRegionCache ( AxialBox const & box, CityPathGraph * graph ) bool addToRegionCache ( Region const * region, CityPathGraph * graph ) { - if(region == NULL) return false; - if(graph == NULL) return false; + if(region == nullptr) return false; + if(graph == nullptr) return false; MxCifQuadTreeBounds const * bounds = ®ion->getBounds(); - if(bounds == NULL) return false; + if(bounds == nullptr) return false; MxCifQuadTreeCircleBounds const * circleBounds = dynamic_cast(bounds); @@ -390,7 +390,7 @@ CityPathGraph * createCityGraphFor ( Region const * region ) { int token = getCityTokenFor(region); - if(token == -1) return NULL; + if(token == -1) return nullptr; CityPathGraph * graph = new CityPathGraph(token); @@ -401,7 +401,7 @@ CityPathGraph * createCityGraphFor ( Region const * region ) CityPathGraph * createCityGraphFor ( ServerObject const * creator, MultiShape const & shape ) { - if(creator == NULL) return NULL; + if(creator == nullptr) return nullptr; CityPathGraph * newGraph = new CityPathGraph(-1); @@ -416,7 +416,7 @@ CityPathGraph * createCityGraphFor ( ServerObject const * creator, MultiShape co CityPathGraph * _getCityGraphFor ( Vector const & position ) { - CityPathGraph * graph = NULL; + CityPathGraph * graph = nullptr; if(checkRegionCache(position,graph)) { @@ -436,9 +436,9 @@ CityPathGraph * _getCityGraphFor ( Vector const & position ) CityPathGraph * _getCityGraphFor ( ServerObject const * object ) { - if(object == NULL) + if(object == nullptr) { - return NULL; + return nullptr; } else { @@ -450,8 +450,8 @@ CityPathGraph * _getCityGraphFor ( ServerObject const * object ) CityPathNode * _getCityNodeFor ( ServerObject const * object, CityPathGraph * graph ) { - if(object == NULL) return NULL; - if(graph == NULL) return NULL; + if(object == nullptr) return nullptr; + if(graph == nullptr) return nullptr; return graph->findNodeForObject(*object); } @@ -462,7 +462,7 @@ CityPathNode * _getCityNodeFor ( ServerObject const * object ) { CityPathGraph * graph = _getCityGraphFor(object); - if(graph == NULL) return NULL; + if(graph == nullptr) return nullptr; return _getCityNodeFor(object,graph); } @@ -471,19 +471,19 @@ CityPathNode * _getCityNodeFor ( ServerObject const * object ) PathGraph const * _getExteriorGraph ( ServerObject const * object ) { - if(object == NULL) return NULL; + if(object == nullptr) return nullptr; CollisionProperty const * collision = object->getCollisionProperty(); - if(collision == NULL) return NULL; + if(collision == nullptr) return nullptr; Floor const * floor = collision->getFloor(); - if(floor == NULL) return NULL; + if(floor == nullptr) return nullptr; FloorMesh const * floorMesh = floor->getFloorMesh(); - if(floorMesh == NULL) return NULL; + if(floorMesh == nullptr) return nullptr; PathGraph const * pathGraph = safe_cast(floorMesh->getPathGraph()); @@ -507,8 +507,8 @@ CityPathGraph const * CityPathGraphManager::getCityGraphFor ( Vector const & pos CityPathNode const * CityPathGraphManager::getNamedNodeFor( ServerObject const & object, Unicode::String const & nodeName ) { CityPathGraph const * cityGraph = getCityGraphFor(&object); - if (cityGraph == NULL) - return NULL; + if (cityGraph == nullptr) + return nullptr; return cityGraph->findNearestNodeForName(nodeName, object.getPosition_w()); } @@ -517,7 +517,7 @@ CityPathNode const * CityPathGraphManager::getNamedNodeFor( ServerObject const & bool CityPathGraphManager::getClosestPathNodePos ( ServerObject const * object, Vector & outPos ) { - if(object == NULL) return false; + if(object == nullptr) return false; if(object->getParentCell() == CellProperty::getWorldCellProperty()) { @@ -548,11 +548,11 @@ bool CityPathGraphManager::getClosestPathNodePos ( ServerObject const * object, void CityPathGraphManager::addWaypoint ( ServerObject * sourceObject ) { - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; CityPathGraph * graph = _getCityGraphFor(sourceObject); - if(graph == NULL) + if(graph == nullptr) { return; } @@ -561,7 +561,7 @@ void CityPathGraphManager::addWaypoint ( ServerObject * sourceObject ) DynamicVariableList const & objvars = sourceObject->getObjVars(); - CityPathNode * newNode = NULL; + CityPathNode * newNode = nullptr; Vector sourcePos_w = sourceObject->getPosition_w(); @@ -626,11 +626,11 @@ void CityPathGraphManager::removeWaypoint ( ServerObject * sourceObject ) { CityPathGraph * graph = _getCityGraphFor(sourceObject); - if(graph == NULL) return; + if(graph == nullptr) return; CityPathNode * unloadingNode = _getCityNodeFor(sourceObject,graph); - if(unloadingNode == NULL) return; + if(unloadingNode == nullptr) return; // ---------- @@ -679,15 +679,15 @@ void CityPathGraphManager::moveWaypoint ( ServerObject * sourceObject, Vector co { UNREF(oldPosition); - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; CityPathGraph * graph = _getCityGraphFor(sourceObject); - if(graph == NULL) return; + if(graph == nullptr) return; CityPathNode * node = _getCityNodeFor(sourceObject,graph); - if(node == NULL) return; + if(node == nullptr) return; // ---------- @@ -719,11 +719,11 @@ void CityPathGraphManager::moveWaypoint ( ServerObject * sourceObject, Vector co void CityPathGraphManager::addBuilding ( BuildingObject * building ) { - if(building == NULL) return; + if(building == nullptr) return; CityPathGraph * graph = _getCityGraphFor(building); - if(graph == NULL) + if(graph == nullptr) { return; } @@ -752,11 +752,11 @@ void CityPathGraphManager::addBuilding ( BuildingObject * building ) { ServerObject * serverObject = ServerWorld::findObjectByNetworkId(ids[i]); - if(serverObject == NULL) continue; + if(serverObject == nullptr) continue; CityPathNode * node = _getCityNodeFor(serverObject,graph); - if(node == NULL) continue; + if(node == nullptr) continue; node->setCreator(building->getNetworkId()); } @@ -783,11 +783,11 @@ void CityPathGraphManager::destroyBuilding ( BuildingObject * building ) void CityPathGraphManager::moveBuilding ( BuildingObject * building, Vector const & oldPosition ) { - if(building == NULL) return; + if(building == nullptr) return; CityPathGraph * graph = _getCityGraphFor(building); - if(graph == NULL) return; + if(graph == nullptr) return; UNREF(oldPosition); @@ -800,11 +800,11 @@ void CityPathGraphManager::moveBuilding ( BuildingObject * building, Vector cons { ServerObject * serverObject = ServerWorld::findObjectByNetworkId(ids[i]); - if(serverObject == NULL) continue; + if(serverObject == nullptr) continue; CityPathNode * node = _getCityNodeFor(serverObject,graph); - if(node == NULL) continue; + if(node == nullptr) continue; Vector relativePos_o = node->getRelativePosition_o(); @@ -851,7 +851,7 @@ bool CityPathGraphManager::destroyPathGraph ( ServerObject const * creator ) bool CityPathGraphManager::createPathNodes ( ServerObject * building ) { - if(building == NULL) return false; + if(building == nullptr) return false; // Destroy any old path nodes for the building @@ -862,7 +862,7 @@ bool CityPathGraphManager::createPathNodes ( ServerObject * building ) PathGraph const * pathGraph = _getExteriorGraph(building); - if(pathGraph == NULL) return false; + if(pathGraph == nullptr) return false; // ---------- // Go through all the nodes in the building's graph and create city @@ -878,7 +878,7 @@ bool CityPathGraphManager::createPathNodes ( ServerObject * building ) { PathNode const * node = pathGraph->getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; // ---------- @@ -975,11 +975,11 @@ void CityPathGraphManager::destroyWaypoint ( ServerObject * object ) { CityPathGraph * graph = _getCityGraphFor(object); - if(graph == NULL) return; + if(graph == nullptr) return; CityPathNode * deadNode = _getCityNodeFor(object,graph); - if(deadNode == NULL) return; + if(deadNode == nullptr) return; // ---------- @@ -1025,11 +1025,11 @@ void CityPathGraphManager::destroyWaypoint ( ServerObject * object ) bool CityPathGraphManager::destroyPathNodes ( ServerObject * object ) { - if(object == NULL) return false; + if(object == nullptr) return false; BuildingObject * building = dynamic_cast(object); - if(building == NULL) return false; + if(building == nullptr) return false; NetworkIdList ids; if (!building->getObjVars().getItem(OBJVAR_PATHFINDING_BUILDING_WAYPOINTS,ids)) return false; @@ -1044,7 +1044,7 @@ bool CityPathGraphManager::destroyPathNodes ( ServerObject * object ) ServerObject * serverObject = ServerWorld::findObjectByNetworkId(id); - if(serverObject == NULL) continue; + if(serverObject == nullptr) continue; serverObject->permanentlyDestroy(DeleteReasons::Replaced); } @@ -1156,7 +1156,7 @@ void CityPathGraphManager::setLinkDistance ( float dist ) void CityPathGraphManager::relinkGraph ( CityPathGraph const * constGraph ) { - if(constGraph == NULL) return; + if(constGraph == nullptr) return; CityPathGraph * graph = const_cast(constGraph); diff --git a/engine/server/library/serverPathfinding/src/shared/CityPathNode.cpp b/engine/server/library/serverPathfinding/src/shared/CityPathNode.cpp index 8e4df130..11000b37 100755 --- a/engine/server/library/serverPathfinding/src/shared/CityPathNode.cpp +++ b/engine/server/library/serverPathfinding/src/shared/CityPathNode.cpp @@ -46,7 +46,7 @@ CityPathNode::CityPathNode ( Vector const & position_w, NetworkId const & source m_source(sourceId), m_creator(), m_relativePosition_o(Vector::zero), - m_spatialHandle(NULL), + m_spatialHandle(nullptr), m_debugId( gs_debugIdCounter++ ) { snapToTerrain(); @@ -59,7 +59,7 @@ CityPathNode::CityPathNode ( Vector const & position_w, NetworkId const & source m_source(sourceId), m_creator(creatorId), m_relativePosition_o(Vector::zero), - m_spatialHandle(NULL), + m_spatialHandle(nullptr), m_debugId( gs_debugIdCounter++ ) { updateRelativePosition(); @@ -158,7 +158,7 @@ void CityPathNode::loadInfoFromObjvars ( void ) { ServerObject const * sourceObject = getSourceObject(); - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; const DynamicVariableList & objvars = sourceObject->getObjVars(); @@ -188,7 +188,7 @@ void CityPathNode::loadEdgesFromObjvars ( void ) { ServerObject const * sourceObject = getSourceObject(); - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; DynamicVariableList const & objvars = sourceObject->getObjVars(); @@ -203,11 +203,11 @@ void CityPathNode::loadEdgesFromObjvars ( void ) { ServerObject * serverObject = ServerWorld::findObjectByNetworkId( idList[i] ); - if(serverObject == NULL) continue; + if(serverObject == nullptr) continue; CityPathNode * otherNode = _getGraph()->findNodeForObject(*serverObject); - if(otherNode == NULL) continue; + if(otherNode == nullptr) continue; addEdge(otherNode->getIndex()); otherNode->addEdge(getIndex()); @@ -233,7 +233,7 @@ void CityPathNode::saveInfoToObjvars ( void ) { ServerObject * sourceObject = getSourceObject(); - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; // ---------- @@ -294,7 +294,7 @@ void CityPathNode::saveEdgesToObjvars ( void ) CityPathNode * neighborNode = _getGraph()->_getNode(neighborIndex); - if(neighborNode == NULL) continue; + if(neighborNode == nullptr) continue; NetworkId const & neighborSourceId = neighborNode->getSourceId(); @@ -327,7 +327,7 @@ void CityPathNode::saveNeighbors ( void ) CityPathNode * neighborNode = _getGraph()->_getNode(neighborIndex); - if(neighborNode == NULL) continue; + if(neighborNode == nullptr) continue; neighborNode->saveToObjvars(); } @@ -420,7 +420,7 @@ bool CityPathNode::sanityCheck ( bool doWarnings ) const CityPathNode const * neighborNode = _getGraph()->_getNode(neighborIndex); - if(neighborNode == NULL) + if(neighborNode == nullptr) { DEBUG_WARNING(doWarnings,("CityPathNode::sanityCheck - Node has an edge to a non-existent node\n")); insaneCount++; @@ -458,7 +458,7 @@ bool CityPathNode::sanityCheck ( bool doWarnings ) const CityPathNode const * nodeA = this; CityPathNode const * nodeB = _getGraph()->_getNode(getNeighbor(i)); - if(nodeB == NULL) continue; + if(nodeB == nullptr) continue; if(nodeB->getType() == PNT_CityBuilding) continue; @@ -493,7 +493,7 @@ void CityPathNode::reload ( void ) { ServerObject const * sourceObject = getSourceObject(); - if(sourceObject == NULL) return; + if(sourceObject == nullptr) return; // ---------- @@ -521,7 +521,7 @@ bool CityPathNode::hasEdgeTo ( NetworkId const & neighborId ) const CityPathNode const * neighborNode = _getGraph()->_getNode(neighborIndex); - if(neighborNode == NULL) continue; + if(neighborNode == nullptr) continue; if(neighborNode->getSourceId() == neighborId) return true; } @@ -535,7 +535,7 @@ void CityPathNode::snapToTerrain ( void ) { CellProperty const * cell = getCell(); - if((cell == NULL) || (cell == CellProperty::getWorldCellProperty())) + if((cell == nullptr) || (cell == CellProperty::getWorldCellProperty())) { Vector pos_w = getPosition_w(); diff --git a/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp b/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp index d5f6cd8e..328a52aa 100755 --- a/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp +++ b/engine/server/library/serverPathfinding/src/shared/PathAutoGenerator.cpp @@ -48,14 +48,14 @@ Region const * PathAutoGenerator::findPathRegion(Vector const & pos_w) for (RegionMaster::RegionVector::const_iterator it = rv.begin(); it != rv.end(); ++it) { Region const * const r = *it; - if (NULL != r) + if (nullptr != r) { if (r->getGeography() == RegionNamespace::RG_pathfind) return r; } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -63,7 +63,7 @@ Region const * PathAutoGenerator::findPathRegion(Vector const & pos_w) void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistance, float obstacleDistance, Unicode::String & result) { Region const * region = findPathRegion(pos_w); - if (NULL == region) + if (nullptr == region) { result += Unicode::narrowToWide("No pathfinding region at position"); return; @@ -144,7 +144,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc ++obstacleNearbySkipped; #if USE_OBSTACLE_TEMPLATE - if (NULL != PathAutoGeneratorNamespace::s_pathObstacleTemplate) + if (nullptr != PathAutoGeneratorNamespace::s_pathObstacleTemplate) { Transform transform_w; transform_w.setPosition_p(testPos_w); @@ -164,7 +164,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc transform_w.setPosition_p(testPos_w); ServerObject * newObject = ServerWorld::createNewObject(s_pathWaypointTemplate, transform_w, 0, false); - if (NULL != newObject) + if (nullptr != newObject) { newObject->addToWorld(); newObject->persist(); @@ -189,7 +189,7 @@ void PathAutoGenerator::pathAutoGenerate(Vector const & pos_w, float nodeDistanc void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String & result) { Region const * region = findPathRegion(pos_w); - if (NULL == region) + if (nullptr == region) { result += Unicode::narrowToWide("No pathfinding region at position"); return; @@ -236,7 +236,7 @@ void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String & } #if USE_OBSTACLE_TEMPLATE - if (NULL != s_pathObstacleTemplate && !strcmp(so->getTemplateName(), s_pathObstacleTemplate)) + if (nullptr != s_pathObstacleTemplate && !strcmp(so->getTemplateName(), s_pathObstacleTemplate)) { so->permanentlyDestroy(DeleteReasons::Script); ++obstacleDestroyCount; diff --git a/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.cpp b/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.cpp index 4ffdd288..109ba9c4 100755 --- a/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.cpp +++ b/engine/server/library/serverPathfinding/src/shared/ServerPathBuilder.cpp @@ -41,7 +41,7 @@ const float gs_maxCanMoveDistance2 = (64.0f * 64.0f); int findClosestReachablePathNode_slow( CreatureObject const * creature, PathGraph const * graph ) { - if(graph == NULL) return -1; + if(graph == nullptr) return -1; Vector creaturePos = creature->getPosition_p(); @@ -53,7 +53,7 @@ int findClosestReachablePathNode_slow( CreatureObject const * creature, PathGrap int resultCount = results.size(); - PathNode const * reachableNode = NULL; + PathNode const * reachableNode = nullptr; float reachableDist2 = gs_maxCanMoveDistance2; for(int i = 0; i < resultCount; i++) @@ -81,7 +81,7 @@ int findClosestReachablePathNode_slow( CreatureObject const * creature, PathGrap int findClosestReachablePathNode( CreatureObject const * creature, PathGraph const * graph ) { - if(graph == NULL) return -1; + if(graph == nullptr) return -1; Vector creaturePos = creature->getPosition_p(); @@ -98,7 +98,7 @@ int findClosestReachablePathNode( CreatureObject const * creature, PathGraph con PathNode const * node = graph->getNode(closestIndex); - if(node == NULL) return -2; + if(node == nullptr) return -2; Vector nodePos = node->getPosition_p(); float dist2 = nodePos.magnitudeBetweenSquared(creaturePos); @@ -135,7 +135,7 @@ int findClosestReachablePathNode_slow ( CellProperty const * cell, Vector const int resultCount = results.size(); - PathNode const * reachableNode = NULL; + PathNode const * reachableNode = nullptr; float reachableDist2 = gs_maxCanMoveDistance2; for(int i = 0; i < resultCount; i++) @@ -173,7 +173,7 @@ int findClosestReachablePathNode ( CellProperty const * cell, Vector const & goa PathNode const * node = graph->getNode(closestIndex); - if(node == NULL) return -2; + if(node == nullptr) return -2; Vector nodePos = node->getPosition_p(); float dist2 = nodePos.magnitudeBetweenSquared(goal); @@ -199,7 +199,7 @@ PathGraph const * getGraph ( CellProperty const * cell ) if(cell) return safe_cast(cell->getPathGraph()); else - return NULL; + return nullptr; } PathGraph const * getGraph ( PortalProperty const * building ) @@ -207,7 +207,7 @@ PathGraph const * getGraph ( PortalProperty const * building ) if(building) return safe_cast(building->getPortalPropertyTemplate().getBuildingPathGraph()); else - return NULL; + return nullptr; } // ---------- @@ -237,19 +237,19 @@ PortalProperty const * getBuilding ( BuildingObject const * buildingObject ) if(buildingObject) return buildingObject->getPortalProperty(); else - return NULL; + return nullptr; } PortalProperty const * getBuilding ( CreatureObject const * creature ) { - if(creature == NULL) return NULL; + if(creature == nullptr) return nullptr; CellProperty const * cell = creature->getParentCell(); if(cell) return cell->getPortalProperty(); else - return NULL; + return nullptr; } PortalProperty const * getBuilding ( AiLocation const & loc ) @@ -259,7 +259,7 @@ PortalProperty const * getBuilding ( AiLocation const & loc ) if(cell) return cell->getPortalProperty(); else - return NULL; + return nullptr; } // ---------- @@ -388,26 +388,26 @@ int getIndexFor ( CellProperty const * cell, PathGraph const * graph, AiLocation // ---------------------------------------------------------------------- ServerPathBuilder::ServerPathBuilder() -: m_creatureCell(NULL), - m_creatureCellGraph(NULL), +: m_creatureCell(nullptr), + m_creatureCellGraph(nullptr), m_creatureCellKey(-1), m_creatureCellNodeIndex(-1), m_creatureCellPart(-1), - m_creatureBuilding(NULL), - m_creatureBuildingGraph(NULL), + m_creatureBuilding(nullptr), + m_creatureBuildingGraph(nullptr), m_creatureBuildingKey(-1), m_creatureBuildingNodeIndex(-1), m_creaturePosition(), - m_goalCell(NULL), - m_goalCellGraph(NULL), + m_goalCell(nullptr), + m_goalCellGraph(nullptr), m_goalCellKey(-1), m_goalCellNodeIndex(-1), m_goalCellPart(-1), - m_goalBuilding(NULL), - m_goalBuildingGraph(NULL), + m_goalBuilding(nullptr), + m_goalBuildingGraph(nullptr), m_goalBuildingKey(-1), m_goalBuildingNodeIndex(-1), - m_goalCityGraph(NULL), + m_goalCityGraph(nullptr), m_goalCityNodeIndex(-1), m_path(new AiPath()), m_async(false), @@ -427,16 +427,16 @@ ServerPathBuilder::~ServerPathBuilder() ServerPathBuildManager::unqueue(this); delete m_path; - m_path = NULL; + m_path = nullptr; delete m_cellSearch; - m_cellSearch = NULL; + m_cellSearch = nullptr; delete m_buildingSearch; - m_buildingSearch = NULL; + m_buildingSearch = nullptr; delete m_citySearch; - m_citySearch = NULL; + m_citySearch = nullptr; } @@ -462,7 +462,7 @@ bool ServerPathBuilder::buildPathInternal( CellProperty const * cell, PathGraph PathNode const * node = graph->getNode(nodeIndex); - if(node == NULL) return false; + if(node == nullptr) return false; addPathNode( cell, node ); } @@ -484,9 +484,9 @@ bool ServerPathBuilder::buildPathInternal ( PortalProperty const * building, Pat // ---------- - PathNode const * nodeA = NULL; - PathNode const * nodeB = NULL; - PathNode const * nodeC = NULL; + PathNode const * nodeA = nullptr; + PathNode const * nodeB = nullptr; + PathNode const * nodeC = nullptr; int pathLength = path.size(); @@ -496,7 +496,7 @@ bool ServerPathBuilder::buildPathInternal ( PortalProperty const * building, Pat { PathNode const * nextNode = graph->getNode(path[i]); - if(nextNode == NULL) continue; + if(nextNode == nullptr) continue; nodeA = nodeB; nodeB = nodeC; @@ -506,10 +506,10 @@ bool ServerPathBuilder::buildPathInternal ( PortalProperty const * building, Pat { nodeA = nodeB; nodeB = nodeC; - nodeC = NULL; + nodeC = nullptr; } - if( nodeB == NULL ) continue; + if( nodeB == nullptr ) continue; // ---------- @@ -519,11 +519,11 @@ bool ServerPathBuilder::buildPathInternal ( PortalProperty const * building, Pat CellProperty const * subobject = building->getCell(cellIndex); - if(subobject == NULL) return false; + if(subobject == nullptr) return false; PathGraph const * subgraph = getGraph(subobject); - if(subgraph == NULL) return false; + if(subgraph == nullptr) return false; // ---------- @@ -576,9 +576,9 @@ bool ServerPathBuilder::buildPathInternal ( CityPathGraph const * graph, int ind bool ServerPathBuilder::expandPath ( CityPathGraph const * graph, IndexList const & path ) { - PathNode const * nodeA = NULL; - PathNode const * nodeB = NULL; - PathNode const * nodeC = NULL; + PathNode const * nodeA = nullptr; + PathNode const * nodeB = nullptr; + PathNode const * nodeC = nullptr; int pathLength = path.size(); @@ -588,7 +588,7 @@ bool ServerPathBuilder::expandPath ( CityPathGraph const * graph, IndexList cons { PathNode const * nextNode = graph->getNode(path[i]); - if(nextNode == NULL) continue; + if(nextNode == nullptr) continue; nodeA = nodeB; nodeB = nodeC; @@ -598,10 +598,10 @@ bool ServerPathBuilder::expandPath ( CityPathGraph const * graph, IndexList cons { nodeA = nodeB; nodeB = nodeC; - nodeC = NULL; + nodeC = nullptr; } - if( nodeB == NULL ) continue; + if( nodeB == nullptr ) continue; // ---------- @@ -609,19 +609,19 @@ bool ServerPathBuilder::expandPath ( CityPathGraph const * graph, IndexList cons { CityPathNode const * cityNode = safe_cast(nodeB); - if(cityNode == NULL) return false; + if(cityNode == nullptr) return false; BuildingObject const * buildingObject = safe_cast(cityNode->getCreatorObject()); - if(buildingObject == NULL) return false; + if(buildingObject == nullptr) return false; PortalProperty const * subobject = getBuilding(buildingObject); - if(subobject == NULL) return false; + if(subobject == nullptr) return false; PathGraph const * subgraph = getGraph(subobject); - if(subgraph == NULL) return false; + if(subgraph == nullptr) return false; // ---------- @@ -652,7 +652,7 @@ bool ServerPathBuilder::buildPath_World ( void ) { Vector exitPoint(m_creature ? m_creature->getPosition_w() : m_creaturePosition); - if((m_creatureCityGraph != NULL) && (m_creatureCityNodeIndex >= 0)) + if((m_creatureCityGraph != nullptr) && (m_creatureCityNodeIndex >= 0)) { int indexA = m_creatureCityNodeIndex; int indexB = m_creatureCityGraph->findNearestNode(m_goal.getPosition_w()); @@ -670,7 +670,7 @@ bool ServerPathBuilder::buildPath_World ( void ) } } - if((m_goalCityGraph != NULL) && (m_goalCityNodeIndex >= 0)) + if((m_goalCityGraph != nullptr) && (m_goalCityNodeIndex >= 0)) { int indexA = m_goalCityGraph->findNearestNode(exitPoint); int indexB = m_goalCityNodeIndex; @@ -701,8 +701,8 @@ bool ServerPathBuilder::buildPath_ToGoal ( void ) m_creatureCell = m_creature->getParentCell(); m_goalCell = m_goal.getCell(); - if(m_creatureCell == NULL) m_creatureCell = worldCell; - if(m_goalCell == NULL) m_goalCell = worldCell; + if(m_creatureCell == nullptr) m_creatureCell = worldCell; + if(m_goalCell == nullptr) m_goalCell = worldCell; { Vector goalPos_p = m_goal.getPosition_p(m_creatureCell); @@ -724,23 +724,23 @@ bool ServerPathBuilder::buildPath_ToGoal ( void ) // we can skip some work with looking up their cell and building // info. - m_creatureCellGraph = NULL; + m_creatureCellGraph = nullptr; m_creatureCellKey = -1; m_creatureCellNodeIndex = -1; m_creatureCellPart = -1; - m_goalCellGraph = NULL; + m_goalCellGraph = nullptr; m_goalCellKey = -1; m_goalCellNodeIndex = -1; m_goalCellPart = -1; - m_creatureBuilding = NULL; - m_creatureBuildingGraph = NULL; + m_creatureBuilding = nullptr; + m_creatureBuildingGraph = nullptr; m_creatureBuildingKey = -1; m_creatureBuildingNodeIndex = -1; - m_goalBuilding = NULL; - m_goalBuildingGraph = NULL; + m_goalBuilding = nullptr; + m_goalBuildingGraph = nullptr; m_goalBuildingKey = -1; m_goalBuildingNodeIndex = -1; } @@ -776,7 +776,7 @@ bool ServerPathBuilder::buildPath_ToGoal ( void ) // If they're in the same cell, start the search in the cell - if((m_creatureCell == m_goalCell) && (m_creatureCell != NULL) && (m_creatureCell != CellProperty::getWorldCellProperty()) && (m_creatureCellPart == m_goalCellPart)) + if((m_creatureCell == m_goalCell) && (m_creatureCell != nullptr) && (m_creatureCell != CellProperty::getWorldCellProperty()) && (m_creatureCellPart == m_goalCellPart)) { return buildPathInternal(m_creatureCell,m_creatureCellGraph,m_creatureCellNodeIndex,m_goalCellNodeIndex); } @@ -795,7 +795,7 @@ bool ServerPathBuilder::buildPath_ToGoal ( void ) // If they're in the same building, start the search in the building - if((m_creatureBuilding == m_goalBuilding) && (m_creatureBuilding != NULL)) + if((m_creatureBuilding == m_goalBuilding) && (m_creatureBuilding != nullptr)) { return buildPathInternal(m_creatureBuilding,m_creatureBuildingGraph,m_creatureBuildingNodeIndex,m_goalBuildingNodeIndex); } @@ -810,7 +810,7 @@ bool ServerPathBuilder::buildPath_ToGoal ( void ) m_goalCityGraph = CityPathGraphManager::getCityGraphFor(m_goal.getPosition_w()); m_goalCityNodeIndex = getIndexFor(m_goalCityGraph,m_goalBuilding,m_goal); - if((m_creatureCityGraph == m_goalCityGraph) && (m_creatureCityGraph != NULL)) + if((m_creatureCityGraph == m_goalCityGraph) && (m_creatureCityGraph != nullptr)) { // hack - If a creature in a city region tries to path search but it's not near a path node, // make its path search succeed @@ -875,7 +875,7 @@ bool ServerPathBuilder::buildPath_Named ( void ) // ---------- - if(m_creatureCityGraph != NULL) + if(m_creatureCityGraph != nullptr) { IndexList goalList; @@ -885,7 +885,7 @@ bool ServerPathBuilder::buildPath_Named ( void ) { CityPathNode const * node = m_creatureCityGraph->_getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; if(node->getName() == m_goalName) { @@ -954,7 +954,7 @@ void ServerPathBuilder::update ( void ) bool ServerPathBuilder::setupBuildPath ( CreatureObject const * creature, AiLocation const & goal ) { - if(creature == NULL) return false; + if(creature == nullptr) return false; if(!goal.isValid()) return false; m_creature = creature; @@ -971,7 +971,7 @@ bool ServerPathBuilder::setupBuildPath ( CreatureObject const * creature, AiLoca bool ServerPathBuilder::setupBuildPath ( CreatureObject const * creature, Unicode::String const & goalName ) { - if(creature == NULL) return false; + if(creature == nullptr) return false; if(goalName.empty()) return false; m_creature = creature; @@ -1058,23 +1058,23 @@ bool ServerPathBuilder::buildWorldPath(AiLocation const &startLocation, AiLocati // we can skip some work with looking up their cell and building // info. - m_creatureCellGraph = NULL; + m_creatureCellGraph = nullptr; m_creatureCellKey = -1; m_creatureCellNodeIndex = -1; m_creatureCellPart = -1; - m_goalCellGraph = NULL; + m_goalCellGraph = nullptr; m_goalCellKey = -1; m_goalCellNodeIndex = -1; m_goalCellPart = -1; - m_creatureBuilding = NULL; - m_creatureBuildingGraph = NULL; + m_creatureBuilding = nullptr; + m_creatureBuildingGraph = nullptr; m_creatureBuildingKey = -1; m_creatureBuildingNodeIndex = -1; - m_goalBuilding = NULL; - m_goalBuildingGraph = NULL; + m_goalBuilding = nullptr; + m_goalBuildingGraph = nullptr; m_goalBuildingKey = -1; m_goalBuildingNodeIndex = -1; @@ -1134,8 +1134,8 @@ bool ServerPathBuilder::buildWorldPath(AiLocation const &startLocation, AiLocati void ServerPathBuilder::addPathNode ( CellProperty const * cell, PathNode const * node ) { - if(node == NULL) return; - if(cell == NULL) cell = CellProperty::getWorldCellProperty(); + if(node == nullptr) return; + if(cell == nullptr) cell = CellProperty::getWorldCellProperty(); AiLocation loc(cell,node->getPosition_p()); @@ -1173,7 +1173,7 @@ void ServerPathBuilder::addPathNode ( CellProperty const * cell, PathNode const bool ServerPathBuilder::buildPathImmediate(AiLocation const & creature, AiLocation const & goal) { - m_creature = NULL; + m_creature = nullptr; m_goal = goal; m_buildDone = false; m_buildFailed = false; @@ -1190,9 +1190,9 @@ bool ServerPathBuilder::buildPathImmediate(AiLocation const & creature, AiLocati // ---------- CellProperty const * worldCell = CellProperty::getWorldCellProperty(); - if(m_creatureCell == NULL) + if(m_creatureCell == nullptr) m_creatureCell = worldCell; - if(m_goalCell == NULL) + if(m_goalCell == nullptr) m_goalCell = worldCell; @@ -1236,14 +1236,14 @@ bool ServerPathBuilder::buildPathImmediate(AiLocation const & creature, AiLocati m_goalBuildingNodeIndex = getIndexFor(m_goalBuilding, m_goalBuildingGraph, m_goal, m_goalCellPart); // If they're in the same building, start the search in the building - if((m_creatureBuilding == m_goalBuilding) && (m_creatureBuilding != NULL)) + if((m_creatureBuilding == m_goalBuilding) && (m_creatureBuilding != nullptr)) { if (buildPathInternal(m_creatureBuilding, m_creatureBuildingGraph, m_creatureBuildingNodeIndex, m_goalBuildingNodeIndex)) return true; } // If they're in the same cell, start the search in the cell - if((m_creatureCell == m_goalCell) && (m_creatureCell != NULL) && (m_creatureCell != CellProperty::getWorldCellProperty()) && (m_creatureCellPart == m_goalCellPart)) + if((m_creatureCell == m_goalCell) && (m_creatureCell != nullptr) && (m_creatureCell != CellProperty::getWorldCellProperty()) && (m_creatureCellPart == m_goalCellPart)) { if (buildPathInternal(m_creatureCell, m_creatureCellGraph, m_creatureCellNodeIndex, m_goalCellNodeIndex)) return true; @@ -1257,7 +1257,7 @@ bool ServerPathBuilder::buildPathImmediate(AiLocation const & creature, AiLocati m_goalCityGraph = CityPathGraphManager::getCityGraphFor(m_goal.getPosition_w()); m_goalCityNodeIndex = getIndexFor(m_goalCityGraph,m_goalBuilding,m_goal); - if((m_creatureCityGraph == m_goalCityGraph) && (m_creatureCityGraph != NULL)) + if((m_creatureCityGraph == m_goalCityGraph) && (m_creatureCityGraph != nullptr)) { // hack - If a creature in a city region tries to path search but it's not near a path node, // make its path search succeed diff --git a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.cpp b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.cpp index 068f9d3a..e71513d5 100755 --- a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.cpp +++ b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.cpp @@ -31,7 +31,7 @@ #include #include -ServerPathfindingMessaging * g_messaging = NULL; +ServerPathfindingMessaging * g_messaging = nullptr; // ====================================================================== @@ -51,7 +51,7 @@ void ServerPathfindingMessaging::remove ( void ) g_messaging->disconnectFromMessage(RequestUnstick::MESSAGE_TYPE); delete g_messaging; - g_messaging = NULL; + g_messaging = nullptr; } ServerPathfindingMessaging & ServerPathfindingMessaging::getInstance ( void ) @@ -75,10 +75,10 @@ ServerPathfindingMessaging::~ServerPathfindingMessaging() } delete m_clientList; - m_clientList = NULL; + m_clientList = nullptr; delete m_callback; - m_callback = NULL; + m_callback = nullptr; } // ---------- @@ -178,7 +178,7 @@ void ServerPathfindingMessaging::receiveMessage(const MessageDispatch::Emitter & { Transform newTransform = Transform::identity; newTransform.setPosition_p(unstickPoint); - controller->teleport(newTransform, NULL); + controller->teleport(newTransform, nullptr); } return; @@ -188,7 +188,7 @@ void ServerPathfindingMessaging::receiveMessage(const MessageDispatch::Emitter & Vector unstickPoint; CellObject * cell = ContainerInterface::getContainingCellObject(*s); - if (cell != NULL && s->asCreatureObject() != NULL) + if (cell != nullptr && s->asCreatureObject() != nullptr) { // try finding a waypoint in the cell first if (!cell->getClosestPathNodePos(*s, unstickPoint)) @@ -266,7 +266,7 @@ void ServerPathfindingMessaging::ignoreObjectPath(Client * client, const Network void ServerPathfindingMessaging::watchPathMap(Client * client) { - if(client == NULL) return; + if(client == nullptr) return; // Add the client to our client list @@ -290,7 +290,7 @@ void ServerPathfindingMessaging::watchPathMap(Client * client) void ServerPathfindingMessaging::ignorePathMap(Client * client) { - if(client == NULL) return; + if(client == nullptr) return; m_clientList->erase(client); @@ -319,7 +319,7 @@ void ServerPathfindingMessaging::onClientDestroy(ClientDestroy & d) void ServerPathfindingMessaging::sendGraphInfo ( CityPathGraph const * graph ) { - if(graph == NULL) return; + if(graph == nullptr) return; for(ClientList::iterator it = m_clientList->begin(); it != m_clientList->end(); ++it) { @@ -331,8 +331,8 @@ void ServerPathfindingMessaging::sendGraphInfo ( CityPathGraph const * graph ) void ServerPathfindingMessaging::sendGraphInfo ( CityPathGraph const * graph, Client * client ) { - if(client == NULL) return; - if(graph == NULL) return; + if(client == nullptr) return; + if(graph == nullptr) return; int nodeCount = graph->getNodeCount(); @@ -348,7 +348,7 @@ void ServerPathfindingMessaging::sendGraphInfo ( CityPathGraph const * graph, Cl void ServerPathfindingMessaging::sendEraseGraph ( CityPathGraph const * graph ) { - if(graph == NULL) return; + if(graph == nullptr) return; for(ClientList::iterator it = m_clientList->begin(); it != m_clientList->end(); ++it) { @@ -360,8 +360,8 @@ void ServerPathfindingMessaging::sendEraseGraph ( CityPathGraph const * graph ) void ServerPathfindingMessaging::sendEraseGraph ( CityPathGraph const * graph, Client * client ) { - if(client == NULL) return; - if(graph == NULL) return; + if(client == nullptr) return; + if(graph == nullptr) return; int nodeCount = graph->getNodeCount(); @@ -377,7 +377,7 @@ void ServerPathfindingMessaging::sendEraseGraph ( CityPathGraph const * graph, C void ServerPathfindingMessaging::sendNodeInfo ( CityPathNode const * node ) { - if(node == NULL) return; + if(node == nullptr) return; for(ClientList::iterator it = m_clientList->begin(); it != m_clientList->end(); ++it) { @@ -389,8 +389,8 @@ void ServerPathfindingMessaging::sendNodeInfo ( CityPathNode const * node ) void ServerPathfindingMessaging::sendNodeInfo ( CityPathNode const * node, Client * client ) { - if(node == NULL) return; - if(client == NULL) return; + if(node == nullptr) return; + if(client == nullptr) return; AINodeInfo m; @@ -428,7 +428,7 @@ void ServerPathfindingMessaging::sendNodeInfo ( CityPathNode const * node, Clien void ServerPathfindingMessaging::sendNeighborInfo ( CityPathNode const * node ) { - if(node == NULL) return; + if(node == nullptr) return; for(ClientList::iterator it = m_clientList->begin(); it != m_clientList->end(); ++it) { @@ -440,8 +440,8 @@ void ServerPathfindingMessaging::sendNeighborInfo ( CityPathNode const * node ) void ServerPathfindingMessaging::sendNeighborInfo ( CityPathNode const * node, Client * client ) { - if(node == NULL) return; - if(client == NULL) return; + if(node == nullptr) return; + if(client == nullptr) return; int edgeCount = node->getEdgeCount(); @@ -459,7 +459,7 @@ void ServerPathfindingMessaging::sendNeighborInfo ( CityPathNode const * node, C void ServerPathfindingMessaging::sendEraseNode ( CityPathNode const * node ) { - if(node == NULL) return; + if(node == nullptr) return; for(ClientList::iterator it = m_clientList->begin(); it != m_clientList->end(); ++it) { @@ -471,8 +471,8 @@ void ServerPathfindingMessaging::sendEraseNode ( CityPathNode const * node ) void ServerPathfindingMessaging::sendEraseNode ( CityPathNode const * node, Client * client ) { - if(node == NULL) return; - if(client == NULL) return; + if(node == nullptr) return; + if(client == nullptr) return; AINodeInfo m; @@ -497,7 +497,7 @@ void ServerPathfindingMessaging::sendWaypointInfo ( AiLocation const & loc ) void ServerPathfindingMessaging::sendWaypointInfo ( AiLocation const & loc, Client * client ) { - if(client == NULL) return; + if(client == nullptr) return; AINodeInfo m; @@ -531,7 +531,7 @@ void ServerPathfindingMessaging::sendEraseWaypoint ( AiLocation const & loc ) void ServerPathfindingMessaging::sendEraseWaypoint ( AiLocation const & loc, Client * client ) { - if(client == NULL) return; + if(client == nullptr) return; AINodeInfo m; diff --git a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingNotification.cpp b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingNotification.cpp index d524776c..25f8a676 100755 --- a/engine/server/library/serverPathfinding/src/shared/ServerPathfindingNotification.cpp +++ b/engine/server/library/serverPathfinding/src/shared/ServerPathfindingNotification.cpp @@ -44,7 +44,7 @@ void ServerPathfindingNotification::addToWorld ( Object & object ) const { CityPathGraphManager::addBuilding( building ); } - else if(object.asServerObject() != NULL && object.asServerObject()->isWaypoint()) + else if(object.asServerObject() != nullptr && object.asServerObject()->isWaypoint()) { CityPathGraphManager::addWaypoint( object.asServerObject() ); } @@ -61,7 +61,7 @@ void ServerPathfindingNotification::removeFromWorld ( Object & object ) const { CityPathGraphManager::removeBuilding( building ); } - else if(object.asServerObject() != NULL && object.asServerObject()->isWaypoint()) + else if(object.asServerObject() != nullptr && object.asServerObject()->isWaypoint()) { CityPathGraphManager::removeWaypoint( object.asServerObject() ); } @@ -79,7 +79,7 @@ bool ServerPathfindingNotification::positionChanged ( Object & object, bool /*du { CityPathGraphManager::moveBuilding( building, oldPosition ); } - else if(object.asServerObject() != NULL && object.asServerObject()->isWaypoint()) + else if(object.asServerObject() != nullptr && object.asServerObject()->isWaypoint()) { CityPathGraphManager::moveWaypoint( object.asServerObject(), oldPosition ); } @@ -95,7 +95,7 @@ bool ServerPathfindingNotification::positionAndRotationChanged ( Object & object { CityPathGraphManager::moveBuilding( building, oldPosition ); } - else if(object.asServerObject() != NULL && object.asServerObject()->isWaypoint()) + else if(object.asServerObject() != nullptr && object.asServerObject()->isWaypoint()) { CityPathGraphManager::moveWaypoint( object.asServerObject(), oldPosition ); } diff --git a/engine/server/library/serverScript/src/shared/GameScriptObject.cpp b/engine/server/library/serverScript/src/shared/GameScriptObject.cpp index c93ebbf4..3e8e9396 100755 --- a/engine/server/library/serverScript/src/shared/GameScriptObject.cpp +++ b/engine/server/library/serverScript/src/shared/GameScriptObject.cpp @@ -40,7 +40,7 @@ // class GameScriptObject static members //======================================================================== -GameScriptObject::ScriptDataMap * GameScriptObject::ms_scriptDataMap = NULL; +GameScriptObject::ScriptDataMap * GameScriptObject::ms_scriptDataMap = nullptr; bool GameScriptObject::m_pauseScripting = false; @@ -52,7 +52,7 @@ bool GameScriptObject::m_pauseScripting = false; * Class constructor. */ GameScriptObject::GameScriptObject(void) : - m_owner(NULL), + m_owner(nullptr), m_scriptList(), m_scriptListInitialized(false), m_scriptListValid(false), @@ -69,11 +69,11 @@ GameScriptObject::~GameScriptObject() { { PROFILER_AUTO_BLOCK_DEFINE("GameScriptObject::~GameScriptObject removeJavaId\n"); - if (JavaLibrary::instance() != NULL /*&& m_javaId != NULL*/) + if (JavaLibrary::instance() != nullptr /*&& m_javaId != nullptr*/) { NOT_NULL(m_owner); JavaLibrary::removeJavaId(m_owner->getNetworkId()); -// m_javaId = NULL; +// m_javaId = nullptr; } } @@ -82,7 +82,7 @@ GameScriptObject::~GameScriptObject() removeAll(); } m_scriptList.clear(); - m_owner = NULL; + m_owner = nullptr; } // GameScriptObject::~GameScriptObject /** @@ -92,7 +92,7 @@ GameScriptObject::~GameScriptObject() */ bool GameScriptObject::installScriptEngine(void) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) { DEBUG_WARNING(true, ("Trying to install script engine more than once")); return true; @@ -101,7 +101,7 @@ bool GameScriptObject::installScriptEngine(void) ms_scriptDataMap = new GameScriptObject::ScriptDataMap; Scripting::InitScriptFuncHashMap(); JavaLibrary::install(); - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return false; enableNewJediTracking(ConfigServerGame::getEnableNewJedi()); return true; @@ -114,7 +114,7 @@ void GameScriptObject::removeScriptEngine(void) { JavaLibrary::remove(); delete ms_scriptDataMap; - ms_scriptDataMap = NULL; + ms_scriptDataMap = nullptr; Scripting::RemoveScriptFuncHashMap(); } // GameScriptObject::removeScriptEngine @@ -145,10 +145,10 @@ void GameScriptObject::alter(real time) */ void GameScriptObject::setOwnerIsAuthoritative(bool authoritative, uint32 pid) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; - if (m_owner != NULL && m_owner->getNetworkId() != NetworkId::cms_invalid) + if (m_owner != nullptr && m_owner->getNetworkId() != NetworkId::cms_invalid) { JavaLibrary::instance()->setObjIdAuthoritative(m_owner->getNetworkId(), authoritative, pid); @@ -171,9 +171,9 @@ void GameScriptObject::setOwnerIsAuthoritative(bool authoritative, uint32 pid) */ void GameScriptObject::setOwnerIsLoaded(void) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; - if (m_owner != NULL && m_owner->getNetworkId() != NetworkId::cms_invalid) + if (m_owner != nullptr && m_owner->getNetworkId() != NetworkId::cms_invalid) { JavaLibrary::instance()->setObjIdLoaded(m_owner->getNetworkId()); } @@ -189,9 +189,9 @@ void GameScriptObject::setOwnerIsLoaded(void) */ void GameScriptObject::setOwnerIsInitialized(void) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; - if (m_owner != NULL && m_owner->getNetworkId() != NetworkId::cms_invalid) + if (m_owner != nullptr && m_owner->getNetworkId() != NetworkId::cms_invalid) { JavaLibrary::instance()->setObjIdInitialized(m_owner->getNetworkId()); if (m_owner->isAuthoritative()) @@ -211,10 +211,10 @@ void GameScriptObject::setOwnerIsInitialized(void) */ void GameScriptObject::setOwnerDestroyed(void) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; - if (m_owner != NULL && m_owner->getNetworkId() != NetworkId::cms_invalid && m_owner->isAuthoritative()) + if (m_owner != nullptr && m_owner->getNetworkId() != NetworkId::cms_invalid && m_owner->isAuthoritative()) JavaLibrary::flagDestroyed(m_owner->getNetworkId()); } //lint !e1762 Do not make const @@ -283,7 +283,7 @@ int GameScriptObject::attachScript(const std::string& scriptName, bool runTrigge } else { - if (ms_scriptDataMap == NULL || JavaLibrary::instance() == NULL) + if (ms_scriptDataMap == nullptr || JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; if (ms_scriptDataMap->find(scriptName) == ms_scriptDataMap->end()) @@ -379,7 +379,7 @@ int GameScriptObject::detachScript(const std::string& scriptName) else { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; // Make sure to call the detach trigger on this one script if one exists. @@ -420,12 +420,12 @@ void GameScriptObject::initScriptInstances() { m_scriptListInitialized = true; - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; if (!m_owner) { - WARNING_STRICT_FATAL(true, ("Use of null m_owner in ::initScriptInstances()")); + WARNING_STRICT_FATAL(true, ("Use of nullptr m_owner in ::initScriptInstances()")); return; } @@ -454,7 +454,7 @@ void GameScriptObject::initScriptInstances() */ void GameScriptObject::removeAll(void) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; // removeAll() cannot be overriden by scripts @@ -483,12 +483,12 @@ int GameScriptObject::trigAllScripts(Scripting::TrigId trigId, ScriptParams &par { NOT_NULL(m_owner); - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; -// if (m_javaId == NULL && m_owner != NULL && m_owner->getNetworkId().getValue() != 0) +// if (m_javaId == nullptr && m_owner != nullptr && m_owner->getNetworkId().getValue() != 0) // { -// if (JavaLibrary::instance() != NULL) +// if (JavaLibrary::instance() != nullptr) // m_javaId = JavaLibrary::getObjId(m_owner->getNetworkId()); // } @@ -497,7 +497,7 @@ int GameScriptObject::trigAllScripts(Scripting::TrigId trigId, ScriptParams &par //Authoritative check temporarily removed because some triggers aren't being called //because the setAuth message hasn't come in yet from Central on load. - if (m_owner == NULL) //@todo FIX THIS HACK || !m_owner->isAuthoritative()) + if (m_owner == nullptr) //@todo FIX THIS HACK || !m_owner->isAuthoritative()) return SCRIPT_CONTINUE; if(!m_owner->isAuthoritative()) @@ -506,7 +506,7 @@ int GameScriptObject::trigAllScripts(Scripting::TrigId trigId, ScriptParams &par Archive::put(paramArchive, params); MessageQueueScriptTrigger * data = new MessageQueueScriptTrigger(static_cast(trigId), paramArchive); ServerController * controller = dynamic_cast(m_owner->getController()); - if(controller != NULL) + if(controller != nullptr) { controller->appendMessage( CM_scriptTrigger, @@ -557,13 +557,13 @@ int GameScriptObject::trigAllScripts(Scripting::TrigId trigId, ScriptParams &par */ int GameScriptObject::trigOneScript(const std::string& scriptName, Scripting::TrigId trigId, ScriptParams ¶ms) const { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; if (m_pauseScripting) return SCRIPT_CONTINUE; - if (m_owner == NULL /*|| !m_owner->isAuthoritative()*/) + if (m_owner == nullptr /*|| !m_owner->isAuthoritative()*/) return SCRIPT_OVERRIDE; if (!m_owner->isAuthoritative() && (trigId != Scripting::TRIG_ATTACH && @@ -607,7 +607,7 @@ int GameScriptObject::trigOneScript(const std::string& scriptName, Scripting::Tr int GameScriptObject::trigScriptFromConsole(const Scripting::TrigId trigId, const std::string &scriptName, const StringVector_t &args) const { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) { LOG("ScriptInvestigation", ("Returning script continue from console trigger request because there is no JavaLibrary instance\n")); return SCRIPT_CONTINUE; @@ -619,9 +619,9 @@ int GameScriptObject::trigScriptFromConsole(const Scripting::TrigId trigId, return SCRIPT_CONTINUE; } - if (m_owner == NULL ) + if (m_owner == nullptr ) { - LOG("ScriptInvestigation", ("Returning script override from console trigger request becuase m_owner is null\n")); + LOG("ScriptInvestigation", ("Returning script override from console trigger request becuase m_owner is nullptr\n")); return SCRIPT_OVERRIDE; } @@ -660,14 +660,14 @@ int GameScriptObject::trigScriptFromConsole(const Scripting::TrigId trigId, bool GameScriptObject::handleMessage(const std::string &messageName, const ScriptDictionaryPtr & data) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) { WARNING_STRICT_FATAL(true, ("(messageToFailure) GameScriptObject::handleMessage got message " "when Java not running")); return true; } - if (getOwner() == NULL) + if (getOwner() == nullptr) { WARNING_STRICT_FATAL(true, ("(messageToFailure) GameScriptObject::handleMessage got message " "with no owner")); @@ -703,7 +703,7 @@ bool GameScriptObject::handleMessage(const std::string &messageName, const std:: { ScriptDictionaryPtr dictionary; - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return true; if (m_pauseScripting) @@ -733,7 +733,7 @@ bool GameScriptObject::handleMessage(const std::string &messageName, const std:: */ int GameScriptObject::callScriptCommandHandler(std::string const &funcName, ScriptParams ¶ms) const { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; if (m_pauseScripting) @@ -757,7 +757,7 @@ int GameScriptObject::callScriptCommandHandler(std::string const &funcName, Scri */ int GameScriptObject::callScriptBuffHandler(std::string const &funcName, ScriptParams ¶ms) const { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return SCRIPT_CONTINUE; if (m_pauseScripting) @@ -825,7 +825,7 @@ void GameScriptObject::enumerateScripts(std::vector &scriptNames) c */ void GameScriptObject::makeScriptDictionary(const ScriptParams & params, ScriptDictionaryPtr & dictionary) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) { JavaDictionaryPtr jdp; JavaLibrary::instance()->convert(params, jdp); @@ -840,7 +840,7 @@ void GameScriptObject::makeScriptDictionary(const ScriptParams & params, ScriptD */ bool GameScriptObject::isScriptingEnabled(void) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) return true; return false; } // GameScriptObject::isScriptingEnabled @@ -854,7 +854,7 @@ bool GameScriptObject::isScriptingEnabled(void) */ bool GameScriptObject::reloadScript(const std::string& scriptName) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return false; @@ -904,7 +904,7 @@ bool GameScriptObject::reloadScript(const std::string& scriptName) */ void GameScriptObject::enableLogging(bool enable) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) JavaLibrary::instance()->enableLogging(enable); } // GameScriptObject::enableLogging @@ -917,7 +917,7 @@ void GameScriptObject::enableLogging(bool enable) */ void GameScriptObject::enableNewJediTracking(bool enableTracking) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) JavaLibrary::instance()->enableNewJediTracking(enableTracking); } // GameScriptObject::enableNewJediTracking @@ -946,7 +946,7 @@ Scheduler & GameScriptObject::getScriptScheduler() void GameScriptObject::onStopWatching(ServerObject & subject) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; if (m_owner) @@ -959,7 +959,7 @@ void GameScriptObject::onStopWatching(ServerObject & subject) void GameScriptObject::onWatching(ServerObject & subject) { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; if (m_owner) @@ -972,7 +972,7 @@ void GameScriptObject::onWatching(ServerObject & subject) void GameScriptObject::runOneScript(const std::string & scriptName, const std::string & methodName, const std::string & argTypes, ScriptParams & args) { - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) IGNORE_RETURN( JavaLibrary::instance()->runScript(NetworkId(), scriptName, methodName, argTypes, args) ); } @@ -994,7 +994,7 @@ std::string GameScriptObject::callScriptConsoleHandler(const std::string & scrip { static const std::string errorReturnString; - if (JavaLibrary::instance() != NULL) + if (JavaLibrary::instance() != nullptr) { return JavaLibrary::instance()->callScriptConsoleHandler(scriptName, methodName, argTypes, args); } @@ -1019,7 +1019,7 @@ void GameScriptObject::callSpaceClearOvert(const NetworkId &ship) std::string GameScriptObject::callDumpTargetInfo( NetworkId &id ) { - if( JavaLibrary::instance() != NULL ) + if( JavaLibrary::instance() != nullptr ) { return JavaLibrary::instance()->getObjectDumpInfo( id ); } @@ -1030,7 +1030,7 @@ std::string GameScriptObject::callDumpTargetInfo( NetworkId &id ) void GameScriptObject::setScriptVar(const std::string & name, int value) { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::setScriptVar(*m_owner, name, value); @@ -1040,7 +1040,7 @@ void GameScriptObject::setScriptVar(const std::string & name, int value) void GameScriptObject::setScriptVar(const std::string & name, float value) { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::setScriptVar(*m_owner, name, value); @@ -1050,7 +1050,7 @@ void GameScriptObject::setScriptVar(const std::string & name, float value) void GameScriptObject::setScriptVar(const std::string & name, const std::string & value) { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::setScriptVar(*m_owner, name, value); @@ -1060,7 +1060,7 @@ void GameScriptObject::setScriptVar(const std::string & name, const std::string void GameScriptObject::packAllScriptVarDeltas() { - if (JavaLibrary::instance() == NULL) + if (JavaLibrary::instance() == nullptr) return; JavaLibrary::packAllDeltaScriptVars(); @@ -1070,7 +1070,7 @@ void GameScriptObject::packAllScriptVarDeltas() void GameScriptObject::clearScriptVars() { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::clearScriptVars(*m_owner); @@ -1080,7 +1080,7 @@ void GameScriptObject::clearScriptVars() void GameScriptObject::packScriptVars(std::vector & target) const { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::packScriptVars(*m_owner, target); @@ -1090,7 +1090,7 @@ void GameScriptObject::packScriptVars(std::vector & target) const void GameScriptObject::unpackScriptVars(const std::vector & source) const { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; JavaLibrary::unpackScriptVars(*m_owner, source); @@ -1100,7 +1100,7 @@ void GameScriptObject::unpackScriptVars(const std::vector & source) const void GameScriptObject::unpackDeltaScriptVars(const std::vector & data) const { - if (JavaLibrary::instance() == NULL || m_owner == NULL) + if (JavaLibrary::instance() == nullptr || m_owner == nullptr) return; DEBUG_REPORT_LOG(! m_owner, ("A game script object received a request to unpack script var synchronization data, but it has no owner object!!! All GameScriptObjects MUST have owners!\n")); @@ -1238,18 +1238,18 @@ namespace Archive GameScriptObject * GameScriptObject::asGameScriptObject(Object * const object) { - ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->getScriptObject() : NULL; + return (serverObject != nullptr) ? serverObject->getScriptObject() : nullptr; } // ---------------------------------------------------------------------- GameScriptObject const * GameScriptObject::asGameScriptObject(Object const * const object) { - ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL; + ServerObject const * const serverObject = (object != nullptr) ? object->asServerObject() : nullptr; - return (serverObject != NULL) ? serverObject->getScriptObject() : NULL; + return (serverObject != nullptr) ? serverObject->getScriptObject() : nullptr; } // ====================================================================== diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index d4746415..d958183a 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -90,7 +90,7 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...) JavaStringPtr createNewString(const char * bytes) { - if (bytes != NULL) + if (bytes != nullptr) { JavaStringPtr result(new JavaString(JavaLibrary::getEnv()->NewStringUTF(bytes))); if (result->getValue() != 0) @@ -103,7 +103,7 @@ JavaStringPtr createNewString(const char * bytes) JavaStringPtr createNewString(const jchar * unicodeChars, jsize len) { - if (unicodeChars != NULL && len >= 0) + if (unicodeChars != nullptr && len >= 0) { JavaStringPtr result(new JavaString(JavaLibrary::getEnv()->NewString(unicodeChars, len))); if (result->getValue() != 0) @@ -902,7 +902,7 @@ LocalRef::LocalRef(jobject src) : LocalRef::~LocalRef() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; } @@ -917,7 +917,7 @@ LocalArrayRef::LocalArrayRef(jarray src) : LocalArrayRef::~LocalArrayRef() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; } @@ -932,7 +932,7 @@ LocalObjectArrayRef::LocalObjectArrayRef(jobjectArray src) : LocalObjectArrayRef::~LocalObjectArrayRef() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; } @@ -1002,13 +1002,13 @@ LocalLongArrayRef::~LocalLongArrayRef() GlobalRef::GlobalRef(const LocalRefParam & src) : LocalRefParam(static_cast(0)) { - if (src.getValue() != 0 && JavaLibrary::getEnv() != NULL) + if (src.getValue() != 0 && JavaLibrary::getEnv() != nullptr) m_ref = JavaLibrary::getEnv()->NewGlobalRef(src.getValue()); } GlobalRef::~GlobalRef() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); m_ref = 0; } @@ -1019,13 +1019,13 @@ GlobalRef::~GlobalRef() GlobalArrayRef::GlobalArrayRef(const LocalObjectArrayRefParam & src) : LocalObjectArrayRefParam(static_cast(0)) { - if (src.getValue() != 0 && JavaLibrary::getEnv() != NULL) + if (src.getValue() != 0 && JavaLibrary::getEnv() != nullptr) m_ref = JavaLibrary::getEnv()->NewGlobalRef(src.getValue()); } GlobalArrayRef::~GlobalArrayRef() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); m_ref = 0; } @@ -1048,10 +1048,10 @@ JavaStringParam::~JavaStringParam() int JavaStringParam::fillBuffer(char * buffer, int size) const { - if (m_ref != 0 && buffer != NULL && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && buffer != nullptr && JavaLibrary::getEnv() != nullptr) { // Get the number of storage bytes required to convert this Java string into a UTF-8 string. - // Include the terminating null byte in the required buffer size. + // Include the terminating nullptr byte in the required buffer size. int requiredBufferSize = JavaLibrary::getEnv()->GetStringUTFLength(static_cast(m_ref)) + 1; if (requiredBufferSize <= size) { @@ -1059,7 +1059,7 @@ int JavaStringParam::fillBuffer(char * buffer, int size) const JavaLibrary::getEnv()->GetStringUTFRegion(static_cast(m_ref), 0, stringLength, buffer); - // Null terminate the string. requiredBufferSize already includes the byte count for the null terminator. + // Null terminate the string. requiredBufferSize already includes the byte count for the nullptr terminator. buffer[requiredBufferSize - 1] = '\0'; return requiredBufferSize; @@ -1077,7 +1077,7 @@ JavaString::JavaString(jstring src) : } JavaString::JavaString(const char * src) : - JavaStringParam(JavaLibrary::getEnv()->NewStringUTF(src != NULL ? src : "")) + JavaStringParam(JavaLibrary::getEnv()->NewStringUTF(src != nullptr ? src : "")) { } @@ -1093,7 +1093,7 @@ JavaString::JavaString(const Unicode::String & src) : JavaString::~JavaString() { - if (m_ref != 0 && JavaLibrary::getEnv() != NULL) + if (m_ref != 0 && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); m_ref = 0; } diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index 5802a20d..750c1f40 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -83,7 +83,7 @@ using namespace JNIWrappersNamespace; #define GET_METHOD(var, clazz, name, sig) var = ms_env->GetMethodID(clazz, name, sig); if (ms_env->ExceptionCheck()) { ms_env->ExceptionDescribe(); WARNING(true, ("Unable to find Java method "#name" for class "#clazz)); return false; } #define GET_STATIC_METHOD(var, clazz, name, sig) var = ms_env->GetStaticMethodID(clazz, name, sig); if (ms_env->ExceptionCheck()) { ms_env->ExceptionDescribe(); WARNING(true, ("Unable to find Java static method "#name" for class "#clazz)); return false; } -#define FREE_CLASS(var) if (ms_env != NULL && var != NULL) { ms_env->DeleteGlobalRef(var); var = NULL; } +#define FREE_CLASS(var) if (ms_env != nullptr && var != nullptr) { ms_env->DeleteGlobalRef(var); var = nullptr; } //======================================================================== // local constants @@ -390,203 +390,203 @@ namespace ScriptMethodsWorldInfoNamespace // class JavaLibrary static members //======================================================================== -JavaLibrary* JavaLibrary::ms_instance = NULL; +JavaLibrary* JavaLibrary::ms_instance = nullptr; int JavaLibrary::ms_javaVmType = JV_none; -//void* JavaLibrary::ms_libHandle = NULL; -JavaVM* JavaLibrary::ms_jvm = NULL; -JNIEnv* JavaLibrary::ms_env = NULL; -Thread * JavaLibrary::m_initializerThread = NULL; +//void* JavaLibrary::ms_libHandle = nullptr; +JavaVM* JavaLibrary::ms_jvm = nullptr; +JNIEnv* JavaLibrary::ms_env = nullptr; +Thread * JavaLibrary::m_initializerThread = nullptr; int JavaLibrary::ms_envCount = 0; int JavaLibrary::ms_currentRecursionCount = 0; bool JavaLibrary::ms_resetJava = false; -jclass JavaLibrary::ms_clsScriptEntry = NULL; -jobject JavaLibrary::ms_scriptEntry = NULL; -jmethodID JavaLibrary::ms_midScriptEntryGetOwnerContext = NULL; -jmethodID JavaLibrary::ms_midScriptEntryEnableLogging = NULL; -jmethodID JavaLibrary::ms_midScriptEntryEnableNewJediTracking = NULL; -jmethodID JavaLibrary::ms_midScriptEntryGetFreeMem = NULL; -jclass JavaLibrary::ms_clsObject = NULL; -jclass JavaLibrary::ms_clsClass = NULL; -jmethodID JavaLibrary::ms_midClassGetName = NULL; -jmethodID JavaLibrary::ms_midClassGetMethods = NULL; -jclass JavaLibrary::ms_clsMethod = NULL; -jmethodID JavaLibrary::ms_midMethodGetName = NULL; -jclass JavaLibrary::ms_clsBoolean = NULL; -jclass JavaLibrary::ms_clsBooleanArray = NULL; -jmethodID JavaLibrary::ms_midBoolean = NULL; -jmethodID JavaLibrary::ms_midBooleanBooleanValue = NULL; -jclass JavaLibrary::ms_clsInteger = NULL; -jclass JavaLibrary::ms_clsIntegerArray = NULL; -jmethodID JavaLibrary::ms_midInteger = NULL; -jmethodID JavaLibrary::ms_midIntegerIntValue = NULL; -jclass JavaLibrary::ms_clsModifiableInt = NULL; -jmethodID JavaLibrary::ms_midModifiableInt = NULL; -jfieldID JavaLibrary::ms_fidModifiableIntData = NULL; -jclass JavaLibrary::ms_clsFloat = NULL; -jclass JavaLibrary::ms_clsFloatArray = NULL; -jmethodID JavaLibrary::ms_midFloat = NULL; -jmethodID JavaLibrary::ms_midFloatFloatValue = NULL; -jclass JavaLibrary::ms_clsModifiableFloat = NULL; -jmethodID JavaLibrary::ms_midModifiableFloat = NULL; -jfieldID JavaLibrary::ms_fidModifiableFloatData = NULL; -jclass JavaLibrary::ms_clsString = NULL; -jclass JavaLibrary::ms_clsStringArray = NULL; -jclass JavaLibrary::ms_clsMap = NULL; -jmethodID JavaLibrary::ms_midMapPut = NULL; -jmethodID JavaLibrary::ms_midMapGet = NULL; -jclass JavaLibrary::ms_clsHashtable = NULL; -jmethodID JavaLibrary::ms_midHashtable = NULL; -jclass JavaLibrary::ms_clsThrowable = NULL; -jclass JavaLibrary::ms_clsError = NULL; -jclass JavaLibrary::ms_clsStackOverflowError = NULL; -jmethodID JavaLibrary::ms_midThrowableGetMessage = NULL; -jclass JavaLibrary::ms_clsThread = NULL; -jmethodID JavaLibrary::ms_midThreadDumpStack = NULL; -jclass JavaLibrary::ms_clsInternalScriptError = NULL; -jclass JavaLibrary::ms_clsInternalScriptSeriousError = NULL; -jfieldID JavaLibrary::ms_fidInternalScriptSeriousErrorError = NULL; -jclass JavaLibrary::ms_clsDictionary = NULL; -jmethodID JavaLibrary::ms_midDictionary = NULL; -jmethodID JavaLibrary::ms_midDictionaryPack = NULL; -jmethodID JavaLibrary::ms_midDictionaryUnpack = NULL; -jmethodID JavaLibrary::ms_midDictionaryKeys = NULL; -jmethodID JavaLibrary::ms_midDictionaryValues = NULL; -jmethodID JavaLibrary::ms_midDictionaryPut = NULL; -jmethodID JavaLibrary::ms_midDictionaryPutInt = NULL; -jmethodID JavaLibrary::ms_midDictionaryPutFloat = NULL; -jmethodID JavaLibrary::ms_midDictionaryPutBool = NULL; -jmethodID JavaLibrary::ms_midDictionaryGet = NULL; -jclass JavaLibrary::ms_clsCollection = NULL; -jmethodID JavaLibrary::ms_midCollectionToArray = NULL; -jclass JavaLibrary::ms_clsEnumeration = NULL; -jmethodID JavaLibrary::ms_midEnumerationHasMoreElements = NULL; -jmethodID JavaLibrary::ms_midEnumerationNextElement = NULL; -jclass JavaLibrary::ms_clsBaseClassRangeInfo = NULL; -jfieldID JavaLibrary::ms_fidBaseClassRangeInfoMinRange = NULL; -jfieldID JavaLibrary::ms_fidBaseClassRangeInfoMaxRange = NULL; -jclass JavaLibrary::ms_clsBaseClassAttackerResults = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsId = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsWeapon = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsPosture = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTrailBits = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsClientEffectId = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsActionName = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsUseLocation = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTargetLocation = NULL; -jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTargetCell = NULL; -jclass JavaLibrary::ms_clsBaseClassDefenderResults = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsId = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsPosture = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsResult = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsClientEffectId = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsHitLocation = NULL; -jfieldID JavaLibrary::ms_fidBaseClassDefenderDamageAmount = NULL; -jclass JavaLibrary::ms_clsDynamicVariable = NULL; -jfieldID JavaLibrary::ms_fidDynamicVariableName = NULL; -jfieldID JavaLibrary::ms_fidDynamicVariableData = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableInt = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableIntArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableFloat = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableFloatArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableString = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableStringArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableObjId = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableObjIdArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableLocation = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableLocationArray = NULL; -jclass JavaLibrary::ms_clsDynamicVariableList = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableList = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSet = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetInt = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetIntArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetFloat = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetFloatArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetString = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetStringArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetObjId = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetObjIdArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetLocation = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetLocationArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetStringId = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetStringIdArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetTransform = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetTransformArray = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetVector = NULL; -jmethodID JavaLibrary::ms_midDynamicVariableListSetVectorArray = NULL; -jclass JavaLibrary::ms_clsObjId = NULL; -jclass JavaLibrary::ms_clsObjIdArray = NULL; -jmethodID JavaLibrary::ms_midObjIdGetValue = NULL; -jmethodID JavaLibrary::ms_midObjIdGetObjId = NULL; -jmethodID JavaLibrary::ms_midObjIdClearObjId = NULL; -jmethodID JavaLibrary::ms_midObjIdFlagDestroyed = NULL; -jmethodID JavaLibrary::ms_midObjIdSetAuthoritative = NULL; -jmethodID JavaLibrary::ms_midObjIdSetLoaded = NULL; -jmethodID JavaLibrary::ms_midObjIdSetInitialized = NULL; -jmethodID JavaLibrary::ms_midObjIdSetLoggedIn = NULL; -jmethodID JavaLibrary::ms_midObjIdPackAllDeltaScriptVars = NULL; -jmethodID JavaLibrary::ms_midObjIdSetScriptVarInt = NULL; -jmethodID JavaLibrary::ms_midObjIdSetScriptVarFloat = NULL; -jmethodID JavaLibrary::ms_midObjIdSetScriptVarString = NULL; -jmethodID JavaLibrary::ms_midObjIdClearScriptVars = NULL; -jmethodID JavaLibrary::ms_midObjIdPackScriptVars = NULL; -jmethodID JavaLibrary::ms_midObjIdUnpackDeltaScriptVars = NULL; -jmethodID JavaLibrary::ms_midObjIdUnpackScriptVars = NULL; -jmethodID JavaLibrary::ms_midObjIdAttachScript = NULL; -jmethodID JavaLibrary::ms_midObjIdAttachScripts = NULL; -jmethodID JavaLibrary::ms_midObjIdDetachScript = NULL; -jmethodID JavaLibrary::ms_midObjIdDetachAllScripts = NULL; -jclass JavaLibrary::ms_clsStringId = NULL; -jmethodID JavaLibrary::ms_midStringId = NULL; -jclass JavaLibrary::ms_clsStringIdArray = NULL; -jfieldID JavaLibrary::ms_fidStringIdTable = NULL; -jfieldID JavaLibrary::ms_fidStringIdAsciiId = NULL; -jfieldID JavaLibrary::ms_fidStringIdIndexId = NULL; -jclass JavaLibrary::ms_clsModifiableStringId = NULL; -jclass JavaLibrary::ms_clsAttribute = NULL; -jmethodID JavaLibrary::ms_midAttribute = NULL; -jfieldID JavaLibrary::ms_fidAttributeType = NULL; -jfieldID JavaLibrary::ms_fidAttributeValue = NULL; -jclass JavaLibrary::ms_clsAttribMod = NULL; -jmethodID JavaLibrary::ms_midAttribMod = NULL; -jfieldID JavaLibrary::ms_fidAttribModName = NULL; -jfieldID JavaLibrary::ms_fidAttribModSkill = NULL; -jfieldID JavaLibrary::ms_fidAttribModType = NULL; -jfieldID JavaLibrary::ms_fidAttribModValue = NULL; -jfieldID JavaLibrary::ms_fidAttribModTime = NULL; -jfieldID JavaLibrary::ms_fidAttribModAttack = NULL; -jfieldID JavaLibrary::ms_fidAttribModDecay = NULL; -jfieldID JavaLibrary::ms_fidAttribModFlags = NULL; -jclass JavaLibrary::ms_clsMentalState = NULL; -jmethodID JavaLibrary::ms_midMentalState = NULL; -jfieldID JavaLibrary::ms_fidMentalStateType = NULL; -jfieldID JavaLibrary::ms_fidMentalStateValue = NULL; -jclass JavaLibrary::ms_clsMentalStateMod = NULL; -jmethodID JavaLibrary::ms_midMentalStateMod = NULL; -jfieldID JavaLibrary::ms_fidMentalStateModType = NULL; -jfieldID JavaLibrary::ms_fidMentalStateModValue = NULL; -jfieldID JavaLibrary::ms_fidMentalStateModTime = NULL; -jfieldID JavaLibrary::ms_fidMentalStateModAttack = NULL; -jfieldID JavaLibrary::ms_fidMentalStateModDecay = NULL; -jclass JavaLibrary::ms_clsLocation = NULL; -jclass JavaLibrary::ms_clsLocationArray = NULL; -jfieldID JavaLibrary::ms_fidLocationX = NULL; -jfieldID JavaLibrary::ms_fidLocationY = NULL; -jfieldID JavaLibrary::ms_fidLocationZ = NULL; -jfieldID JavaLibrary::ms_fidLocationArea = NULL; -jfieldID JavaLibrary::ms_fidLocationCell = NULL; -jmethodID JavaLibrary::ms_midRunOne = NULL; -jmethodID JavaLibrary::ms_midRunAll = NULL; -jmethodID JavaLibrary::ms_midCallMessages = NULL; -jmethodID JavaLibrary::ms_midRunConsoleHandler = NULL; -jmethodID JavaLibrary::ms_midUnload = NULL; -jmethodID JavaLibrary::ms_midGetClass = NULL; -jmethodID JavaLibrary::ms_midGetScriptFunctions = NULL; -jclass JavaLibrary::ms_clsMenuInfo = NULL; -jmethodID JavaLibrary::ms_midMenuInfo = NULL; -jmethodID JavaLibrary::ms_midMenuInfoSetMenuItemsInternal = NULL; -jmethodID JavaLibrary::ms_midMenuInfoGetMenuItemsInternal = NULL; -jclass JavaLibrary::ms_clsMenuInfoData = NULL; -jmethodID JavaLibrary::ms_midMenuInfoData = NULL; +jclass JavaLibrary::ms_clsScriptEntry = nullptr; +jobject JavaLibrary::ms_scriptEntry = nullptr; +jmethodID JavaLibrary::ms_midScriptEntryGetOwnerContext = nullptr; +jmethodID JavaLibrary::ms_midScriptEntryEnableLogging = nullptr; +jmethodID JavaLibrary::ms_midScriptEntryEnableNewJediTracking = nullptr; +jmethodID JavaLibrary::ms_midScriptEntryGetFreeMem = nullptr; +jclass JavaLibrary::ms_clsObject = nullptr; +jclass JavaLibrary::ms_clsClass = nullptr; +jmethodID JavaLibrary::ms_midClassGetName = nullptr; +jmethodID JavaLibrary::ms_midClassGetMethods = nullptr; +jclass JavaLibrary::ms_clsMethod = nullptr; +jmethodID JavaLibrary::ms_midMethodGetName = nullptr; +jclass JavaLibrary::ms_clsBoolean = nullptr; +jclass JavaLibrary::ms_clsBooleanArray = nullptr; +jmethodID JavaLibrary::ms_midBoolean = nullptr; +jmethodID JavaLibrary::ms_midBooleanBooleanValue = nullptr; +jclass JavaLibrary::ms_clsInteger = nullptr; +jclass JavaLibrary::ms_clsIntegerArray = nullptr; +jmethodID JavaLibrary::ms_midInteger = nullptr; +jmethodID JavaLibrary::ms_midIntegerIntValue = nullptr; +jclass JavaLibrary::ms_clsModifiableInt = nullptr; +jmethodID JavaLibrary::ms_midModifiableInt = nullptr; +jfieldID JavaLibrary::ms_fidModifiableIntData = nullptr; +jclass JavaLibrary::ms_clsFloat = nullptr; +jclass JavaLibrary::ms_clsFloatArray = nullptr; +jmethodID JavaLibrary::ms_midFloat = nullptr; +jmethodID JavaLibrary::ms_midFloatFloatValue = nullptr; +jclass JavaLibrary::ms_clsModifiableFloat = nullptr; +jmethodID JavaLibrary::ms_midModifiableFloat = nullptr; +jfieldID JavaLibrary::ms_fidModifiableFloatData = nullptr; +jclass JavaLibrary::ms_clsString = nullptr; +jclass JavaLibrary::ms_clsStringArray = nullptr; +jclass JavaLibrary::ms_clsMap = nullptr; +jmethodID JavaLibrary::ms_midMapPut = nullptr; +jmethodID JavaLibrary::ms_midMapGet = nullptr; +jclass JavaLibrary::ms_clsHashtable = nullptr; +jmethodID JavaLibrary::ms_midHashtable = nullptr; +jclass JavaLibrary::ms_clsThrowable = nullptr; +jclass JavaLibrary::ms_clsError = nullptr; +jclass JavaLibrary::ms_clsStackOverflowError = nullptr; +jmethodID JavaLibrary::ms_midThrowableGetMessage = nullptr; +jclass JavaLibrary::ms_clsThread = nullptr; +jmethodID JavaLibrary::ms_midThreadDumpStack = nullptr; +jclass JavaLibrary::ms_clsInternalScriptError = nullptr; +jclass JavaLibrary::ms_clsInternalScriptSeriousError = nullptr; +jfieldID JavaLibrary::ms_fidInternalScriptSeriousErrorError = nullptr; +jclass JavaLibrary::ms_clsDictionary = nullptr; +jmethodID JavaLibrary::ms_midDictionary = nullptr; +jmethodID JavaLibrary::ms_midDictionaryPack = nullptr; +jmethodID JavaLibrary::ms_midDictionaryUnpack = nullptr; +jmethodID JavaLibrary::ms_midDictionaryKeys = nullptr; +jmethodID JavaLibrary::ms_midDictionaryValues = nullptr; +jmethodID JavaLibrary::ms_midDictionaryPut = nullptr; +jmethodID JavaLibrary::ms_midDictionaryPutInt = nullptr; +jmethodID JavaLibrary::ms_midDictionaryPutFloat = nullptr; +jmethodID JavaLibrary::ms_midDictionaryPutBool = nullptr; +jmethodID JavaLibrary::ms_midDictionaryGet = nullptr; +jclass JavaLibrary::ms_clsCollection = nullptr; +jmethodID JavaLibrary::ms_midCollectionToArray = nullptr; +jclass JavaLibrary::ms_clsEnumeration = nullptr; +jmethodID JavaLibrary::ms_midEnumerationHasMoreElements = nullptr; +jmethodID JavaLibrary::ms_midEnumerationNextElement = nullptr; +jclass JavaLibrary::ms_clsBaseClassRangeInfo = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassRangeInfoMinRange = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassRangeInfoMaxRange = nullptr; +jclass JavaLibrary::ms_clsBaseClassAttackerResults = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsId = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsWeapon = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsPosture = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTrailBits = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsClientEffectId = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsActionName = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsUseLocation = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTargetLocation = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassAttackerResultsTargetCell = nullptr; +jclass JavaLibrary::ms_clsBaseClassDefenderResults = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsId = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsPosture = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsResult = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsClientEffectId = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderResultsHitLocation = nullptr; +jfieldID JavaLibrary::ms_fidBaseClassDefenderDamageAmount = nullptr; +jclass JavaLibrary::ms_clsDynamicVariable = nullptr; +jfieldID JavaLibrary::ms_fidDynamicVariableName = nullptr; +jfieldID JavaLibrary::ms_fidDynamicVariableData = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableInt = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableIntArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableFloat = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableFloatArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableString = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableStringArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableObjId = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableObjIdArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableLocation = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableLocationArray = nullptr; +jclass JavaLibrary::ms_clsDynamicVariableList = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableList = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSet = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetInt = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetIntArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetFloat = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetFloatArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetString = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetStringArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetObjId = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetObjIdArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetLocation = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetLocationArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetStringId = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetStringIdArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetTransform = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetTransformArray = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetVector = nullptr; +jmethodID JavaLibrary::ms_midDynamicVariableListSetVectorArray = nullptr; +jclass JavaLibrary::ms_clsObjId = nullptr; +jclass JavaLibrary::ms_clsObjIdArray = nullptr; +jmethodID JavaLibrary::ms_midObjIdGetValue = nullptr; +jmethodID JavaLibrary::ms_midObjIdGetObjId = nullptr; +jmethodID JavaLibrary::ms_midObjIdClearObjId = nullptr; +jmethodID JavaLibrary::ms_midObjIdFlagDestroyed = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetAuthoritative = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetLoaded = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetInitialized = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetLoggedIn = nullptr; +jmethodID JavaLibrary::ms_midObjIdPackAllDeltaScriptVars = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetScriptVarInt = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetScriptVarFloat = nullptr; +jmethodID JavaLibrary::ms_midObjIdSetScriptVarString = nullptr; +jmethodID JavaLibrary::ms_midObjIdClearScriptVars = nullptr; +jmethodID JavaLibrary::ms_midObjIdPackScriptVars = nullptr; +jmethodID JavaLibrary::ms_midObjIdUnpackDeltaScriptVars = nullptr; +jmethodID JavaLibrary::ms_midObjIdUnpackScriptVars = nullptr; +jmethodID JavaLibrary::ms_midObjIdAttachScript = nullptr; +jmethodID JavaLibrary::ms_midObjIdAttachScripts = nullptr; +jmethodID JavaLibrary::ms_midObjIdDetachScript = nullptr; +jmethodID JavaLibrary::ms_midObjIdDetachAllScripts = nullptr; +jclass JavaLibrary::ms_clsStringId = nullptr; +jmethodID JavaLibrary::ms_midStringId = nullptr; +jclass JavaLibrary::ms_clsStringIdArray = nullptr; +jfieldID JavaLibrary::ms_fidStringIdTable = nullptr; +jfieldID JavaLibrary::ms_fidStringIdAsciiId = nullptr; +jfieldID JavaLibrary::ms_fidStringIdIndexId = nullptr; +jclass JavaLibrary::ms_clsModifiableStringId = nullptr; +jclass JavaLibrary::ms_clsAttribute = nullptr; +jmethodID JavaLibrary::ms_midAttribute = nullptr; +jfieldID JavaLibrary::ms_fidAttributeType = nullptr; +jfieldID JavaLibrary::ms_fidAttributeValue = nullptr; +jclass JavaLibrary::ms_clsAttribMod = nullptr; +jmethodID JavaLibrary::ms_midAttribMod = nullptr; +jfieldID JavaLibrary::ms_fidAttribModName = nullptr; +jfieldID JavaLibrary::ms_fidAttribModSkill = nullptr; +jfieldID JavaLibrary::ms_fidAttribModType = nullptr; +jfieldID JavaLibrary::ms_fidAttribModValue = nullptr; +jfieldID JavaLibrary::ms_fidAttribModTime = nullptr; +jfieldID JavaLibrary::ms_fidAttribModAttack = nullptr; +jfieldID JavaLibrary::ms_fidAttribModDecay = nullptr; +jfieldID JavaLibrary::ms_fidAttribModFlags = nullptr; +jclass JavaLibrary::ms_clsMentalState = nullptr; +jmethodID JavaLibrary::ms_midMentalState = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateType = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateValue = nullptr; +jclass JavaLibrary::ms_clsMentalStateMod = nullptr; +jmethodID JavaLibrary::ms_midMentalStateMod = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateModType = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateModValue = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateModTime = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateModAttack = nullptr; +jfieldID JavaLibrary::ms_fidMentalStateModDecay = nullptr; +jclass JavaLibrary::ms_clsLocation = nullptr; +jclass JavaLibrary::ms_clsLocationArray = nullptr; +jfieldID JavaLibrary::ms_fidLocationX = nullptr; +jfieldID JavaLibrary::ms_fidLocationY = nullptr; +jfieldID JavaLibrary::ms_fidLocationZ = nullptr; +jfieldID JavaLibrary::ms_fidLocationArea = nullptr; +jfieldID JavaLibrary::ms_fidLocationCell = nullptr; +jmethodID JavaLibrary::ms_midRunOne = nullptr; +jmethodID JavaLibrary::ms_midRunAll = nullptr; +jmethodID JavaLibrary::ms_midCallMessages = nullptr; +jmethodID JavaLibrary::ms_midRunConsoleHandler = nullptr; +jmethodID JavaLibrary::ms_midUnload = nullptr; +jmethodID JavaLibrary::ms_midGetClass = nullptr; +jmethodID JavaLibrary::ms_midGetScriptFunctions = nullptr; +jclass JavaLibrary::ms_clsMenuInfo = nullptr; +jmethodID JavaLibrary::ms_midMenuInfo = nullptr; +jmethodID JavaLibrary::ms_midMenuInfoSetMenuItemsInternal = nullptr; +jmethodID JavaLibrary::ms_midMenuInfoGetMenuItemsInternal = nullptr; +jclass JavaLibrary::ms_clsMenuInfoData = nullptr; +jmethodID JavaLibrary::ms_midMenuInfoData = nullptr; jfieldID JavaLibrary::ms_fidMenuInfoDataId; jfieldID JavaLibrary::ms_fidMenuInfoDataParent; jfieldID JavaLibrary::ms_fidMenuInfoDataType; @@ -601,82 +601,82 @@ jclass JavaLibrary::ms_clsPalcolorCustomVar; jmethodID JavaLibrary::ms_midPalcolorCustomVar; jclass JavaLibrary::ms_clsColor; jmethodID JavaLibrary::ms_midColor; -jclass JavaLibrary::ms_clsDraftSchematic = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCategory = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicComplexity = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlots = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribs = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicExperimentalAttribs = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCustomizations = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribMap = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicObjectTemplateCreated = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicScripts = NULL; -jclass JavaLibrary::ms_clsDraftSchematicSlot = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotName = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotOption = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredientType = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredientName = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredients = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotComplexity = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotAmountRequired = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSlotAppearance = NULL; -jclass JavaLibrary::ms_clsDraftSchematicAttrib = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribName = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribMinValue = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribMaxValue = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribResourceMaxValue = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicAttribCurrentValue = NULL; -jclass JavaLibrary::ms_clsDraftSchematicSimpleIngredient = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientIngredient = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientCount = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientSource = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientXpType = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientXpAmount = NULL; -jclass JavaLibrary::ms_clsDraftSchematicCustom = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCustomName = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCustomValue = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCustomMinValue = NULL; -jfieldID JavaLibrary::ms_fidDraftSchematicCustomMaxValue = NULL; -//jfieldID JavaLibrary::ms_fidDraftSchematicCustomLocked = NULL; -jclass JavaLibrary::ms_clsMapLocation = NULL; -jmethodID JavaLibrary::ms_midMapLocation = NULL; -jclass JavaLibrary::ms_clsRegion = NULL; -jmethodID JavaLibrary::ms_midRegion = NULL; -jfieldID JavaLibrary::ms_fidRegionName = NULL; -jfieldID JavaLibrary::ms_fidRegionPlanet = NULL; -jclass JavaLibrary::ms_clsCombatEngine = NULL; -jclass JavaLibrary::ms_clsCombatEngineCombatantData = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataPos = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataWorldPos = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataRadius = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataIsCreature = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataPosture = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataLocomotion = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataScriptMod = NULL; -jclass JavaLibrary::ms_clsCombatEngineAttackerData = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineAttackerDataWeaponSkill = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineAttackerDataAims = NULL; -jclass JavaLibrary::ms_clsCombatEngineDefenderData = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataCombatSkeleton = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataCover = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataHitLocationChances = NULL; -jclass JavaLibrary::ms_clsCombatEngineWeaponData = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataId = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMinDamage = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMaxDamage = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataWeaponType = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackType = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataDamageType = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataElementalType = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataElementalValue = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackSpeed = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataWoundChance = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAccuracy = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMinRange = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMaxRange = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataDamageRadius = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackCost = NULL; -jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataIsDisabled = NULL; +jclass JavaLibrary::ms_clsDraftSchematic = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCategory = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicComplexity = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlots = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribs = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicExperimentalAttribs = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCustomizations = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribMap = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicObjectTemplateCreated = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicScripts = nullptr; +jclass JavaLibrary::ms_clsDraftSchematicSlot = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotName = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotOption = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredientType = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredientName = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotIngredients = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotComplexity = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotAmountRequired = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSlotAppearance = nullptr; +jclass JavaLibrary::ms_clsDraftSchematicAttrib = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribName = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribMinValue = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribMaxValue = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribResourceMaxValue = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicAttribCurrentValue = nullptr; +jclass JavaLibrary::ms_clsDraftSchematicSimpleIngredient = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientIngredient = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientCount = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientSource = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientXpType = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicSimpleIngredientXpAmount = nullptr; +jclass JavaLibrary::ms_clsDraftSchematicCustom = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCustomName = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCustomValue = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCustomMinValue = nullptr; +jfieldID JavaLibrary::ms_fidDraftSchematicCustomMaxValue = nullptr; +//jfieldID JavaLibrary::ms_fidDraftSchematicCustomLocked = nullptr; +jclass JavaLibrary::ms_clsMapLocation = nullptr; +jmethodID JavaLibrary::ms_midMapLocation = nullptr; +jclass JavaLibrary::ms_clsRegion = nullptr; +jmethodID JavaLibrary::ms_midRegion = nullptr; +jfieldID JavaLibrary::ms_fidRegionName = nullptr; +jfieldID JavaLibrary::ms_fidRegionPlanet = nullptr; +jclass JavaLibrary::ms_clsCombatEngine = nullptr; +jclass JavaLibrary::ms_clsCombatEngineCombatantData = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataPos = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataWorldPos = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataRadius = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataIsCreature = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataPosture = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataLocomotion = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineCombatantDataScriptMod = nullptr; +jclass JavaLibrary::ms_clsCombatEngineAttackerData = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineAttackerDataWeaponSkill = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineAttackerDataAims = nullptr; +jclass JavaLibrary::ms_clsCombatEngineDefenderData = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataCombatSkeleton = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataCover = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineDefenderDataHitLocationChances = nullptr; +jclass JavaLibrary::ms_clsCombatEngineWeaponData = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataId = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMinDamage = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMaxDamage = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataWeaponType = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackType = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataDamageType = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataElementalType = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataElementalValue = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackSpeed = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataWoundChance = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAccuracy = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMinRange = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataMaxRange = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataDamageRadius = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataAttackCost = nullptr; +jfieldID JavaLibrary::ms_fidCombatEngineWeaponDataIsDisabled = nullptr; jclass JavaLibrary::ms_clsCombatEngineHitResult; jfieldID JavaLibrary::ms_fidCombatEngineHitResultSuccess; jfieldID JavaLibrary::ms_fidCombatEngineHitResultCritical; @@ -706,40 +706,40 @@ jfieldID JavaLibrary::ms_fidCombatEngineHitResultCritDamage; jfieldID JavaLibrary::ms_fidCombatEngineHitResultBlockedDamage; jfieldID JavaLibrary::ms_fidCombatEngineHitResultBlockingArmor; jfieldID JavaLibrary::ms_fidCombatEngineHitResultBleedingChance; -jclass JavaLibrary::ms_clsTransform = NULL; -jclass JavaLibrary::ms_clsTransformArray = NULL; -jmethodID JavaLibrary::ms_midTransform = NULL; -jfieldID JavaLibrary::ms_fidTransformMatrix = NULL; -jclass JavaLibrary::ms_clsVector = NULL; -jclass JavaLibrary::ms_clsVectorArray = NULL; -jfieldID JavaLibrary::ms_fidVectorX = NULL; -jfieldID JavaLibrary::ms_fidVectorY = NULL; -jfieldID JavaLibrary::ms_fidVectorZ = NULL; -jclass JavaLibrary::ms_clsResourceDensity = NULL; -jfieldID JavaLibrary::ms_fidResourceDensityResourceType = NULL; -jfieldID JavaLibrary::ms_fidResourceDensityDensity = NULL; -jclass JavaLibrary::ms_clsResourceAttribute = NULL; -jfieldID JavaLibrary::ms_fidResourceAttributeName = NULL; -jfieldID JavaLibrary::ms_fidResourceAttributeValue = NULL; -jclass JavaLibrary::ms_clsLibrarySpaceTransition = NULL; -jmethodID JavaLibrary::ms_midLibrarySpaceTransitionSetPlayerOvert = NULL; -jmethodID JavaLibrary::ms_midLibrarySpaceTransitionClearOvertStatus = NULL; +jclass JavaLibrary::ms_clsTransform = nullptr; +jclass JavaLibrary::ms_clsTransformArray = nullptr; +jmethodID JavaLibrary::ms_midTransform = nullptr; +jfieldID JavaLibrary::ms_fidTransformMatrix = nullptr; +jclass JavaLibrary::ms_clsVector = nullptr; +jclass JavaLibrary::ms_clsVectorArray = nullptr; +jfieldID JavaLibrary::ms_fidVectorX = nullptr; +jfieldID JavaLibrary::ms_fidVectorY = nullptr; +jfieldID JavaLibrary::ms_fidVectorZ = nullptr; +jclass JavaLibrary::ms_clsResourceDensity = nullptr; +jfieldID JavaLibrary::ms_fidResourceDensityResourceType = nullptr; +jfieldID JavaLibrary::ms_fidResourceDensityDensity = nullptr; +jclass JavaLibrary::ms_clsResourceAttribute = nullptr; +jfieldID JavaLibrary::ms_fidResourceAttributeName = nullptr; +jfieldID JavaLibrary::ms_fidResourceAttributeValue = nullptr; +jclass JavaLibrary::ms_clsLibrarySpaceTransition = nullptr; +jmethodID JavaLibrary::ms_midLibrarySpaceTransitionSetPlayerOvert = nullptr; +jmethodID JavaLibrary::ms_midLibrarySpaceTransitionClearOvertStatus = nullptr; ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// // CS handlers -jclass JavaLibrary::ms_clsLibraryDump = NULL; -jmethodID JavaLibrary::ms_midLibraryDumpDumpTargetInfo = NULL; +jclass JavaLibrary::ms_clsLibraryDump = nullptr; +jmethodID JavaLibrary::ms_midLibraryDumpDumpTargetInfo = nullptr; -jclass JavaLibrary::ms_clsLibraryGMLib = NULL; -jmethodID JavaLibrary::ms_midLibraryGMLibFreeze = NULL; -jmethodID JavaLibrary::ms_midLibraryGMLibUnfreeze = NULL; +jclass JavaLibrary::ms_clsLibraryGMLib = nullptr; +jmethodID JavaLibrary::ms_midLibraryGMLibFreeze = nullptr; +jmethodID JavaLibrary::ms_midLibraryGMLibUnfreeze = nullptr; ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// int JavaLibrary::ms_loaded = 0; -Semaphore * JavaLibrary::ms_shutdownJava = NULL; +Semaphore * JavaLibrary::ms_shutdownJava = nullptr; int JavaLibrary::GlobalInstances::ms_stringIdIndex = 0; int JavaLibrary::GlobalInstances::ms_attribModIndex = 0; @@ -778,7 +778,7 @@ void JavaLibrary::throwScriptException(char const * const format, ...) void JavaLibrary::throwScriptException(char const * const format, va_list va) { - DEBUG_FATAL(!ms_env, ("JavaLibrary::throwScriptException: ms_env is NULL")); + DEBUG_FATAL(!ms_env, ("JavaLibrary::throwScriptException: ms_env is nullptr")); if (ms_env) { char buffer[1024]; @@ -818,28 +818,28 @@ void JavaLibrary::fatalHandler(int signum) // it turns out that in some java crashes we don't even have 2 return // addresses, so check 0 and 1 just to make sure bool result2 = false; - void *crashAddress2a = NULL; - void *crashAddress2b = NULL; - void *crashAddress2c = NULL; - void *frameAddressA = NULL; - void *frameAddressB = NULL; + void *crashAddress2a = nullptr; + void *crashAddress2b = nullptr; + void *crashAddress2c = nullptr; + void *frameAddressA = nullptr; + void *frameAddressB = nullptr; uint32 frameAddressHigh = (reinterpret_cast(frameAddress) >> 16); crashAddress2a = __builtin_return_address(0); - if (crashAddress2a != NULL) + if (crashAddress2a != nullptr) { frameAddressA = __builtin_frame_address(1); - if (frameAddressA != NULL && + if (frameAddressA != nullptr && (reinterpret_cast(frameAddressA) >> 16 == frameAddressHigh)) { crashAddress2b = __builtin_return_address(1); - if (crashAddress2b != NULL) + if (crashAddress2b != nullptr) { frameAddressB = __builtin_frame_address(2); - if (frameAddressB != NULL && + if (frameAddressB != nullptr && (reinterpret_cast(frameAddressB) >> 16 == frameAddressHigh)) { crashAddress2c = __builtin_return_address(2); - if (crashAddress2c != NULL) + if (crashAddress2c != nullptr) { result2 = DebugHelp::lookupAddress(reinterpret_cast( crashAddress2c), lib2, file2, BUFLEN, line2); @@ -850,7 +850,7 @@ void JavaLibrary::fatalHandler(int signum) } bool javaCrash = true; - if ((result1 || result2) && strstr(lib1, "libjvm.so") == NULL && strstr(lib2, "libjvm.so") == NULL) + if ((result1 || result2) && strstr(lib1, "libjvm.so") == nullptr && strstr(lib2, "libjvm.so") == nullptr) { if (result1 && result2) { @@ -873,7 +873,7 @@ void JavaLibrary::fatalHandler(int signum) if (javaCrash) { fprintf(stderr, "I think I crashed in Java, calling the Java segfault hanlder.\n"); - IGNORE_RETURN(sigaction(SIGSEGV, &JavaSa, NULL)); + IGNORE_RETURN(sigaction(SIGSEGV, &JavaSa, nullptr)); IGNORE_RETURN(pthread_kill(pthread_self(), SIGSEGV)); } else @@ -881,11 +881,11 @@ void JavaLibrary::fatalHandler(int signum) // destroy Java threads // @note apathy - this pthread method is not in later versions of glibc //pthread_kill_other_threads_np(); - ms_instance = NULL; - ms_env = NULL; - ms_jvm = NULL; + ms_instance = nullptr; + ms_env = nullptr; + ms_jvm = nullptr; // restore original signal handler and rethrow signal - IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, NULL)); + IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, nullptr)); IGNORE_RETURN(pthread_kill(pthread_self(), SIGSEGV)); } } @@ -901,7 +901,7 @@ JavaLibrary::JavaLibrary(void) { int i; - if (ms_instance != NULL || ms_loaded != 0) + if (ms_instance != nullptr || ms_loaded != 0) return; ms_shutdownJava = new Semaphore(); @@ -951,7 +951,7 @@ JavaLibrary::~JavaLibrary() { disconnectFromJava(); - if (ms_shutdownJava != NULL) + if (ms_shutdownJava != nullptr) { // tell the initialize thread to shut down if (ms_loaded > 0) @@ -961,10 +961,10 @@ JavaLibrary::~JavaLibrary() Os::sleep(100); } delete ms_shutdownJava; - ms_shutdownJava = NULL; + ms_shutdownJava = nullptr; } - ms_instance = NULL; + ms_instance = nullptr; } // JavaLibrary::~JavaLibrary //---------------------------------------------------------------------- @@ -974,12 +974,12 @@ JavaLibrary::~JavaLibrary() */ void JavaLibrary::install(void) { - if (ms_instance == NULL) + if (ms_instance == nullptr) { JavaLibrary *lib = new JavaLibrary; if (lib != ms_instance) { - if (ms_instance == NULL) + if (ms_instance == nullptr) { delete lib; if (ms_javaVmType != JV_none) @@ -998,10 +998,10 @@ void JavaLibrary::install(void) */ void JavaLibrary::remove(void) { - if (ms_instance != NULL) + if (ms_instance != nullptr) { JavaLibrary * temp = ms_instance; - ms_instance = NULL; + ms_instance = nullptr; delete temp; s_profileSections.clear(); } @@ -1023,7 +1023,7 @@ void JavaLibrary::initializeJavaThread() } const char *javaVMName = ConfigServerGame::getJavaVMName(); - if (javaVMName == NULL || ( + if (javaVMName == nullptr || ( strcmp(javaVMName, "none") != 0 && strcmp(javaVMName, "ibm") != 0 && strcmp(javaVMName, "sun") != 0)) @@ -1050,21 +1050,21 @@ void JavaLibrary::initializeJavaThread() #ifdef linux // get the default signal handler - IGNORE_RETURN(sigaction(SIGSEGV, NULL, &OrgSa)); + IGNORE_RETURN(sigaction(SIGSEGV, nullptr, &OrgSa)); if (ms_javaVmType == JV_ibm) { // check PATH to make sure that it has /usr/bin/java const char * env = getenv("PATH"); - const char * bin = NULL; + const char * bin = nullptr; int envlen = 0; - if (env != NULL) + if (env != nullptr) { bin = strstr(env, "/usr/java/bin"); envlen = strlen(env); } - if (bin == NULL) + if (bin == nullptr) { WARNING(true, ("/usr/java/bin not found in PATH which is needed for IBM Java VM. Adding it now")); char * tmpbuffer = new char[envlen + 128]; @@ -1077,18 +1077,18 @@ void JavaLibrary::initializeJavaThread() // check LD_LIBRARY_PATH for /usr/java/jre/bin and /usr/java/jre/bin/classic env = getenv("LD_LIBRARY_PATH"); - bin = NULL; + bin = nullptr; envlen = 0; - const char * classic = NULL; - if (env != NULL) + const char * classic = nullptr; + if (env != nullptr) { bin = strstr(env, "/usr/java/jre/bin"); classic = strstr(env, "/usr/java/jre/bin/classic"); - if (bin == classic && bin != NULL) + if (bin == classic && bin != nullptr) bin = strstr(classic + 1, "/usr/java/jre/bin"); envlen = strlen(env); } - if (bin == NULL || classic == NULL) + if (bin == nullptr || classic == nullptr) { WARNING(true, ("/usr/java/jre/bin or /usr/java/jre/bin/classic not found " "in LD_LIBRARY_PATH, needed for IBM Java VM. Adding them both now.")); @@ -1105,12 +1105,12 @@ void JavaLibrary::initializeJavaThread() #endif // linux // dynamically load the jni dll and JNI_CreateJavaVM - void * libHandle = NULL; + void * libHandle = nullptr; JNI_CREATEJAVAVMPROC JNI_CreateJavaVMProc; #if defined(WIN32) std::string dllPath = ConfigServerGame::getJavaLibPath(); HINSTANCE hVm = LoadLibrary(dllPath.c_str()); - if (hVm == NULL) + if (hVm == nullptr) { FATAL(true, ("jvm open fail error: could not open %s", dllPath.c_str())); ms_loaded = -1; @@ -1120,10 +1120,10 @@ void JavaLibrary::initializeJavaThread() JNI_CreateJavaVMProc = (JNI_CREATEJAVAVMPROC)GetProcAddress(hVm, "JNI_CreateJavaVM"); //lint !e1924 C-style cast #else - void *libVM = NULL; + void *libVM = nullptr; std::string dllPath = ConfigServerGame::getJavaLibPath(); libVM = dlopen(dllPath.c_str(), RTLD_LAZY); - if (libVM == NULL) + if (libVM == nullptr) { FATAL(true, ("jvm open fail! error: %s", dlerror())); ms_loaded = -1; @@ -1133,7 +1133,7 @@ void JavaLibrary::initializeJavaThread() JNI_CreateJavaVMProc = (JNI_CREATEJAVAVMPROC)dlsym(libVM, "JNI_CreateJavaVM"); #endif - if (JNI_CreateJavaVMProc == NULL) + if (JNI_CreateJavaVMProc == nullptr) { FATAL(true, ("Error getting JNI_CreateJavaVM from jvm shared library")); ms_loaded = -1; @@ -1152,9 +1152,9 @@ void JavaLibrary::initializeJavaThread() // DEBUG_REPORT_LOG(true, ("Java class path = %s\n", classPath.c_str())); JavaVMInitArgs vm_args; - JavaVMOption tempOption = {NULL, NULL}; + JavaVMOption tempOption = {nullptr, nullptr}; std::vector options; - char *jdwpBuffer = NULL; + char *jdwpBuffer = nullptr; UNREF(jdwpBuffer); @@ -1241,7 +1241,7 @@ void JavaLibrary::initializeJavaThread() #endif #ifdef REMOTE_DEBUG_ON - char *jdwpBuffer = NULL; + char *jdwpBuffer = nullptr; if (ConfigServerGame::getUseRemoteDebugJava()) { if (ms_javaVmType == JV_ibm) @@ -1298,14 +1298,14 @@ void JavaLibrary::initializeJavaThread() vm_args.ignoreUnrecognized = JNI_FALSE; // create the JVM - JNIEnv * env = NULL; + JNIEnv * env = nullptr; jint result = (*JNI_CreateJavaVMProc)(&ms_jvm, reinterpret_cast(&env), &vm_args); #ifdef REMOTE_DEBUG_ON - if (jdwpBuffer != NULL) + if (jdwpBuffer != nullptr) { delete[] jdwpBuffer; - jdwpBuffer = NULL; + jdwpBuffer = nullptr; } #endif @@ -1333,7 +1333,7 @@ void JavaLibrary::initializeJavaThread() // clean up IGNORE_RETURN(ms_jvm->DestroyJavaVM()); - ms_jvm = NULL; + ms_jvm = nullptr; #ifdef linux if (ConfigServerGame::getTrapScriptCrashes()) @@ -1367,7 +1367,7 @@ bool JavaLibrary::connectToJava() return false; // attach our thread to the VM - jint result = ms_jvm->AttachCurrentThread(reinterpret_cast(&ms_env), NULL); + jint result = ms_jvm->AttachCurrentThread(reinterpret_cast(&ms_env), nullptr); if (result != 0) { FATAL(true, ("Failed to attach to the Java VM! Error code returned = %d", result)); @@ -1938,7 +1938,7 @@ bool JavaLibrary::connectToJava() for (i = 0; i < MAX_STRING_ID_PARAMS; ++i) { - localInstance = createNewObject(ms_clsStringId, ms_midStringId, NULL, -1); + localInstance = createNewObject(ms_clsStringId, ms_midStringId, nullptr, -1); if (ms_env->ExceptionCheck()) { ms_env->ExceptionDescribe(); @@ -1956,7 +1956,7 @@ bool JavaLibrary::connectToJava() for (i = 0; i < MAX_MODIFIABLE_STRING_ID_PARAMS; ++i) { localInstance = createNewObject(ms_clsModifiableStringId, constructor, - NULL, -1); + nullptr, -1); if (ms_env->ExceptionCheck()) { ms_env->ExceptionDescribe(); @@ -2111,7 +2111,7 @@ bool JavaLibrary::registerNatives(const JNINativeMethod natives[], int count) { if (!natives[i].signature) { - DEBUG_REPORT_LOG(true, ("RegisterNatives failed: %s - NULL signature\n", natives[i].name)); + DEBUG_REPORT_LOG(true, ("RegisterNatives failed: %s - nullptr signature\n", natives[i].name)); result = 1; continue; } @@ -2219,11 +2219,11 @@ int i; FREE_CLASS(ms_clsLibraryDump); FREE_CLASS(ms_clsLibraryGMLib); - if (ms_scriptEntry != NULL) + if (ms_scriptEntry != nullptr) { if (ms_env) ms_env->DeleteGlobalRef(ms_scriptEntry); - ms_scriptEntry = NULL; + ms_scriptEntry = nullptr; } for (i = 0; i < MAX_RECURSION_COUNT; ++i) @@ -2246,7 +2246,7 @@ int i; GlobalInstances::ms_menuInfo = GlobalRef::cms_nullPtr; IGNORE_RETURN(ms_jvm->DetachCurrentThread()); - ms_env = NULL; + ms_env = nullptr; } // JavaLibrary::disconnectFromJava //---------------------------------------------------------------------- @@ -2283,7 +2283,7 @@ void JavaLibrary::resetJavaConnection() */ bool JavaLibrary::queryScriptFunctions(const std::string & scriptName) { - if (ms_instance == NULL) + if (ms_instance == nullptr) return false; JavaString scriptClassName(("script." + scriptName).c_str()); @@ -2337,7 +2337,7 @@ bool JavaLibrary::queryScriptFunctions(const std::string & scriptName) */ jlong JavaLibrary::getFreeJavaMemory() { - if (ms_instance == NULL || ms_env == NULL) + if (ms_instance == nullptr || ms_env == nullptr) return 0; return ms_env->CallStaticLongMethod(ms_clsScriptEntry, ms_midScriptEntryGetFreeMem); @@ -2358,7 +2358,7 @@ void JavaLibrary::printJavaStack() */ void JavaLibrary::enableLogging(bool enable) const { - if (ms_instance == NULL || ms_env == NULL) + if (ms_instance == nullptr || ms_env == nullptr) return; ms_env->CallStaticVoidMethod(ms_clsScriptEntry, @@ -2372,7 +2372,7 @@ void JavaLibrary::enableLogging(bool enable) const */ void JavaLibrary::enableNewJediTracking(bool enableTracking) { - if (ms_instance == NULL || ms_env == NULL) + if (ms_instance == nullptr || ms_env == nullptr) return; ms_env->CallStaticVoidMethod(ms_clsScriptEntry, @@ -2412,7 +2412,7 @@ LocalRefPtr JavaLibrary::getObjId(const NetworkId::NetworkIdType & id) */ LocalRefPtr JavaLibrary::getObjId(const NetworkId & id) { - if (ms_env != NULL && ms_instance != NULL) + if (ms_env != nullptr && ms_instance != nullptr) return callStaticObjectMethod(ms_clsObjId, ms_midObjIdGetObjId, id.getValue()); return LocalRef::cms_nullPtr; } // JavaLibrary::getObjId(const CachedNetworkId &) @@ -2501,7 +2501,7 @@ LocalRefPtr JavaLibrary::getVector(Vector const & vector) */ void JavaLibrary::removeJavaId(const NetworkId & id) { - if (ms_env == NULL || ms_clsObjId == NULL || ms_midObjIdClearObjId == NULL) + if (ms_env == nullptr || ms_clsObjId == nullptr || ms_midObjIdClearObjId == nullptr) { return; } @@ -2519,7 +2519,7 @@ void JavaLibrary::removeJavaId(const NetworkId & id) */ void JavaLibrary::flagDestroyed(const NetworkId & id) { - if (ms_env == NULL || ms_clsObjId == NULL || ms_midObjIdFlagDestroyed == NULL) + if (ms_env == nullptr || ms_clsObjId == nullptr || ms_midObjIdFlagDestroyed == nullptr) { return; } @@ -2538,7 +2538,7 @@ void JavaLibrary::flagDestroyed(const NetworkId & id) */ void JavaLibrary::setObjIdAuthoritative(const NetworkId & object, bool authoritative, uint32 pid) { - if (ms_env == NULL || ms_midObjIdSetAuthoritative == NULL) + if (ms_env == nullptr || ms_midObjIdSetAuthoritative == nullptr) { return; } @@ -2561,7 +2561,7 @@ void JavaLibrary::setObjIdAuthoritative(const NetworkId & object, bool authorita */ void JavaLibrary::setObjIdLoaded(const NetworkId &object) { - if (ms_env == NULL || ms_midObjIdSetLoaded == NULL) + if (ms_env == nullptr || ms_midObjIdSetLoaded == nullptr) { return; } @@ -2583,7 +2583,7 @@ void JavaLibrary::setObjIdLoaded(const NetworkId &object) */ void JavaLibrary::setObjIdInitialized(const NetworkId &object) { - if (ms_env == NULL || ms_midObjIdSetInitialized == NULL) + if (ms_env == nullptr || ms_midObjIdSetInitialized == nullptr) { return; } @@ -2605,7 +2605,7 @@ void JavaLibrary::setObjIdInitialized(const NetworkId &object) */ void JavaLibrary::setObjIdLoggedIn(const NetworkId & object, bool loggedIn) { - if (ms_env == NULL || ms_midObjIdSetLoggedIn == NULL) + if (ms_env == nullptr || ms_midObjIdSetLoggedIn == nullptr) { return; } @@ -2628,7 +2628,7 @@ void JavaLibrary::setObjIdLoggedIn(const NetworkId & object, bool loggedIn) void JavaLibrary::attachScriptToObjId(const NetworkId &object, const std::string & script) { - if (ms_env != NULL) + if (ms_env != nullptr) { LocalRefPtr obj_id = getObjId(object); if (obj_id == LocalRef::cms_nullPtr) @@ -2649,7 +2649,7 @@ void JavaLibrary::attachScriptToObjId(const NetworkId &object, void JavaLibrary::attachScriptsToObjId(const NetworkId &object, const ScriptList & scripts) { - if (scripts.size() == 0 || ms_env == NULL) + if (scripts.size() == 0 || ms_env == nullptr) return; LocalRefPtr obj_id = getObjId(object); @@ -2695,7 +2695,7 @@ void JavaLibrary::attachScriptsToObjId(const NetworkId &object, void JavaLibrary::detachScriptFromObjId(const NetworkId &object, const std::string & script) { - if (ms_env != NULL) + if (ms_env != nullptr) { LocalRefPtr obj_id = getObjId(object); if (obj_id == LocalRef::cms_nullPtr) @@ -2714,7 +2714,7 @@ void JavaLibrary::detachScriptFromObjId(const NetworkId &object, */ void JavaLibrary::detachAllScriptsFromObjId(const NetworkId &object) { - if (ms_env != NULL) + if (ms_env != nullptr) { LocalRefPtr obj_id = getObjId(object); if (obj_id == LocalRef::cms_nullPtr) @@ -2777,7 +2777,7 @@ jint JavaLibrary::handleScriptEntryCleanup(jint result) if (ConfigServerGame::getTrapScriptCrashes()) { // the script threw an error or exception, restore our segfault handler - IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, NULL)); + IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, nullptr)); } #endif } @@ -2797,20 +2797,20 @@ jint JavaLibrary::handleScriptEntryCleanup(jint result) jint JavaLibrary::callScriptEntry(const JavaStringParam & script, const JavaStringParam & method, jobjectArray params) { - if (ms_env == NULL || ms_clsScriptEntry == NULL || ms_midRunOne == NULL) + if (ms_env == nullptr || ms_clsScriptEntry == nullptr || ms_midRunOne == nullptr) { - LOG("ScriptInvestigation", ("callScriptEntry failed because something was null")); + LOG("ScriptInvestigation", ("callScriptEntry failed because something was nullptr")); if (!ms_env) { - LOG("ScriptInvestigation", ("callScriptEntry failed because ms_env was null")); + LOG("ScriptInvestigation", ("callScriptEntry failed because ms_env was nullptr")); } if (!ms_clsScriptEntry) { - LOG("ScriptInvestigation", ("callScriptEntry failed because scriptEntry was null")); + LOG("ScriptInvestigation", ("callScriptEntry failed because scriptEntry was nullptr")); } if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("callScriptEntry failed because runOne was null")); + LOG("ScriptInvestigation", ("callScriptEntry failed because runOne was nullptr")); } return SCRIPT_OVERRIDE; @@ -2848,20 +2848,20 @@ jint JavaLibrary::callScriptEntry(const JavaStringParam & script, */ jint JavaLibrary::callScriptEntry(const JavaStringParam & method, jobjectArray params) { - if (ms_env == NULL || ms_clsScriptEntry == NULL || ms_midRunAll == NULL) + if (ms_env == nullptr || ms_clsScriptEntry == nullptr || ms_midRunAll == nullptr) { - LOG("ScriptInvestigation", ("callScriptEntry2 failed because something was null")); + LOG("ScriptInvestigation", ("callScriptEntry2 failed because something was nullptr")); if (!ms_env) { - LOG("ScriptInvestigation", ("callScriptEntry2 failed because ms_env was null")); + LOG("ScriptInvestigation", ("callScriptEntry2 failed because ms_env was nullptr")); } if (!ms_clsScriptEntry) { - LOG("ScriptInvestigation", ("callScriptEntry2 failed because scriptEntry was null")); + LOG("ScriptInvestigation", ("callScriptEntry2 failed because scriptEntry was nullptr")); } if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("callScriptEntry2 failed because runOne was null")); + LOG("ScriptInvestigation", ("callScriptEntry2 failed because runOne was nullptr")); } return SCRIPT_OVERRIDE; } @@ -2897,20 +2897,20 @@ jint JavaLibrary::callScriptEntry(const JavaStringParam & method, jobjectArray p */ jstring JavaLibrary::callScriptConsoleHandlerEntry(const JavaStringParam & script, const JavaStringParam & method, jobjectArray params) { - if (ms_env == NULL || ms_clsScriptEntry == NULL || ms_midRunConsoleHandler == NULL) + if (ms_env == nullptr || ms_clsScriptEntry == nullptr || ms_midRunConsoleHandler == nullptr) { - LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because something was null")); + LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because something was nullptr")); if (!ms_env) { - LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because ms_env was null")); + LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because ms_env was nullptr")); } if (!ms_clsScriptEntry) { - LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because scriptEntry was null")); + LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because scriptEntry was nullptr")); } if (!ms_midRunConsoleHandler) { - LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because runConsoleHandler was null")); + LOG("ScriptInvestigation", ("callScriptConsoleHandlerEntry failed because runConsoleHandler was nullptr")); } return 0; @@ -2949,7 +2949,7 @@ void JavaLibrary::convert(const ScriptParams & params, JavaDictionaryPtr & dicti { dictionary.reset(); - if (ms_env == NULL) + if (ms_env == nullptr) return; // create the dictionary @@ -3143,7 +3143,7 @@ void JavaLibrary::convert(const ScriptParams & params, JavaDictionaryPtr & dicti for (int j = 0; j < count; ++j) { const std::vector * inner = objIds[j]; - if (inner != NULL) + if (inner != nullptr) { LocalObjectArrayRefPtr innerArray = createNewObjectArray(inner->size(), ms_clsObjId); if (innerArray != LocalObjectArrayRef::cms_nullPtr) @@ -3246,7 +3246,7 @@ void JavaLibrary::convert(const ScriptParams & params, JavaDictionaryPtr & dicti */ LocalObjectArrayRefPtr JavaLibrary::convert(const NetworkId & self, const std::string& argList, const ScriptParams &args) { - if (ms_env == NULL) + if (ms_env == nullptr) return LocalObjectArrayRef::cms_nullPtr; // convert the params to jobjects @@ -3283,7 +3283,7 @@ LocalObjectArrayRefPtr JavaLibrary::convert(const NetworkId & self, const std::s */ LocalObjectArrayRefPtr JavaLibrary::convert(const std::string& argList, const ScriptParams &args) { - if (ms_env == NULL) + if (ms_env == nullptr) return LocalObjectArrayRef::cms_nullPtr; // convert the params to jobjects @@ -3312,7 +3312,7 @@ LocalObjectArrayRefPtr JavaLibrary::convert(const std::string& argList, const Sc */ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, const std::string& argList, const ScriptParams &args) { - if (ms_env == NULL) + if (ms_env == nullptr) return 0; GlobalInstances globals; @@ -3547,7 +3547,7 @@ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, c for (i = 0, iter = strings.begin(); iter != strings.end(); ++i, ++iter) { - if (*iter != NULL) + if (*iter != nullptr) { JavaString newString(**iter); setObjectArrayElement(*localInstance, i, newString); @@ -3778,7 +3778,7 @@ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, c ++paramCount; } } - // fill in the rest of ms_attribModList with null + // fill in the rest of ms_attribModList with nullptr for (; paramCount < MAX_ATTRIB_MOD_PARAMS; ++paramCount) { setObjectArrayElement(*ms_attribModList[ms_currentRecursionCount], static_cast(paramCount), *LocalRefParam::cms_nullPtr); @@ -3857,7 +3857,7 @@ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, c ++paramCount; } } - // fill in the rest of ms_mentalStateModList with null + // fill in the rest of ms_mentalStateModList with nullptr for (; paramCount < MAX_MENTAL_STATE_MOD_PARAMS; ++paramCount) { setObjectArrayElement( @@ -3943,7 +3943,7 @@ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, c static_cast(argType))); //lint !e571 suspicious cast return 0; } - if (arg.get() == NULL || arg == LocalRef::cms_nullPtr) + if (arg.get() == nullptr || arg == LocalRef::cms_nullPtr) { DEBUG_REPORT_LOG(true, ("bad parameter, %c%s%d%s\n", argType, modifiable ? "*" : "", @@ -3978,7 +3978,7 @@ bool JavaLibrary::convert(LocalObjectArrayRefPtr & javaParams, int startIndex, c void JavaLibrary::alterScriptParams(jobjectArray jparams, const std::string& argList, ScriptParams &args) { - if (ms_env == NULL) + if (ms_env == nullptr) return; PROFILER_AUTO_BLOCK_CHECK_DEFINE("JavaLibrary::alterScriptParams"); @@ -4014,7 +4014,7 @@ void JavaLibrary::alterScriptParams(jobjectArray jparams, const std::string& arg { int count = getArrayLength(*arg); std::vector * values = new std::vector(count, 0); - jint * jvalues = static_cast(ms_env->GetPrimitiveArrayCritical(static_cast(arg->getValue()), NULL)); + jint * jvalues = static_cast(ms_env->GetPrimitiveArrayCritical(static_cast(arg->getValue()), nullptr)); for (int j = 0; j < count; ++j) { values->at(j) = static_cast(jvalues[j]); @@ -4046,7 +4046,7 @@ void JavaLibrary::alterScriptParams(jobjectArray jparams, const std::string& arg { int count = getArrayLength(*arg); std::vector * values = new std::vector(count, 0); - jbyte * jvalues = static_cast(ms_env->GetPrimitiveArrayCritical(static_cast(arg->getValue()), NULL)); + jbyte * jvalues = static_cast(ms_env->GetPrimitiveArrayCritical(static_cast(arg->getValue()), nullptr)); for (int j = 0; j < count; ++j) { values->at(j) = static_cast(jvalues[j]); @@ -4132,7 +4132,7 @@ void JavaLibrary::alterScriptParams(jobjectArray jparams, const std::string& arg std::string localString; convert(*table, localString); value->setTable(localString); - // get the string id text, if it is not NULL/empty, use it + // get the string id text, if it is not nullptr/empty, use it localString.clear(); JavaStringPtr text = getStringField(*arg, ms_fidStringIdAsciiId); if (text != JavaString::cms_nullPtr) @@ -4208,18 +4208,18 @@ int JavaLibrary::runScripts(const NetworkId & caller, "JavaLibrary::runScripts enter, self = %s, method = %s\n", caller.getValueString().c_str(), method.c_str())); - if (ms_env == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_clsObject == nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::getJavaConsoleDebugMessages(), ( "JavaLibrary::runScripts exit, self = %s, method = %s\n", caller.getValueString().c_str(), method.c_str())); if (!ms_env) { - LOG("ScriptInvestigation", ("runSCripts failed because env was null")); + LOG("ScriptInvestigation", ("runSCripts failed because env was nullptr")); } else { - LOG("ScriptInvestigation", ("runSCripts failed because clsObject was null")); + LOG("ScriptInvestigation", ("runSCripts failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; } @@ -4346,19 +4346,19 @@ int JavaLibrary::runScript(const NetworkId & caller, const std::string& script, "JavaLibrary::runScript %s enter, self = %s, method = %s\n", script.c_str(), caller.getValueString().c_str(), method.c_str())); - if (ms_env == NULL || ms_midRunOne == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunOne == nullptr || ms_clsObject == nullptr) { if (!ms_env) { - LOG("ScriptInvestigation", ("runSCripts2 failed because env was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because env was nullptr")); } else if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("runSCripts2 failed because midRunOne was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because midRunOne was nullptr")); } else { - LOG("ScriptInvestigation", ("runSCripts2 failed because clsObject was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; @@ -4466,19 +4466,19 @@ int JavaLibrary::runScript(const NetworkId & caller, const std::string& script, DEBUG_REPORT_LOG(true, ("JavaLibrary::runScript %s enter, method = %s\n", script.c_str(), method.c_str())); - if (ms_env == NULL || ms_midRunOne == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunOne == nullptr || ms_clsObject == nullptr) { if (!ms_env) { - LOG("ScriptInvestigation", ("runSCripts3 failed because env was null")); + LOG("ScriptInvestigation", ("runSCripts3 failed because env was nullptr")); } else if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("runSCripts3 failed because midRunOne was null")); + LOG("ScriptInvestigation", ("runSCripts3 failed because midRunOne was nullptr")); } else { - LOG("ScriptInvestigation", ("runSCripts3 failed because clsObject was null")); + LOG("ScriptInvestigation", ("runSCripts3 failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; } @@ -4593,19 +4593,19 @@ int JavaLibrary::runScript(const NetworkId & caller, const std::string& script, DEBUG_REPORT_LOG(true, ("JavaLibrary::runScript %s enter, method = %s\n", script.c_str(), method.c_str())); - if (ms_env == NULL || ms_midRunOne == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunOne == nullptr || ms_clsObject == nullptr) { if (!ms_env) { - LOG("ScriptInvestigation", ("runSCripts4 failed because env was null")); + LOG("ScriptInvestigation", ("runSCripts4 failed because env was nullptr")); } else if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("runSCripts4 failed because midRunOne was null")); + LOG("ScriptInvestigation", ("runSCripts4 failed because midRunOne was nullptr")); } else { - LOG("ScriptInvestigation", ("runSCripts4 failed because clsObject was null")); + LOG("ScriptInvestigation", ("runSCripts4 failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; @@ -4786,19 +4786,19 @@ static const std::string errorReturnString; "JavaLibrary::runScript %s enter, method = %s\n", script.c_str(), method.c_str())); - if (ms_env == NULL || ms_midRunConsoleHandler == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunConsoleHandler == nullptr || ms_clsObject == nullptr) { if (!ms_env) { - LOG("ScriptInvestigation", ("runSCripts2 failed because env was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because env was nullptr")); } else if (!ms_midRunConsoleHandler) { - LOG("ScriptInvestigation", ("runSCripts2 failed because midRunConsoleHandler was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because midRunConsoleHandler was nullptr")); } else { - LOG("ScriptInvestigation", ("runSCripts2 failed because clsObject was null")); + LOG("ScriptInvestigation", ("runSCripts2 failed because clsObject was nullptr")); } return errorReturnString; @@ -4888,7 +4888,7 @@ static const std::string errorReturnString; */ bool JavaLibrary::reloadScript(const std::string& scriptName) { - if (ms_env == NULL || ms_clsScriptEntry == NULL || ms_midUnload == NULL) + if (ms_env == nullptr || ms_clsScriptEntry == nullptr || ms_midUnload == nullptr) return false; // convert the script name to jstring @@ -4930,22 +4930,22 @@ int JavaLibrary::callMessages(const NetworkId & caller, const std::string & meth int result = SCRIPT_CONTINUE; - if (ms_env == NULL || ms_midRunOne == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunOne == nullptr || ms_clsObject == nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::getJavaConsoleDebugMessages(), ( "JavaLibrary::callMessages exit, self = %s, method = %s\n", caller.getValueString().c_str(), method.c_str())); if (!ms_env) { - LOG("ScriptInvestigation", ("callMessages failed because env was null")); + LOG("ScriptInvestigation", ("callMessages failed because env was nullptr")); } else if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("callMessages failed because midRunOne was null")); + LOG("ScriptInvestigation", ("callMessages failed because midRunOne was nullptr")); } else { - LOG("ScriptInvestigation", ("callMessages failed because clsObject was null")); + LOG("ScriptInvestigation", ("callMessages failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; @@ -4962,7 +4962,7 @@ int JavaLibrary::callMessages(const NetworkId & caller, const std::string & meth const JavaDictionary * dictionary = safe_cast(data.get()); jobject jdictionary = 0; - if (dictionary != NULL) + if (dictionary != nullptr) jdictionary = dictionary->getValue(); // convert the method string to jstrings @@ -5024,22 +5024,22 @@ int JavaLibrary::callMessage(const NetworkId & caller, const std::string & scrip "JavaLibrary::callMessage %s enter, self = %s, method = %s\n", script.c_str(), caller.getValueString().c_str(), method.c_str())); - if (ms_env == NULL || ms_midRunOne == NULL || ms_clsObject == NULL) + if (ms_env == nullptr || ms_midRunOne == nullptr || ms_clsObject == nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::getJavaConsoleDebugMessages(), ( "JavaLibrary::callMessage %s exit, self = %s, method = %s\n", script.c_str(), caller.getValueString().c_str(), method.c_str())); if (!ms_env) { - LOG("ScriptInvestigation", ("callMessage failed because env was null")); + LOG("ScriptInvestigation", ("callMessage failed because env was nullptr")); } else if (!ms_midRunOne) { - LOG("ScriptInvestigation", ("callMessage failed because midRunOne was null")); + LOG("ScriptInvestigation", ("callMessage failed because midRunOne was nullptr")); } else { - LOG("ScriptInvestigation", ("callMessage failed because clsObject was null")); + LOG("ScriptInvestigation", ("callMessage failed because clsObject was nullptr")); } return SCRIPT_OVERRIDE; @@ -5055,7 +5055,7 @@ int JavaLibrary::callMessage(const NetworkId & caller, const std::string & scrip } const JavaDictionary * dictionary = dynamic_cast(&data); - if (dictionary == NULL) + if (dictionary == nullptr) { DEBUG_REPORT_LOG(ConfigServerGame::getJavaConsoleDebugMessages(), ( "JavaLibrary::callMessage %s exit, self = %s, method = %s\n", @@ -5229,7 +5229,7 @@ void JavaLibrary::packDictionary(const ScriptDictionary & dictionary, bool JavaLibrary::unpackDictionary(const std::vector & packedData, ScriptDictionaryPtr & dictionary) { - if (ms_env == NULL) + if (ms_env == nullptr) return false; dictionary = JavaDictionary::cms_nullPtr; @@ -5270,7 +5270,7 @@ bool JavaLibrary::unpackDictionary(const std::vector & packedData, } } */ - if (data != NULL && *data != '\0') + if (data != nullptr && *data != '\0') { LocalByteArrayRefPtr jdata = createNewByteArray(dataLen); if (jdata != LocalByteArrayRef::cms_nullPtr) @@ -5346,7 +5346,7 @@ const bool JavaLibrary::convert(const JavaStringParam & source, Unicode::String const bool JavaLibrary::convert(const JavaDictionary & source, std::vector & target) { bool result = false; - if (ms_env != NULL) + if (ms_env != nullptr) { if (source.getValue() != 0) { @@ -5474,7 +5474,7 @@ const bool convert(const std::vector & source, LocalObj result = true; for (int i = 0; i < count; ++i) { - if (source[i] != NULL) + if (source[i] != nullptr) { JavaString targetElement(*source[i]); setObjectArrayElement(*target, i, targetElement); @@ -6171,7 +6171,7 @@ const bool convert(const LocalRefParam & source, const Region * & target) const bool convert(const jobject & source, const Region * &target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL || source == NULL) + if (env == nullptr || source == nullptr) return false; if (!env->IsInstanceOf(source, JavaLibrary::ms_clsRegion)) return false; @@ -6395,7 +6395,7 @@ const bool convert(const LocalRefParam & sourceVector, Vector & target) const bool convert(const AttribMod::AttribMod & source, LocalRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; target = allocObject(JavaLibrary::ms_clsAttribMod); @@ -6429,7 +6429,7 @@ const bool convert(const AttribMod::AttribMod & source, LocalRefPtr & target) const bool convert(const jobject & source, AttribMod::AttribMod & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; if (source == 0 || env->IsInstanceOf(source, JavaLibrary::ms_clsAttribMod) == JNI_FALSE) @@ -6488,7 +6488,7 @@ const bool convert(const LocalRefParam & source, AttribMod::AttribMod & target) const bool convert(const std::vector & source, LocalObjectArrayRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; int count = source.size(); @@ -6515,7 +6515,7 @@ const bool convert(const std::vector & source, LocalObject const bool convert(const jobjectArray & source, std::vector & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; if (source == 0) @@ -6540,7 +6540,7 @@ const bool convert(const jobjectArray & source, std::vector & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; if (source == 0) @@ -6556,7 +6556,7 @@ const bool convert(const jbyteArray & source, std::vector & target) const bool convert(const LocalByteArrayRef & source, std::vector & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; if (source.getValue() == 0) @@ -6572,7 +6572,7 @@ const bool convert(const LocalByteArrayRef & source, std::vector & target) const bool convert(const std::vector & source, LocalByteArrayRefPtr & target) { JNIEnv * env = JavaLibrary::getEnv(); - if (env == NULL) + if (env == nullptr) return false; int count = source.size(); @@ -6604,10 +6604,10 @@ CreatureObject *JavaLibrary::getCreatureThrow(JNIEnv *env, jlong objId, char con if (!objId) { - IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: null object id from script.", errorDescription)); + IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: nullptr object id from script.", errorDescription)); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { @@ -6617,7 +6617,7 @@ CreatureObject *JavaLibrary::getCreatureThrow(JNIEnv *env, jlong objId, char con IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: invalid or non-convertable network id [%s].", errorDescription, networkId.getValueString().c_str())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { @@ -6627,19 +6627,19 @@ CreatureObject *JavaLibrary::getCreatureThrow(JNIEnv *env, jlong objId, char con if (!throwIfNotOnServer) { // The specified object is not on this server. It might not even be a real object. - // Since the caller does not want this to throw, simply return NULL. - return NULL; + // Since the caller does not want this to throw, simply return nullptr. + return nullptr; } IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: object for network id [%s] not on this server.", errorDescription, networkId.getValueString().c_str())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { ServerObject *const serverObject = object->asServerObject(); - CreatureObject *const creatureObject = serverObject ? serverObject->asCreatureObject() : NULL; + CreatureObject *const creatureObject = serverObject ? serverObject->asCreatureObject() : nullptr; if (creatureObject) return creatureObject; @@ -6648,7 +6648,7 @@ CreatureObject *JavaLibrary::getCreatureThrow(JNIEnv *env, jlong objId, char con IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: object id=[%s], template=[%s] is not a CreatureObject.", errorDescription, networkId.getValueString().c_str(), object->getObjectTemplateName())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } } } @@ -6665,10 +6665,10 @@ ShipObject *JavaLibrary::getShipThrow(JNIEnv *env, jlong objId, char const *erro if (objId == 0) { - IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: null object id from script.", errorDescription)); + IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: nullptr object id from script.", errorDescription)); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { @@ -6678,7 +6678,7 @@ ShipObject *JavaLibrary::getShipThrow(JNIEnv *env, jlong objId, char const *erro IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: invalid or non-convertable network id [%s].", errorDescription, networkId.getValueString().c_str())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { @@ -6688,19 +6688,19 @@ ShipObject *JavaLibrary::getShipThrow(JNIEnv *env, jlong objId, char const *erro if (!throwIfNotOnServer) { // The specified object is not on this server. It might not even be a real object. - // Since the caller does not want this to throw, simply return NULL. - return NULL; + // Since the caller does not want this to throw, simply return nullptr. + return nullptr; } IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: object for network id [%s] not on this server.", errorDescription, networkId.getValueString().c_str())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } else { ServerObject *const serverObject = object->asServerObject(); - ShipObject *const shipObject = serverObject ? serverObject->asShipObject() : NULL; + ShipObject *const shipObject = serverObject ? serverObject->asShipObject() : nullptr; if (shipObject) return shipObject; @@ -6709,7 +6709,7 @@ ShipObject *JavaLibrary::getShipThrow(JNIEnv *env, jlong objId, char const *erro IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "%s: object id=[%s], template=[%s] is not a ShipObject.", errorDescription, networkId.getValueString().c_str(), object->getObjectTemplateName())); buffer[sizeof(buffer) - 1] = '\0'; throwInternalScriptError(buffer); - return NULL; + return nullptr; } } } @@ -6725,7 +6725,7 @@ ShipObject *JavaLibrary::getShipThrow(JNIEnv *env, jlong objId, char const *erro */ void JavaLibrary::throwInternalScriptError(const char * message) { - if (ms_env != NULL && message != NULL) + if (ms_env != nullptr && message != nullptr) { ms_env->ThrowNew(ms_clsInternalScriptError, message); } diff --git a/engine/server/library/serverScript/src/shared/ScriptFunctionTable.cpp b/engine/server/library/serverScript/src/shared/ScriptFunctionTable.cpp index 976743ee..e9f4e88c 100755 --- a/engine/server/library/serverScript/src/shared/ScriptFunctionTable.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptFunctionTable.cpp @@ -434,7 +434,7 @@ static const Scripting::ScriptFuncTable ScriptFuncList[] = //-- finish it up - {Scripting::TRIG_LAST_TRIGGER, NULL, NULL} + {Scripting::TRIG_LAST_TRIGGER, nullptr, nullptr} }; const int NUM_SCRIPT_FUNCTIONS = sizeof(ScriptFuncList) / sizeof(ScriptFuncList[0]) - 1; @@ -444,7 +444,7 @@ const int NUM_SCRIPT_FUNCTIONS = sizeof(ScriptFuncList) / sizeof(ScriptFuncList[ // globals //======================================================================== -Scripting::_ScriptFuncHashMap *Scripting::ScriptFuncHashMap = NULL; +Scripting::_ScriptFuncHashMap *Scripting::ScriptFuncHashMap = nullptr; //======================================================================== @@ -468,6 +468,6 @@ void Scripting::InitScriptFuncHashMap(void) void Scripting::RemoveScriptFuncHashMap(void) { delete Scripting::ScriptFuncHashMap; - Scripting::ScriptFuncHashMap = NULL; + Scripting::ScriptFuncHashMap = nullptr; } diff --git a/engine/server/library/serverScript/src/shared/ScriptListEntry.cpp b/engine/server/library/serverScript/src/shared/ScriptListEntry.cpp index 1f55096a..8725947c 100755 --- a/engine/server/library/serverScript/src/shared/ScriptListEntry.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptListEntry.cpp @@ -16,9 +16,9 @@ std::string const &ScriptListEntry::getScriptName() const { static const std::string emptyString; - if (m_data != NULL) + if (m_data != nullptr) return m_data->first; - WARNING_STRICT_FATAL(true, ("ScriptListEntry::getScriptName called with m_data = NULL")); + WARNING_STRICT_FATAL(true, ("ScriptListEntry::getScriptName called with m_data = nullptr")); return emptyString; } @@ -28,9 +28,9 @@ ScriptData &ScriptListEntry::getScriptData() const { static ScriptData emptyData; - if (m_data != NULL) + if (m_data != nullptr) return m_data->second; - WARNING_STRICT_FATAL(true, ("ScriptListEntry::getScriptData called with m_data = NULL")); + WARNING_STRICT_FATAL(true, ("ScriptListEntry::getScriptData called with m_data = nullptr")); return emptyData; } diff --git a/engine/server/library/serverScript/src/shared/ScriptListEntry.h b/engine/server/library/serverScript/src/shared/ScriptListEntry.h index 1d5e8f66..37349274 100755 --- a/engine/server/library/serverScript/src/shared/ScriptListEntry.h +++ b/engine/server/library/serverScript/src/shared/ScriptListEntry.h @@ -53,7 +53,7 @@ inline bool ScriptListEntry::operator==(ScriptListEntry const &rhs) const inline bool ScriptListEntry::isValid() const { - return m_data != NULL; + return m_data != nullptr; } // ====================================================================== diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsAi.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsAi.cpp index eab60dd9..1d12a09a 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsAi.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsAi.cpp @@ -126,18 +126,18 @@ AICreatureController * const ScriptMethodsAiNamespace::getAiCreatureController(j NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("Unable to resolve the ai(%s) to a CreatureObject.", aiNetworkId.getValueString().c_str())); - return NULL; + return nullptr; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("Unable to get the ai's(%s) AiCreatureController.", aiCreatureObject->getDebugInformation().c_str())); - return NULL; + return nullptr; } return aiCreatureController; @@ -155,14 +155,14 @@ jint JNICALL ScriptMethodsAiNamespace::aiGetMovementState(JNIEnv * /*env*/, jobj NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return AMT_invalid; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return AMT_invalid; } @@ -187,14 +187,14 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiLoggingEnabled(JNIEnv * /*env*/, jo NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return JNI_FALSE; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -212,7 +212,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsFrozen(JNIEnv * /*env*/, jobject { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -226,14 +226,14 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsAggressive(JNIEnv * /*env*/, jobj NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return JNI_FALSE; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -247,14 +247,14 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsAssist(JNIEnv * /*env*/, jobject NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return JNI_FALSE; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -267,7 +267,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsStalker(JNIEnv * /*env*/, jobject { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -282,14 +282,14 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsKiller(JNIEnv * /*env*/, jobject NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return JNI_FALSE; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -302,7 +302,7 @@ void JNICALL ScriptMethodsAiNamespace::aiTether(JNIEnv * /*env*/, jobject /*self { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -316,14 +316,14 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiIsTethered(JNIEnv * /*env*/, jobjec NetworkId const aiNetworkId(ai); CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId); - if (aiCreatureObject == NULL) + if (aiCreatureObject == nullptr) { return JNI_FALSE; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -336,7 +336,7 @@ void JNICALL ScriptMethodsAiNamespace::aiSetHomeLocation(JNIEnv * /*env*/, jobje { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -356,7 +356,7 @@ jobject JNICALL ScriptMethodsAiNamespace::aiGetHomeLocation(JNIEnv * /*env*/, jo { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JavaLibrary::getVector(Vector::zero)->getReturnValue(); } @@ -373,7 +373,7 @@ jobject JNICALL ScriptMethodsAiNamespace::aiGetLeashAnchorLocation(JNIEnv * /*en { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JavaLibrary::getVector(Vector::zero)->getReturnValue(); } @@ -396,7 +396,7 @@ jfloat JNICALL ScriptMethodsAiNamespace::aiGetRespectRadius(JNIEnv * /*env*/, jo { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0.0f; } @@ -411,7 +411,7 @@ jfloat JNICALL ScriptMethodsAiNamespace::aiGetAggroRadius(JNIEnv * /*env*/, jobj { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0.0f; } @@ -424,7 +424,7 @@ void JNICALL ScriptMethodsAiNamespace::aiEquipPrimaryWeapon(JNIEnv * /*env*/, jo { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -437,7 +437,7 @@ void JNICALL ScriptMethodsAiNamespace::aiEquipSecondaryWeapon(JNIEnv * /*env*/, { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -450,7 +450,7 @@ void JNICALL ScriptMethodsAiNamespace::aiUnEquipWeapons(JNIEnv * /*env*/, jobjec { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -463,7 +463,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiHasPrimaryWeapon(JNIEnv * /*env*/, { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -476,7 +476,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiHasSecondaryWeapon(JNIEnv * /*env*/ { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -489,7 +489,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiUsingPrimaryWeapon(JNIEnv * /*env*/ { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -502,7 +502,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::aiUsingSecondaryWeapon(JNIEnv * /*env { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return JNI_FALSE; } @@ -515,7 +515,7 @@ jlong JNICALL ScriptMethodsAiNamespace::aiGetPrimaryWeapon(JNIEnv * /*env*/, job { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0; } @@ -528,7 +528,7 @@ jlong JNICALL ScriptMethodsAiNamespace::aiGetSecondaryWeapon(JNIEnv * /*env*/, j { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0; } @@ -541,7 +541,7 @@ jfloat JNICALL ScriptMethodsAiNamespace::aiGetMovementSpeedPercent(JNIEnv * /*en { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0.0f; } @@ -554,7 +554,7 @@ void JNICALL ScriptMethodsAiNamespace::loiterLocation(JNIEnv * /*env*/, jobject { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -585,7 +585,7 @@ void JNICALL ScriptMethodsAiNamespace::loiterLocation(JNIEnv * /*env*/, jobject CellObject const * const cellObject = CellObject::getCellObject(cellId); - if (cellObject != NULL) + if (cellObject != nullptr) { CellProperty const * const cellProperty = cellObject->getCellProperty(); @@ -608,7 +608,7 @@ void JNICALL ScriptMethodsAiNamespace::loiterTarget(JNIEnv * /*env*/, jobject /* { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -623,7 +623,7 @@ void JNICALL ScriptMethodsAiNamespace::loiterTarget(JNIEnv * /*env*/, jobject /* NetworkId const targetNetworkId(static_cast(target)); Object * const targetObject = NetworkIdManager::getObjectById(targetNetworkId); - if (targetObject == NULL) + if (targetObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsAi::loiterTarget() ai(%s) Unable to resolve the target(%s) to a Object", aiCreatureController->getCreature()->getDebugInformation().c_str(), targetNetworkId.getValueString().c_str())); return; @@ -643,7 +643,7 @@ void JNICALL ScriptMethodsAiNamespace::pathToLocation(JNIEnv * /*env*/, jobject { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -664,7 +664,7 @@ void JNICALL ScriptMethodsAiNamespace::pathToLocation(JNIEnv * /*env*/, jobject { CellObject const * const cellObject = CellObject::getCellObject(cellId); - if (cellObject != NULL) + if (cellObject != nullptr) { CellProperty const * const cellProperty = cellObject->getCellProperty(); @@ -697,7 +697,7 @@ void JNICALL ScriptMethodsAiNamespace::pathToName(JNIEnv * /*env*/, jobject /*se { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return; } @@ -731,7 +731,7 @@ void JNICALL ScriptMethodsAiNamespace::pathToName(JNIEnv * /*env*/, jobject /*se void JNICALL ScriptMethodsAiNamespace::patrolToLocation(JNIEnv *, jobject, jlong ai, jobjectArray targets, jboolean random, jboolean flip, jboolean repeat, jint startPoint) { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) return; std::vector locations; @@ -755,7 +755,7 @@ void JNICALL ScriptMethodsAiNamespace::patrolToLocation(JNIEnv *, jobject, jlong void JNICALL ScriptMethodsAiNamespace::patrolToName(JNIEnv *, jobject, jlong ai, jobjectArray targetNames, jboolean random, jboolean flip, jboolean repeat, jint startPoint) { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) return; std::vector locations; @@ -768,11 +768,11 @@ void JNICALL ScriptMethodsAiNamespace::patrolToName(JNIEnv *, jobject, jlong ai, for (int i = 0; i < count; ++i) { const Unicode::String * location = locations[i]; - if (location != NULL) + if (location != nullptr) { realLocations.push_back(*location); delete location; - locations[i] = NULL; + locations[i] = nullptr; } } aiCreatureController->patrol(realLocations, random, flip, repeat, startPoint); @@ -783,16 +783,16 @@ jstring JNICALL ScriptMethodsAiNamespace::aiGetCombatAction(JNIEnv * /*env*/, jo { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { - return NULL; + return nullptr; } PersistentCrcString const & result = aiCreatureController->getCombatAction(); if (result.isEmpty()) { - return NULL; + return nullptr; } JavaString javaString(result.getString()); @@ -805,7 +805,7 @@ jint JNICALL ScriptMethodsAiNamespace::aiGetKnockDownRecoveryTime(JNIEnv * /*env { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(ai); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0; } @@ -819,7 +819,7 @@ jboolean JNICALL ScriptMethodsAiNamespace::setHibernationDelay(JNIEnv *env, jobj { AICreatureController * const aiCreatureController = ScriptMethodsAiNamespace::getAiCreatureController(creature); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) return JNI_FALSE; aiCreatureController->setHibernationDelay(delay); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsAnimation.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsAnimation.cpp index d41f22ca..9c2ec894 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsAnimation.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsAnimation.cpp @@ -97,7 +97,7 @@ void JNICALL ScriptMethodsAnimationNamespace::setAnimationMood (JNIEnv *env, job JavaStringParam localMoodName(moodName); - ServerObject * targetObject = NULL; + ServerObject * targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return; @@ -114,7 +114,7 @@ void JNICALL ScriptMethodsAnimationNamespace::setAnimationMood (JNIEnv *env, job jstring JNICALL ScriptMethodsAnimationNamespace::getAnimationMood (JNIEnv *env, jobject self, jlong target) { - ServerObject * targetObject = NULL; + ServerObject * targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return 0; @@ -143,7 +143,7 @@ jboolean JNICALL ScriptMethodsAnimationNamespace::sitOnObject (JNIEnv *env, jobj CreatureObject *sitterObject = 0; if (!JavaLibrary::getObject (sitterId, sitterObject) || !sitterObject) { - DEBUG_WARNING (true, ("sitOnObject(): Sitter object is NULL.")); + DEBUG_WARNING (true, ("sitOnObject(): Sitter object is nullptr.")); return JNI_FALSE; } @@ -175,11 +175,11 @@ void JNICALL ScriptMethodsAnimationNamespace::setObjectAppearance(JNIEnv *env, j UNREF(env); UNREF(self); - CreatureObject* creature = NULL; + CreatureObject* creature = nullptr; if(!JavaLibrary::getObject(target, creature) || !creature) { - DEBUG_WARNING(true, ("SetObjectAppearance() : Creature object was NULL.\n")); + DEBUG_WARNING(true, ("SetObjectAppearance() : Creature object was nullptr.\n")); return; } @@ -209,11 +209,11 @@ void JNICALL ScriptMethodsAnimationNamespace::revertObjectAppearance(JNIEnv *env UNREF(env); UNREF(self); - CreatureObject* creature = NULL; + CreatureObject* creature = nullptr; if(!JavaLibrary::getObject(target, creature) || !creature) { - DEBUG_WARNING(true, ("RevertObjectAppearance() : Creature object was NULL.\n")); + DEBUG_WARNING(true, ("RevertObjectAppearance() : Creature object was nullptr.\n")); return; } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp index 266b10f8..42c47200 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp @@ -549,12 +549,12 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::hasAttribModifier(JNIEnv *env if (!JavaLibrary::convert(jmodName, name)) return JNI_FALSE; - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; const AttribMod::AttribMod * mod = creature->getAttributeModifier(name); - if (mod != NULL && AttribMod::isAttribMod(*mod)) + if (mod != nullptr && AttribMod::isAttribMod(*mod)) return JNI_TRUE; return JNI_FALSE; @@ -582,12 +582,12 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::hasSkillModModifier(JNIEnv *e if (!JavaLibrary::convert(jmodName, name)) return JNI_FALSE; - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; const AttribMod::AttribMod * mod = creature->getAttributeModifier(name); - if (mod != NULL && AttribMod::isSkillMod(*mod)) + if (mod != nullptr && AttribMod::isSkillMod(*mod)) return JNI_TRUE; return JNI_FALSE; @@ -601,7 +601,7 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::hasSkillModModifier(JNIEnv *e * @param target id of creature to access * @param attrib attribute we are interested in * - * @return the attribute modifiers for the creature, or null if it has none + * @return the attribute modifiers for the creature, or nullptr if it has none */ jobjectArray JNICALL ScriptMethodsAttributesNamespace::getAttribModifiers(JNIEnv *env, jobject self, jlong target, jint attrib) { @@ -642,7 +642,7 @@ jobjectArray JNICALL ScriptMethodsAttributesNamespace::getAttribModifiers(JNIEnv * @param self class calling this function * @param target id of creature to access * - * @return the attribute modifiers for the creature, or null if it has none + * @return the attribute modifiers for the creature, or nullptr if it has none */ jobjectArray JNICALL ScriptMethodsAttributesNamespace::getAllAttribModifiers(JNIEnv *env, jobject self, jlong target) { @@ -692,7 +692,7 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::removeAttribModifier(JNIEnv * if (!JavaLibrary::convert(jmodName, name)) return JNI_FALSE; - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1084,12 +1084,12 @@ jint JNICALL ScriptMethodsAttributesNamespace::getHitpoints(JNIEnv *env, jobject { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return ATTRIB_ERROR; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return ATTRIB_ERROR; @@ -1111,12 +1111,12 @@ jint JNICALL ScriptMethodsAttributesNamespace::getMaxHitpoints(JNIEnv *env, jobj { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return ATTRIB_ERROR; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return ATTRIB_ERROR; @@ -1136,13 +1136,13 @@ jint JNICALL ScriptMethodsAttributesNamespace::getTotalHitpoints(JNIEnv *env, jo { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return ATTRIB_ERROR; // make sure the object isn't a creature // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return ATTRIB_ERROR; @@ -1164,12 +1164,12 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::setHitpoints(JNIEnv *env, job { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return JNI_FALSE; @@ -1209,12 +1209,12 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::setMaxHitpoints(JNIEnv *env, { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return JNI_FALSE; @@ -1237,12 +1237,12 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::setInvulnerableHitpoints(JNIE { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return JNI_FALSE; @@ -1280,7 +1280,7 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::setInvulnerableHitpoints(JNIE */ jint JNICALL ScriptMethodsAttributesNamespace::getShockWound(JNIEnv *env, jobject self, jlong target) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return ATTRIB_ERROR; @@ -1299,7 +1299,7 @@ jint JNICALL ScriptMethodsAttributesNamespace::getShockWound(JNIEnv *env, jobjec */ jboolean JNICALL ScriptMethodsAttributesNamespace::setShockWound(JNIEnv *env, jobject self, jlong target, jint wound) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1319,7 +1319,7 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::setShockWound(JNIEnv *env, jo */ jboolean JNICALL ScriptMethodsAttributesNamespace::addShockWound(JNIEnv *env, jobject self, jlong target, jint wound) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1339,7 +1339,7 @@ jboolean JNICALL ScriptMethodsAttributesNamespace::addShockWound(JNIEnv *env, jo */ jboolean JNICALL ScriptMethodsAttributesNamespace::healShockWound(JNIEnv *env, jobject self, jlong target, jint value) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsAuction.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsAuction.cpp index 0a76643b..e288480b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsAuction.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsAuction.cpp @@ -110,8 +110,8 @@ void JNICALL ScriptMethodsAuctionNamespace::createVendorMarket(JNIEnv *env, jobj void JNICALL ScriptMethodsAuctionNamespace::auctionCreatePermanent(JNIEnv *env, jobject script, jstring jownerName, jlong jitem, jlong jauctionContainer, jint jprice, jstring juserDescription) { - TangibleObject *itemObject = NULL; - ServerObject *containerObj = NULL; + TangibleObject *itemObject = nullptr; + ServerObject *containerObj = nullptr; if (!JavaLibrary::getObject(jitem, itemObject)) { @@ -194,7 +194,7 @@ void JNICALL ScriptMethodsAuctionNamespace::setSalesTax(JNIEnv *env, jobject scr void JNICALL ScriptMethodsAuctionNamespace::requestVendorItemCount(JNIEnv *env, jobject script, jlong vendor) { - ServerObject* vendorObject = NULL; + ServerObject* vendorObject = nullptr; if( !JavaLibrary::getObject(vendor, vendorObject) ) { WARNING(true, ("[designer bug] requestVendorItemLimit() vendor is invalid.")); @@ -206,7 +206,7 @@ void JNICALL ScriptMethodsAuctionNamespace::requestVendorItemCount(JNIEnv *env, void JNICALL ScriptMethodsAuctionNamespace::requestPlayerVendorCount(JNIEnv *env, jobject script, jlong player) { - ServerObject* playerObject = NULL; + ServerObject* playerObject = nullptr; if( !JavaLibrary::getObject(player, playerObject) ) { WARNING(true, ("[designer bug] requestPlayerVendorCount() player is invalid.")); @@ -218,7 +218,7 @@ void JNICALL ScriptMethodsAuctionNamespace::requestPlayerVendorCount(JNIEnv *env void JNICALL ScriptMethodsAuctionNamespace::updateVendorSearchOption(JNIEnv *env, jobject script, jlong vendor, jboolean enable) { - ServerObject* vendorObject = NULL; + ServerObject* vendorObject = nullptr; bool enabled; if( !JavaLibrary::getObject(vendor, vendorObject) ) { @@ -235,7 +235,7 @@ void JNICALL ScriptMethodsAuctionNamespace::updateVendorSearchOption(JNIEnv *env void JNICALL ScriptMethodsAuctionNamespace::setEntranceCharge(JNIEnv *env, jobject script, jlong vendor, jint entranceCharge) { - ServerObject* vendorObject = NULL; + ServerObject* vendorObject = nullptr; if( !JavaLibrary::getObject(vendor, vendorObject) ) { WARNING(true, ("[designer bug] setEntranceCharge() vendor is invalid.")); @@ -247,7 +247,7 @@ void JNICALL ScriptMethodsAuctionNamespace::setEntranceCharge(JNIEnv *env, jobje void JNICALL ScriptMethodsAuctionNamespace::removeAllAuctions(JNIEnv *env, jobject script, jlong jvendor) { - ServerObject* vendorObject = NULL; + ServerObject* vendorObject = nullptr; if( !JavaLibrary::getObject(jvendor, vendorObject) ) { WARNING(true, ("[designer bug] removeAllAuctions() vendor is invalid.")); @@ -259,21 +259,21 @@ void JNICALL ScriptMethodsAuctionNamespace::removeAllAuctions(JNIEnv *env, jobje void JNICALL ScriptMethodsAuctionNamespace::reinitializeVendor(JNIEnv *env, jobject script, jlong vendor, jlong player) { - ServerObject* vendorObject = NULL; + ServerObject* vendorObject = nullptr; if( !JavaLibrary::getObject(vendor, vendorObject) ) { WARNING(true, ("[designer bug] reinitializeVendor() vendor is invalid.")); return; } ServerObject* auctionContainer = vendorObject->getBazaarContainer(); - if ( auctionContainer == NULL ) + if ( auctionContainer == nullptr ) { WARNING(true, ("[designer bug] reinitializeVendor() vendor doesn't have an auction container.")); return; } - ServerObject* playerObject = NULL; + ServerObject* playerObject = nullptr; if ( !JavaLibrary::getObject(player, playerObject) ) { WARNING(true, ("[designer bug] reinitializeVendor() player is invalid.")); @@ -292,7 +292,7 @@ void JNICALL ScriptMethodsAuctionNamespace::reinitializeVendor(JNIEnv *env, jobj void JNICALL ScriptMethodsAuctionNamespace::updateVendorStatus(JNIEnv *env, jobject script, jlong vendor, jint status) { - ServerObject const * vendorObject = NULL; + ServerObject const * vendorObject = nullptr; if (!JavaLibrary::getObject(vendor, vendorObject)) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsBroadcasting.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsBroadcasting.cpp index aaea9f3c..2ee028b5 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsBroadcasting.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsBroadcasting.cpp @@ -63,7 +63,7 @@ void JNICALL ScriptMethodsBroadcastingNamespace::listenToMessage(JNIEnv *env, jo CachedNetworkId emitterId(emitter); ServerObject* listenerObject = dynamic_cast(listenerId.getObject()); - if (listenerObject == NULL) + if (listenerObject == nullptr) return; std::string messageHandlerNameString; @@ -88,7 +88,7 @@ void JNICALL ScriptMethodsBroadcastingNamespace::stopListeningToMessage(JNIEnv * CachedNetworkId emitterId(emitter); ServerObject* listenerObject = dynamic_cast(listenerId.getObject()); - if (listenerObject == NULL) + if (listenerObject == nullptr) return; std::string messageHandlerNameString; @@ -112,7 +112,7 @@ jlongArray JNICALL ScriptMethodsBroadcastingNamespace::getMessageListeners(JNIEn CachedNetworkId emitterId(emitter); ServerObject* emitterObject = dynamic_cast(emitterId.getObject()); - if (emitterObject == NULL) + if (emitterObject == nullptr) return 0; std::string messageHandlerNameString; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp index 9eaabd1f..24289140 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsBuffBuilder.cpp @@ -162,8 +162,8 @@ jboolean JNICALL ScriptMethodsBuffBuilderNamespace::buffBuilderValidated(JNIEnv WARNING(true, ("index keys and values arrays are of diffent sizes")); return JNI_FALSE; } - jint * const buffComponentsValuesArray = env->GetIntArrayElements(jbuffComponentValues, NULL); - if (buffComponentsValuesArray == NULL) + jint * const buffComponentsValuesArray = env->GetIntArrayElements(jbuffComponentValues, nullptr); + if (buffComponentsValuesArray == nullptr) { return JNI_FALSE; } @@ -194,7 +194,7 @@ jboolean JNICALL ScriptMethodsBuffBuilderNamespace::buffBuilderValidated(JNIEnv { //send the final change message to the buffer to indicate acceptance - Controller * const bufferController = bufferObj ? bufferObj->getController() : NULL; + Controller * const bufferController = bufferObj ? bufferObj->getController() : nullptr; if(bufferController) { BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage(); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsChat.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsChat.cpp index 8e36a847..39fbf062 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsChat.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsChat.cpp @@ -218,7 +218,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypointData(JNIEnv Unicode::String n; //name StringId nid; //nameId - //-- target may be null, we'll just start a new string + //-- target may be nullptr, we'll just start a new string if (target) { const JavaStringParam jtarget(target); @@ -229,7 +229,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypointData(JNIEnv } } - //-- if planet is null, just use the current sceneId + //-- if planet is nullptr, just use the current sceneId if (planet) { const JavaStringParam jplanet(planet); @@ -304,7 +304,7 @@ jstring JNICALL ScriptMethodsChatNamespace::chatPackOutOfBandWaypoint(JNIEnv * e if (!source) { - DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatPackOutOfBandWaypoint failed null source")); + DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatPackOutOfBandWaypoint failed nullptr source")); return 0; } @@ -340,7 +340,7 @@ jstring JNICALL ScriptMethodsChatNamespace::packOutOfBandProsePackage(JNIEnv * e if (!stringId) { - DEBUG_WARNING (true, ("JavaLibrary::packOutOfBandProsePackage attempt to pack prose package with null stringId")); + DEBUG_WARNING (true, ("JavaLibrary::packOutOfBandProsePackage attempt to pack prose package with nullptr stringId")); return 0; } @@ -644,10 +644,10 @@ void JNICALL ScriptMethodsChatNamespace::chatSendSystemMessageObjId(JNIEnv * env if(!JavaLibrary::getObject(_to, player)) { - DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatSendSystemMessageObjId failed bad source object (not null)")); + DEBUG_WARNING (true, ("ScriptMethodsChat JavaLibrary::chatSendSystemMessageObjId failed bad source object (not nullptr)")); if (ConfigServerScript::allowDebugConsoleMessages()) { - fprintf(stderr, "WARNING: JavaLibrary::chatSendSystemMessageObjId: failed bad source object (not null)\n"); + fprintf(stderr, "WARNING: JavaLibrary::chatSendSystemMessageObjId: failed bad source object (not nullptr)\n"); JavaLibrary::printJavaStack(); } return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCity.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCity.cpp index 6843dc85..db7499c7 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCity.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCity.cpp @@ -920,7 +920,7 @@ void JNICALL ScriptMethodsCityNamespace::cityRemoveStructure(JNIEnv *env, jobjec jboolean JNICALL ScriptMethodsCityNamespace::cityIsInactivePackupActive(JNIEnv *env, jobject self) { - return (ConfigServerGame::getCityCitizenshipInactivePackupStartTimeEpoch() <= static_cast(::time(NULL))); + return (ConfigServerGame::getCityCitizenshipInactivePackupStartTimeEpoch() <= static_cast(::time(nullptr))); } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp index 28cb48e9..b3af259f 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsClientEffect.cpp @@ -91,7 +91,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObj(JNIEnv * { JavaStringParam localEventType(eventType); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) return JNI_FALSE; Client* c = so->getClient(); @@ -100,7 +100,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObj(JNIEnv * if (!objectToPlayEventOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectToPlayEventOn, target)) return JNI_FALSE; if(!target) @@ -114,7 +114,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObj(JNIEnv * //get the hardpoint std::string hp; - if (NULL != jHardpoint) + if (nullptr != jHardpoint) { JavaStringParam localHardpoint(jHardpoint); JavaLibrary::convert(localHardpoint, hp); @@ -122,7 +122,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObj(JNIEnv * //get the transform Transform transform; - if (NULL != jTransform) + if (nullptr != jTransform) { ScriptConversion::convert(jTransform, transform); } @@ -158,7 +158,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObjLimited(J if (!objectToPlayEventOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectToPlayEventOn, target)) return JNI_FALSE; if(!target) @@ -172,7 +172,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObjLimited(J //get the hardpoint std::string hp; - if (NULL != jHardpoint) + if (nullptr != jHardpoint) { JavaStringParam localHardpoint(jHardpoint); JavaLibrary::convert(localHardpoint, hp); @@ -180,7 +180,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventObjLimited(J //get the transform Transform transform; - if (NULL != jTransform) + if (nullptr != jTransform) { ScriptConversion::convert(jTransform, transform); } @@ -210,7 +210,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEventLoc(JNIEnv * JavaStringParam localEventSourceType(eventSourceType); JavaStringParam localEventDestType(eventDestType); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) return JNI_FALSE; Client* c = so->getClient(); @@ -281,7 +281,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObj(JNIEnv { JavaStringParam localEffectName(effectName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(objectToPlayEffectOn, so)) return JNI_FALSE; /* TPERRY - This isn't used @@ -293,7 +293,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObj(JNIEnv if (!objectToPlayEffectOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectToPlayEffectOn, target)) return JNI_FALSE; if(!target) @@ -307,7 +307,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObj(JNIEnv //get the hardpoint std::string hp; - if (NULL != jHardpoint) + if (nullptr != jHardpoint) { JavaStringParam localHardpoint(jHardpoint); JavaLibrary::convert(localHardpoint, hp); @@ -315,14 +315,14 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObj(JNIEnv //get the transform Transform transform; - if (NULL != jTransform) + if (nullptr != jTransform) { ScriptConversion::convert(jTransform, transform); } //get the optional labelName std::string strLabelName; - if (NULL != labelName) + if (nullptr != labelName) { JavaStringParam localLabel(labelName); JavaLibrary::convert(localLabel, strLabelName); @@ -360,7 +360,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObjLimited( if (!objectToPlayEffectOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectToPlayEffectOn, target)) return JNI_FALSE; if(!target) @@ -374,7 +374,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObjLimited( //get the hardpoint std::string hp; - if (NULL != jHardpoint) + if (nullptr != jHardpoint) { JavaStringParam localHardpoint(jHardpoint); JavaLibrary::convert(localHardpoint, hp); @@ -382,14 +382,14 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectObjLimited( //get the transform Transform transform; - if (NULL != jTransform) + if (nullptr != jTransform) { ScriptConversion::convert(jTransform, transform); } //get the optional labelName std::string strLabelName; - if (NULL != labelName) + if (nullptr != labelName) { JavaStringParam localLabel(labelName); JavaLibrary::convert(localLabel, strLabelName); @@ -419,7 +419,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectLoc(JNIEnv { JavaStringParam localEffectName(effectName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) return JNI_FALSE; @@ -444,7 +444,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectLoc(JNIEnv //get the optional labelName std::string strLabelName; - if (NULL != labelName) + if (nullptr != labelName) { JavaStringParam localLabel(labelName); JavaLibrary::convert(localLabel, strLabelName); @@ -482,7 +482,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playClientEffectLocLimited( //get the optional labelName std::string strLabelName; - if (NULL != labelName) + if (nullptr != labelName) { JavaStringParam localLabel(labelName); JavaLibrary::convert(localLabel, strLabelName); @@ -501,7 +501,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playUiEffect(JNIEnv * /*env { JavaStringParam localUiEffectString(uiEffectString); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) { NetworkId const networkId(client); @@ -531,7 +531,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::stopClientEffectObjByLabel( { JavaStringParam localLabel(labelName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(objectEffectIsOn, so)) return JNI_FALSE; @@ -545,7 +545,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::stopClientEffectObjByLabel( if (!objectEffectIsOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectEffectIsOn, target)) return JNI_FALSE; if(!target) @@ -578,7 +578,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::stopClientEffectObjByLabelL if (!objectEffectIsOn) return JNI_FALSE; - ServerObject* target = NULL; + ServerObject* target = nullptr; if(!JavaLibrary::getObject(objectEffectIsOn, target)) return JNI_FALSE; if(!target) @@ -604,7 +604,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::play2dNonLoopingMusic(JNIEn { JavaStringParam localMusicName(musicName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; Client* c = so->getClient(); @@ -628,7 +628,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::play2dNonLoopingSound(JNIEn { JavaStringParam localMusicName(musicName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; Client* c = so->getClient(); @@ -652,7 +652,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::playMusicWithParms(JNIEnv * { JavaStringParam localMusicName(musicName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; Client* c = so->getClient(); @@ -676,7 +676,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectile(JNIE { JavaStringParam localWeaponObjectTemplateName(weaponObjectTemplateName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; @@ -718,7 +718,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObjec { JavaStringParam localWeaponObjectTemplateName(weaponObjectTemplateName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; @@ -734,14 +734,14 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObjec return JNI_FALSE; // Get our source object - ServerObject* sourceObject = NULL; + ServerObject* sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) return JNI_FALSE; NetworkId sourceId = sourceObject->getNetworkId(); // The target of our effect - ServerObject* targetObject = NULL; + ServerObject* targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return JNI_FALSE; @@ -759,8 +759,8 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObjec // Source's Cell ID CellProperty const * const cellProperty = sourceObject->getParentCell(); - Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL; - NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid; + Object const * const cellObject = (cellProperty != nullptr) ? &cellProperty->getOwner() : nullptr; + NetworkId const & networkIdForCellOrWorld = (cellObject != nullptr) ? cellObject->getNetworkId() : NetworkId::cms_invalid; CreateClientProjectileObjectToObjectMessage const ccpmoto(weaponObjectTemplateNameString, sourceId, sourceHardpointString, networkIdForCellOrWorld, targetId, targetHardpointString, speed, expiration, trail, PackedArgb(static_cast(a), static_cast(r), static_cast(g), static_cast(b)).getArgb()); @@ -776,7 +776,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObje { JavaStringParam localWeaponObjectTemplateName(weaponObjectTemplateName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; @@ -792,7 +792,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObje return JNI_FALSE; // Get our source object - ServerObject* sourceObject = NULL; + ServerObject* sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) return JNI_FALSE; @@ -812,8 +812,8 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileObje // Source's Cell ID CellProperty const * const cellProperty = sourceObject->getParentCell(); - Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL; - NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid; + Object const * const cellObject = (cellProperty != nullptr) ? &cellProperty->getOwner() : nullptr; + NetworkId const & networkIdForCellOrWorld = (cellObject != nullptr) ? cellObject->getNetworkId() : NetworkId::cms_invalid; CreateClientProjectileObjectToLocationMessage const ccpmotl(weaponObjectTemplateNameString, sourceId, sourceHardpointString, networkIdForCellOrWorld, targetLocationVec, speed, expiration, trail, PackedArgb(static_cast(a), static_cast(r), static_cast(g), static_cast(b)).getArgb()); @@ -829,7 +829,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileLocat { JavaStringParam localWeaponObjectTemplateName(weaponObjectTemplateName); - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(client, so)) return JNI_FALSE; @@ -845,7 +845,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileLocat return JNI_FALSE; // Get our target object - ServerObject* targetObject = NULL; + ServerObject* targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return JNI_FALSE; @@ -865,8 +865,8 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileLocat // Target's Cell ID CellProperty const * const cellProperty = targetObject->getParentCell(); - Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL; - NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid; + Object const * const cellObject = (cellProperty != nullptr) ? &cellProperty->getOwner() : nullptr; + NetworkId const & networkIdForCellOrWorld = (cellObject != nullptr) ? cellObject->getNetworkId() : NetworkId::cms_invalid; CreateClientProjectileLocationToObjectMessage const ccpmlto(weaponObjectTemplateNameString, sourceLocationVec, networkIdForCellOrWorld, targetId, targetHardpointString, speed, expiration, trail, PackedArgb(static_cast(a), static_cast(r), static_cast(g), static_cast(b)).getArgb()); @@ -878,7 +878,7 @@ jboolean JNICALL ScriptMethodsClientEffectNamespace::createClientProjectileLocat void JNICALL ScriptMethodsClientEffectNamespace::addObjectEffect(JNIEnv * env, jobject self, jlong obj, jstring filename, jstring hardpoint, jobject offset, jfloat scale, jstring label) { - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(obj, so)) return; @@ -909,7 +909,7 @@ void JNICALL ScriptMethodsClientEffectNamespace::addObjectEffect(JNIEnv * env, j } void JNICALL ScriptMethodsClientEffectNamespace::removeObjectEffect(JNIEnv * env, jobject self, jlong obj, jstring label) { - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(obj, so)) return; @@ -929,7 +929,7 @@ void JNICALL ScriptMethodsClientEffectNamespace::removeObjectEffect(JNIEnv * env void JNICALL ScriptMethodsClientEffectNamespace::removeAllObjectEffects(JNIEnv * env, jobject self, jlong obj) { - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(obj, so)) return; @@ -942,7 +942,7 @@ void JNICALL ScriptMethodsClientEffectNamespace::removeAllObjectEffects(JNIEnv * jboolean JNICALL ScriptMethodsClientEffectNamespace::hasObjectEffect(JNIEnv * env, jobject self, jlong obj, jstring label) { - ServerObject* so = NULL; + ServerObject* so = nullptr; if (!JavaLibrary::getObject(obj, so)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsClusterWideData.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsClusterWideData.cpp index 19df09ef..a93b72ae 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsClusterWideData.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsClusterWideData.cpp @@ -69,7 +69,7 @@ const JNINativeMethod NATIVES[] = { */ LocalRefPtr JavaLibrary::convert(const ValueDictionary & source) { - if (ms_env == NULL) + if (ms_env == nullptr) return LocalRef::cms_nullPtr; // create the dictionary @@ -150,7 +150,7 @@ void JavaLibrary::convert(const jobject & source, ValueDictionary & target) target.clear(); JNIEnv * env = getEnv(); - if (env == NULL) + if (env == nullptr) return; if (!env->IsInstanceOf(source, ms_clsDictionary)) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp index a12763bb..fdb842bc 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCombat.cpp @@ -211,12 +211,12 @@ const JNINativeMethod NATIVES[] = { void JavaLibrary::setupWeaponCombatData(JNIEnv *env, const WeaponObject * weapon, jobject weaponData) { - if (env == NULL || weaponData == NULL) + if (env == nullptr || weaponData == nullptr) return; - if (weapon == NULL) + if (weapon == nullptr) { - env->SetObjectField(weaponData, ms_fidCombatEngineWeaponDataId, NULL); + env->SetObjectField(weaponData, ms_fidCombatEngineWeaponDataId, nullptr); return; } @@ -252,7 +252,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getCombatDuration(JNIEnv * /*env*/, j NetworkId const networkId(object); TangibleObject const * const tangibleObject = TangibleObject::getTangibleObject(networkId); - if (tangibleObject == NULL) + if (tangibleObject == nullptr) { return 0; } @@ -267,7 +267,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getCombatDuration(JNIEnv * /*env*/, j * @param self class calling this function * @param target id of the creature * - * @return the object id of the weapon, or NULL on error + * @return the object id of the weapon, or nullptr on error */ jlong JNICALL ScriptMethodsCombatNamespace::getCurrentWeapon(JNIEnv *env, jobject self, jlong target) { @@ -278,7 +278,7 @@ jlong JNICALL ScriptMethodsCombatNamespace::getCurrentWeapon(JNIEnv *env, jobjec return 0; const WeaponObject * weapon = creature->getCurrentWeapon(); - if (weapon == NULL) + if (weapon == nullptr) return 0; return (weapon->getNetworkId()).getValue(); @@ -313,7 +313,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::setCurrentWeapon(JNIEnv *env, job * @param self class calling this function * @param target id of the creature * - * @return the object id of the weapon, or NULL on error + * @return the object id of the weapon, or nullptr on error */ jlong JNICALL ScriptMethodsCombatNamespace::getHeldWeapon(JNIEnv *env, jobject self, jlong target) { @@ -324,7 +324,7 @@ jlong JNICALL ScriptMethodsCombatNamespace::getHeldWeapon(JNIEnv *env, jobject s return 0; const WeaponObject * weapon = creature->getReadiedWeapon(); - if (weapon == NULL) + if (weapon == nullptr) return 0; return (weapon->getNetworkId()).getValue(); @@ -337,7 +337,7 @@ jlong JNICALL ScriptMethodsCombatNamespace::getHeldWeapon(JNIEnv *env, jobject s * @param self class calling this function * @param target id of the creature * - * @return the object id of the default weapon, or NULL on error + * @return the object id of the default weapon, or nullptr on error */ jlong JNICALL ScriptMethodsCombatNamespace::getDefaultWeapon(JNIEnv *env, jobject self, jlong target) { @@ -348,7 +348,7 @@ UNREF(self); return 0; const WeaponObject * weapon = creature->getDefaultWeapon(); - if (weapon == NULL) + if (weapon == nullptr) return 0; return (weapon->getNetworkId()).getValue(); @@ -422,7 +422,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::isDefaultWeapon(JNIEnv *env, jobj return JNI_FALSE; const CreatureObject * owner = dynamic_cast(ContainerInterface::getContainedByObject(*weapon)); - if (owner == NULL || owner->getDefaultWeapon() != weapon) + if (owner == nullptr || owner->getDefaultWeapon() != weapon) return JNI_FALSE; return JNI_TRUE; @@ -441,7 +441,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getMinRange(JNIEnv *env, jobject se { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1.0f; @@ -462,7 +462,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getMaxRange(JNIEnv *env, jobject se { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1.0f; @@ -483,7 +483,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getAverageDamage(JNIEnv *env, jobje { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -506,7 +506,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponType(JNIEnv *env, jobject se { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -527,7 +527,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponAttackType(JNIEnv *env, jobj { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -546,7 +546,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponDamageType(JNIEnv *env, jobj { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -590,7 +590,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponMinDamage(JNIEnv *env, jobje { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -636,7 +636,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponMaxDamage(JNIEnv *env, jobje { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -682,7 +682,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getWeaponAttackSpeed(JNIEnv *env, j { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1.0f; @@ -728,7 +728,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getWeaponWoundChance(JNIEnv *env, j { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1.0f; @@ -743,13 +743,13 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getWeaponWoundChance(JNIEnv *env, j * @param self class calling this function * @param weaponId the id of the weapon * - * @return the range info, or null on error + * @return the range info, or nullptr on error */ jobject JNICALL ScriptMethodsCombatNamespace::getWeaponRangeInfo(JNIEnv *env, jobject self, jlong weaponId) { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -827,7 +827,7 @@ jfloat JNICALL ScriptMethodsCombatNamespace::getWeaponDamageRadius(JNIEnv *env, { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1.0f; @@ -865,7 +865,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::setWeaponDamageRadius(JNIEnv *env */ jfloat JNICALL ScriptMethodsCombatNamespace::getAudibleRange(JNIEnv *env, jobject self, jlong weaponId) { - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return -1; @@ -887,7 +887,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponAttackCost(JNIEnv *env, jobj { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -932,7 +932,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponAccuracy(JNIEnv *env, jobjec { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -977,7 +977,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponElementalType(JNIEnv *env, j { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -1022,7 +1022,7 @@ jint JNICALL ScriptMethodsCombatNamespace::getWeaponElementalValue(JNIEnv *env, { UNREF(self); - const WeaponObject *weapon = NULL; + const WeaponObject *weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return 0; @@ -1218,7 +1218,7 @@ void _startCombat(char const * const functionName, jlong attacker, jlong defende NetworkId const attackerId(attacker); TangibleObject * const attackerTangibleObject = TangibleObject::getTangibleObject(attackerId); - if (attackerTangibleObject == NULL) + if (attackerTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsCombat::%s() Unable to resolve the attacker(%s) to a TangibleObject.", functionName, attackerId.getValueString().c_str())); return; @@ -1227,7 +1227,7 @@ void _startCombat(char const * const functionName, jlong attacker, jlong defende NetworkId const defenderId(defender); TangibleObject * const defenderTangibleObject = TangibleObject::getTangibleObject(defenderId); - if (defenderTangibleObject == NULL) + if (defenderTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsCombat::%s() attacker(%s) Unable to resolve the defender(%s) to a TangibleObject.", functionName, attackerId.getValueString().c_str(), defenderId.getValueString().c_str())); return; @@ -1302,7 +1302,7 @@ void JNICALL ScriptMethodsCombatNamespace::stopCombat(JNIEnv * /*env*/, jobject NetworkId const objectId(object); TangibleObject * const tangibleObject = TangibleObject::getTangibleObject(objectId); - if (tangibleObject == NULL) + if (tangibleObject == nullptr) { return; } @@ -1334,9 +1334,9 @@ int i; int attackerCount = 0; int defenderCount = 0; - if (attackers != NULL) + if (attackers != nullptr) attackerCount = env->GetArrayLength(attackers); - if (defenders != NULL) + if (defenders != nullptr) defenderCount = env->GetArrayLength(defenders); // get the attacker and weapon data @@ -1348,22 +1348,22 @@ int i; LocalRefPtr weaponData = getObjectArrayElement(LocalObjectArrayRefParam(weaponsData), i); if (!attackerId) { - WARNING(true, ("JavaLibrary::getCombatData got null attacker id")); + WARNING(true, ("JavaLibrary::getCombatData got nullptr attacker id")); return JNI_FALSE; } if (attackerData == LocalRef::cms_nullPtr) { - WARNING(true, ("JavaLibrary::getCombatData got null attacker data")); + WARNING(true, ("JavaLibrary::getCombatData got nullptr attacker data")); return JNI_FALSE; } if (weaponData == LocalRef::cms_nullPtr) { - WARNING(true, ("JavaLibrary::getCombatData got null weapon data")); + WARNING(true, ("JavaLibrary::getCombatData got nullptr weapon data")); return JNI_FALSE; } // set up the attacker data - const TangibleObject * attacker = NULL; + const TangibleObject * attacker = nullptr; if (!JavaLibrary::getObject(attackerId, attacker)) { WARNING(true, ("JavaLibrary::getCombatData cannot get attacker object")); @@ -1377,7 +1377,7 @@ int i; ScriptConversion::convert(attacker->getPosition_p(), attacker->getSceneId(), attackerCell ? attackerCell->getNetworkId() : NetworkId::cms_invalid, location); - if (location.get() == NULL || location == LocalRef::cms_nullPtr) + if (location.get() == nullptr || location == LocalRef::cms_nullPtr) { WARNING(true, ("JavaLibrary::getCombatData cannot convert local position " "of attacker %s to Java", attacker->getNetworkId().getValueString().c_str())); @@ -1390,7 +1390,7 @@ int i; ScriptConversion::convert(attacker->getPosition_w(), attacker->getSceneId(), CellProperty::getWorldCellProperty()->getOwner().getNetworkId(), worldLocation); - if (worldLocation.get() == NULL || worldLocation == LocalRef::cms_nullPtr) + if (worldLocation.get() == nullptr || worldLocation == LocalRef::cms_nullPtr) { WARNING(true, ("JavaLibrary::getCombatData cannot convert world position " "of attacker %s to Java", attacker->getNetworkId().getValueString().c_str())); @@ -1398,14 +1398,14 @@ int i; } } - const WeaponObject * weapon = NULL; + const WeaponObject * weapon = nullptr; bool isCreature = false; int posture = 0; int locomotion = 0; int weaponSkill = 0; int aims = 0; const CreatureObject * creature = dynamic_cast(attacker); - if (creature != NULL) + if (creature != nullptr) { isCreature = true; posture = creature->getPosture(); @@ -1419,7 +1419,7 @@ int i; CombatEngineData::CombatData const * combatData = attacker->getCombatData(); - if (combatData != NULL) + if (combatData != nullptr) { aims = combatData->attackData.aims; } @@ -1446,17 +1446,17 @@ int i; LocalRefPtr defenderData = getObjectArrayElement(LocalObjectArrayRefParam(defendersData), i); if (!defenderId) { - WARNING(true, ("JavaLibrary::getCombatData got null defender id")); + WARNING(true, ("JavaLibrary::getCombatData got nullptr defender id")); return JNI_FALSE; } if (defenderData == LocalRef::cms_nullPtr) { - WARNING(true, ("JavaLibrary::getCombatData got null defender data")); + WARNING(true, ("JavaLibrary::getCombatData got nullptr defender data")); return JNI_FALSE; } // set up the defender data - const TangibleObject * defender = NULL; + const TangibleObject * defender = nullptr; if (!JavaLibrary::getObject(defenderId, defender)) { WARNING(true, ("JavaLibrary::getCombatData cannot get defender object")); @@ -1470,7 +1470,7 @@ int i; ScriptConversion::convert(defender->getPosition_p(), defender->getSceneId(), defenderCell ? defenderCell->getNetworkId() : NetworkId::cms_invalid, location); - if (location.get() == NULL || location == LocalRef::cms_nullPtr) + if (location.get() == nullptr || location == LocalRef::cms_nullPtr) { WARNING(true, ("JavaLibrary::getCombatData cannot convert local position " "of defender %s to Java", defender->getNetworkId().getValueString().c_str())); @@ -1483,7 +1483,7 @@ int i; ScriptConversion::convert(defender->getPosition_w(), defender->getSceneId(), CellProperty::getWorldCellProperty()->getOwner().getNetworkId(), worldLocation); - if (worldLocation.get() == NULL || worldLocation == LocalRef::cms_nullPtr) + if (worldLocation.get() == nullptr || worldLocation == LocalRef::cms_nullPtr) { WARNING(true, ("JavaLibrary::getCombatData cannot convert world position " "of defender %s to Java", defender->getNetworkId().getValueString().c_str())); @@ -1497,7 +1497,7 @@ int i; int combatSkeleton = defender->getCombatSkeleton(); int cover = 0; const CreatureObject * creature = dynamic_cast(defender); - if (creature != NULL) + if (creature != nullptr) { isCreature = true; posture = creature->getPosture(); @@ -1557,7 +1557,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::getWeaponData(JNIEnv *env, jobjec if (weapon == 0 || weaponData == 0) return JNI_FALSE; - const WeaponObject * localWeapon = NULL; + const WeaponObject * localWeapon = nullptr; if (!JavaLibrary::getObject(weapon, localWeapon)) return JNI_FALSE; @@ -1587,15 +1587,15 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doDamage(JNIEnv *env, jobject sel if (damage <= 0) return JNI_TRUE; - TangibleObject * attacker = NULL; + TangibleObject * attacker = nullptr; if (!JavaLibrary::getObject(attackerId, attacker)) return JNI_FALSE; - TangibleObject * defender = NULL; + TangibleObject * defender = nullptr; if (!JavaLibrary::getObject(defenderId, defender)) return JNI_FALSE; - WeaponObject * weapon = NULL; + WeaponObject * weapon = nullptr; if (!JavaLibrary::getObject(weaponId, weapon)) return JNI_FALSE; @@ -1627,11 +1627,11 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doDamageNoWeapon(JNIEnv *env, job if (damage <= 0) return JNI_TRUE; - TangibleObject * attacker = NULL; + TangibleObject * attacker = nullptr; if (!JavaLibrary::getObject(attackerId, attacker)) return JNI_FALSE; - TangibleObject * defender = NULL; + TangibleObject * defender = nullptr; if (!JavaLibrary::getObject(defenderId, defender)) return JNI_FALSE; @@ -1699,7 +1699,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doCombatResults(JNIEnv *env, jobj { message->setAttacker(attacker, weapon); CreatureObject * creature = dynamic_cast(attacker.getObject()); - if (creature != NULL) + if (creature != nullptr) { Postures::Enumerator posture = static_cast( env->GetIntField(attackerResult, JavaLibrary::getFidBaseClassAttackerResultsPosture())); @@ -1816,7 +1816,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doCombatResults(JNIEnv *env, jobj // send the message Controller *const controller = attacker.getObject()->getController(); - if (controller != NULL) + if (controller != nullptr) { float f_hold_ms = ConfigServerGame::getCombatDamageDelaySeconds() * 1000.0f; if ( f_hold_ms < 1.0 ) // 0 hold time (allowing for rounding error) @@ -1834,7 +1834,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::doCombatResults(JNIEnv *env, jobj { MessageQueueCombatAction *held = (MessageQueueCombatAction*)controller->peekHeldMessage( CM_combatAction ); bool b_merge = true; - if ( held == NULL ) + if ( held == nullptr ) b_merge = false; else if ( held->getComparisonChecksum() != message->getComparisonChecksum() ) b_merge = false; @@ -1900,24 +1900,24 @@ jboolean JNICALL ScriptMethodsCombatNamespace::callDefenderCombatAction(JNIEnv * { // use the attacker's current weapon CreatureObject * creatureAttacker = dynamic_cast(attackerId.getObject()); - if (creatureAttacker != NULL) + if (creatureAttacker != nullptr) { const WeaponObject * weaponObject = creatureAttacker->getCurrentWeapon(); - if (weaponObject != NULL) + if (weaponObject != nullptr) weaponId = weaponObject->getNetworkId(); } else { const WeaponObject * weaponAttacker = dynamic_cast( attackerId.getObject()); - if (weaponAttacker != NULL) + if (weaponAttacker != nullptr) weaponId = weaponAttacker->getNetworkId(); } } // call the trigger for each defender - jint * resultsArray = env->GetIntArrayElements(results, NULL); - if (resultsArray == NULL) + jint * resultsArray = env->GetIntArrayElements(results, nullptr); + if (resultsArray == nullptr) return JNI_FALSE; for (jsize i = 0; i < defenderCount; ++i) @@ -1927,11 +1927,11 @@ jboolean JNICALL ScriptMethodsCombatNamespace::callDefenderCombatAction(JNIEnv * if (defender) { CachedNetworkId defenderId(defender); - if (defenderId.getObject() != NULL) + if (defenderId.getObject() != nullptr) { ServerObject * defenderObject = safe_cast( defenderId.getObject()); - if (defenderObject->getScriptObject() != NULL) + if (defenderObject->getScriptObject() != nullptr) { ScriptParams params; params.addParam(attackerId); @@ -1961,7 +1961,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::callDefenderCombatAction(JNIEnv * */ void JNICALL ScriptMethodsCombatNamespace::setWantSawAttackTriggers(JNIEnv *env, jobject self, jlong obj, jboolean enable) { - TangibleObject * tangible = NULL; + TangibleObject * tangible = nullptr; if (!JavaLibrary::getObject(obj, tangible)) { @@ -2021,7 +2021,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::addSlowDownEffect(JNIEnv *env, jo return JNI_FALSE; } - CreatureObject * attackerObject = NULL; + CreatureObject * attackerObject = nullptr; if (!JavaLibrary::getObject(attacker, attackerObject)) { WARNING(true, ("[script bug] JavaLibrary::addSlowDownEffect called " @@ -2029,7 +2029,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::addSlowDownEffect(JNIEnv *env, jo return JNI_FALSE; } - const TangibleObject * defenderObject = NULL; + const TangibleObject * defenderObject = nullptr; if (!JavaLibrary::getObject(defender, defenderObject)) { WARNING(true, ("[script bug] JavaLibrary::addSlowDownEffect called " @@ -2057,7 +2057,7 @@ jboolean JNICALL ScriptMethodsCombatNamespace::addSlowDownEffect(JNIEnv *env, jo */ jboolean JNICALL ScriptMethodsCombatNamespace::removeSlowDownEffect(JNIEnv *env, jobject self, jlong attacker) { - CreatureObject * attackerObject = NULL; + CreatureObject * attackerObject = nullptr; if (!JavaLibrary::getObject(attacker, attackerObject)) { WARNING(true, ("[script bug] JavaLibrary::removeSlowDownEffect called " @@ -2090,14 +2090,14 @@ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpam(JNIEnv *env, jobject s { NetworkId attackerId(attacker); ServerObject * attackerObj = safe_cast(NetworkIdManager::getObjectById(attackerId)); - if (attackerObj == NULL) + if (attackerObj == nullptr) { WARNING(true, ("WARNING: JavaLibrary::sendCombatSpam could not find attacker for id %s", attackerId.getValueString().c_str())); return; } NetworkId defenderId(defender); - Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : NULL); + Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : nullptr); NetworkId weaponId(weapon); StringId attackNameSid; @@ -2189,14 +2189,14 @@ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamWeaponString(JNIEnv *en { NetworkId attackerId(attacker); ServerObject * attackerObj = safe_cast(NetworkIdManager::getObjectById(attackerId)); - if (attackerObj == NULL) + if (attackerObj == nullptr) { WARNING(true, ("WARNING: JavaLibrary::sendCombatSpam could not find attacker for id %s", attackerId.getValueString().c_str())); return; } NetworkId defenderId(defender); - Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : NULL); + Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : nullptr); StringId weaponNameSid; if (!ScriptConversion::convert(weaponName, weaponNameSid)) @@ -2287,12 +2287,12 @@ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamWeaponString(JNIEnv *en */ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamMessage(JNIEnv *env, jobject self, jlong attacker, jlong defender, jobject message, jboolean sendToAttacker, jboolean sendToDefender, jboolean sendToBystanders, jint spamType) { - ServerObject * attackerObj = NULL; + ServerObject * attackerObj = nullptr; if (!JavaLibrary::getObject(attacker, attackerObj)) return; NetworkId defenderId(defender); - Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : NULL); + Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : nullptr); StringId messageSid; if (!ScriptConversion::convert(message, messageSid)) @@ -2322,12 +2322,12 @@ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamMessage(JNIEnv *env, jo */ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamMessageCGP(JNIEnv *env, jobject self, jlong attacker, jlong defender, jobject message, jboolean sendToAttacker, jboolean sendToDefender, jboolean sendToBystanders, jboolean critical, jboolean glancing, jboolean proc, jint spamType) { - ServerObject * attackerObj = NULL; + ServerObject * attackerObj = nullptr; if (!JavaLibrary::getObject(attacker, attackerObj)) return; NetworkId defenderId(defender); - Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : NULL); + Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : nullptr); StringId messageSid; if (!ScriptConversion::convert(message, messageSid)) @@ -2353,12 +2353,12 @@ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamMessageCGP(JNIEnv *env, */ void JNICALL ScriptMethodsCombatNamespace::sendCombatSpamMessageOob(JNIEnv *env, jobject self, jlong attacker, jlong defender, jstring oob, jboolean sendToAttacker, jboolean sendToDefender, jboolean sendToBystanders, jint spamType) { - ServerObject * attackerObj = NULL; + ServerObject * attackerObj = nullptr; if (!JavaLibrary::getObject(attacker, attackerObj)) return; NetworkId defenderId(defender); - Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : NULL); + Object const * const defenderObj = (defenderId.isValid() ? NetworkIdManager::getObjectById(defenderId) : nullptr); Unicode::String oobString; if (!JavaLibrary::convert(JavaStringParam(oob), oobString)) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCommandQueue.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCommandQueue.cpp index 2e400a0b..c95a74cb 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCommandQueue.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCommandQueue.cpp @@ -97,7 +97,7 @@ jboolean JNICALL ScriptMethodsCommandQueueNamespace::queueCommand(JNIEnv *env, j NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::queueCommand() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return JNI_FALSE; @@ -142,7 +142,7 @@ jboolean JNICALL ScriptMethodsCommandQueueNamespace::queueClear(JNIEnv *env, job NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::queueClear() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return JNI_FALSE; @@ -170,7 +170,7 @@ jboolean JNICALL ScriptMethodsCommandQueueNamespace::queueHasCommandFromGroup(JN NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::queueHasCommandFromGroup() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return JNI_FALSE; @@ -196,7 +196,7 @@ jboolean JNICALL ScriptMethodsCommandQueueNamespace::queueClearCommandsFromGroup NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::queueClearCommandsFromGroup() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return JNI_FALSE; @@ -239,14 +239,14 @@ jboolean JNICALL ScriptMethodsCommandQueueNamespace::setCommandTimerValue( JNIEn NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::setCommandTimerValue() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return JNI_FALSE; } CommandQueue * const queue = actorTangibleObject->getCommandQueue(); - if (queue == NULL) + if (queue == nullptr) { WARNING(true, ("JavaLibrary::setCommandTimerValue() object(%s) does not have a CommandQueue", actorTangibleObject->getDebugInformation().c_str())); return JNI_FALSE; @@ -267,7 +267,7 @@ jint JNICALL ScriptMethodsCommandQueueNamespace::getCurrentCommand( JNIEnv *env, NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::getCurrentCommand() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return 0; @@ -275,7 +275,7 @@ jint JNICALL ScriptMethodsCommandQueueNamespace::getCurrentCommand( JNIEnv *env, CommandQueue const * const queue = actorTangibleObject->getCommandQueue(); - if (queue == NULL) + if (queue == nullptr) { WARNING(true, ("JavaLibrary::getCurrentCommand() object(%s) does not have a CommandQueue", actorTangibleObject->getDebugInformation().c_str())); return 0; @@ -298,7 +298,7 @@ jfloat JNICALL ScriptMethodsCommandQueueNamespace::getCooldownTimeLeft( JNIEnv * NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::getCooldownTimeLeft() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return 0.0f; @@ -306,7 +306,7 @@ jfloat JNICALL ScriptMethodsCommandQueueNamespace::getCooldownTimeLeft( JNIEnv * CommandQueue const * const queue = actorTangibleObject->getCommandQueue(); - if (queue == NULL) + if (queue == nullptr) { WARNING(true, ("JavaLibrary::getCooldownTimeLeft() object(%s) does not have a CommandQueue", actorTangibleObject->getDebugInformation().c_str())); return 0.0f; @@ -329,7 +329,7 @@ jfloat JNICALL ScriptMethodsCommandQueueNamespace::getCooldownTimeLeftString( JN NetworkId actorId(actor); TangibleObject * const actorTangibleObject = TangibleObject::getTangibleObject(actorId); - if (actorTangibleObject == NULL) + if (actorTangibleObject == nullptr) { WARNING(true, ("JavaLibrary::getCooldownTimeLeftString() Unable to resolve actor(%s) to a TangibleObject", actorId.getValueString().c_str())); return 0.0f; @@ -347,13 +347,13 @@ jfloat JNICALL ScriptMethodsCommandQueueNamespace::getCooldownTimeLeftString( JN CommandQueue const * const queue = actorTangibleObject->getCommandQueue(); float value = 0.0f; - if (queue == NULL) + if (queue == nullptr) { WARNING(true, ("JavaLibrary::getCooldownTimeLeftString() object(%s) does not have a CommandQueue", actorTangibleObject->getDebugInformation().c_str())); return 0.0f; } - if (queue != NULL) + if (queue != nullptr) { value = queue->getCooldownTimeLeft( out ); } @@ -369,7 +369,7 @@ void JNICALL ScriptMethodsCommandQueueNamespace::sendCooldownGroupTimingOnly(JNI NetworkId actorId(actor); CreatureObject * const actorCreatureObject = CreatureObject::getCreatureObject(actorId); - if (actorCreatureObject == NULL) + if (actorCreatureObject == nullptr) { WARNING(true, ("JavaLibrary::sendCooldownGroupTimingOnly() Unable to resolve actor(%s) to a CreatureObject", actorId.getValueString().c_str())); return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsConsole.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsConsole.cpp index 9392677f..0355fb72 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsConsole.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsConsole.cpp @@ -52,10 +52,10 @@ void JNICALL ScriptMethodsConsoleNamespace::consoleSendMessageObjId(JNIEnv * env const ServerObject* player = 0; if(!JavaLibrary::getObject(_to, player)) { - DEBUG_WARNING (true, ("ScriptMethodsConsole JavaLibrary::consoleSendMessageObjId failed bad source object (not null)")); + DEBUG_WARNING (true, ("ScriptMethodsConsole JavaLibrary::consoleSendMessageObjId failed bad source object (not nullptr)")); if (ConfigServerScript::allowDebugConsoleMessages()) { - fprintf(stderr, "WARNING: ScriptMethodsConsole JavaLibrary::consoleSendMessageObjId: failed bad source object (not null)\n"); + fprintf(stderr, "WARNING: ScriptMethodsConsole JavaLibrary::consoleSendMessageObjId: failed bad source object (not nullptr)\n"); JavaLibrary::printJavaStack(); } return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsContainers.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsContainers.cpp index 12a63612..acb9aba9 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsContainers.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsContainers.cpp @@ -136,7 +136,7 @@ const JNINativeMethod NATIVES[] = { jint JNICALL ScriptMethodsContainersNamespace::getContainerType(JNIEnv *env, jobject self, jlong container) { //@todo use enum - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -151,7 +151,7 @@ jint JNICALL ScriptMethodsContainersNamespace::getContainerType(JNIEnv *env, job jlongArray JNICALL ScriptMethodsContainersNamespace::getContents(JNIEnv *env, jobject self, jlong containerObj) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(containerObj, containerOwner)) return 0; @@ -190,7 +190,7 @@ jlongArray JNICALL ScriptMethodsContainersNamespace::getContents(JNIEnv *env, jo jlong JNICALL ScriptMethodsContainersNamespace::getContainedBy(JNIEnv *env, jobject self, jlong item) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return 0; @@ -211,7 +211,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::contains(JNIEnv *env, jobject if (container_id.getValue() == 0) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -226,11 +226,11 @@ jboolean JNICALL ScriptMethodsContainersNamespace::contains(JNIEnv *env, jobject jint JNICALL ScriptMethodsContainersNamespace::canPutIn(JNIEnv *env, jobject self, jlong target, jlong jcontainer) { const int unknownError = static_cast(Container::CEC_Unknown); - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(jcontainer, containerOwner)) return unknownError; - ServerObject * item = NULL; + ServerObject * item = nullptr; if (!JavaLibrary::getObject(target, item)) return unknownError; @@ -248,11 +248,11 @@ jint JNICALL ScriptMethodsContainersNamespace::canPutIn(JNIEnv *env, jobject sel jint JNICALL ScriptMethodsContainersNamespace::canPutInSlot(JNIEnv *env, jobject self, jlong target, jlong jcontainer, jstring slot) { const int unknownError = static_cast(Container::CEC_Unknown); - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(jcontainer, containerOwner)) return unknownError; - ServerObject * item = NULL; + ServerObject * item = nullptr; if (!JavaLibrary::getObject(target, item)) return unknownError; @@ -268,7 +268,7 @@ jint JNICALL ScriptMethodsContainersNamespace::canPutInSlot(JNIEnv *env, jobject if (slotId == SlotId::invalid) return static_cast(Container::CEC_NoSlot); - IGNORE_RETURN(ContainerInterface::canTransferToSlot(*containerOwner, *item, slotId, NULL, tmp)); + IGNORE_RETURN(ContainerInterface::canTransferToSlot(*containerOwner, *item, slotId, nullptr, tmp)); return static_cast(tmp); } @@ -279,7 +279,7 @@ jlong JNICALL ScriptMethodsContainersNamespace::getObjectInSlot(JNIEnv *env, job { JavaStringParam localSlot(slot); - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -301,7 +301,7 @@ jlong JNICALL ScriptMethodsContainersNamespace::getObjectInSlot(JNIEnv *env, job jlong JNICALL ScriptMethodsContainersNamespace::getFirstParentInWorld(JNIEnv *env, jobject self, jlong item) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return 0; @@ -316,7 +316,7 @@ jlong JNICALL ScriptMethodsContainersNamespace::getFirstParentInWorld(JNIEnv *en jlong JNICALL ScriptMethodsContainersNamespace::getTopMostContainer(JNIEnv *env, jobject self, jlong item) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return 0; @@ -331,7 +331,7 @@ jlong JNICALL ScriptMethodsContainersNamespace::getTopMostContainer(JNIEnv *env, jint JNICALL ScriptMethodsContainersNamespace::getNumItemsIn(JNIEnv *env, jobject self, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -347,7 +347,7 @@ jint JNICALL ScriptMethodsContainersNamespace::getNumItemsIn(JNIEnv *env, jobjec void JNICALL ScriptMethodsContainersNamespace::destroyContents(JNIEnv *env, jobject self, jlong container) { #if 0 //@todo implement - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return; @@ -359,11 +359,11 @@ void JNICALL ScriptMethodsContainersNamespace::destroyContents(JNIEnv *env, jobj jint JNICALL ScriptMethodsContainersNamespace::moveContents(JNIEnv *env, jobject self, jlong containerA, jlong containerB) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(containerA, containerOwner)) return 0; - ServerObject * targetContainer = NULL; + ServerObject * targetContainer = nullptr; if (!JavaLibrary::getObject(containerB, targetContainer)) return 0; @@ -377,7 +377,7 @@ jint JNICALL ScriptMethodsContainersNamespace::moveContents(JNIEnv *env, jobject for (; iter != container->end(); ++iter) { ServerObject* item = safe_cast((*iter).getObject()); - if (item && ContainerInterface::transferItemToGeneralContainer(*targetContainer, *item, NULL, tmp)) + if (item && ContainerInterface::transferItemToGeneralContainer(*targetContainer, *item, nullptr, tmp)) { ++count; } @@ -389,20 +389,20 @@ jint JNICALL ScriptMethodsContainersNamespace::moveContents(JNIEnv *env, jobject jint JNICALL ScriptMethodsContainersNamespace::moveObjects(JNIEnv *env, jobject self, jlongArray targets, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; int count = 0; for (int i = 0; i < env->GetArrayLength(targets); ++i) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; jlong jlongTmp; env->GetLongArrayRegion(targets, i, 1, &jlongTmp); if (JavaLibrary::getObject(jlongTmp, itemObj)) { Container::ContainerErrorCode tmp = Container::CEC_Success; - if (ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, NULL, tmp)) + if (ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, nullptr, tmp)) { ++count; } @@ -417,15 +417,15 @@ jint JNICALL ScriptMethodsContainersNamespace::moveObjects(JNIEnv *env, jobject jboolean JNICALL ScriptMethodsContainersNamespace::putIn(JNIEnv *env, jobject self, jlong item, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; Container::ContainerErrorCode tmp = Container::CEC_Success; - return ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, NULL, tmp); + return ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, nullptr, tmp); } @@ -434,11 +434,11 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putIn(JNIEnv *env, jobject se jboolean JNICALL ScriptMethodsContainersNamespace::putInPosition(JNIEnv *env, jobject self, jlong item, jlong container, jobject pos) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -451,7 +451,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putInPosition(JNIEnv *env, jo tr.setPosition_p(newPos); Container::ContainerErrorCode tmp = Container::CEC_Success; - return ContainerInterface::transferItemToCell(*containerOwner, *itemObj, tr, NULL, tmp); + return ContainerInterface::transferItemToCell(*containerOwner, *itemObj, tr, nullptr, tmp); } //-------------------------------------------------------------------------------------- @@ -459,20 +459,20 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putInPosition(JNIEnv *env, jo jboolean JNICALL ScriptMethodsContainersNamespace::putInAndSendError(JNIEnv *env, jobject self, jlong item, jlong container, jlong player) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; Container::ContainerErrorCode tmp = Container::CEC_Success; - bool retval = ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, NULL, tmp); + bool retval = ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, nullptr, tmp); if (!retval) { - ServerObject * playerObj = NULL; + ServerObject * playerObj = nullptr; if (!JavaLibrary::getObject(player, playerObj)) return JNI_FALSE; ContainerInterface::sendContainerMessageToClient(*playerObj, tmp); @@ -483,11 +483,11 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putInAndSendError(JNIEnv *env //-------------------------------------------------------------------------------------- jboolean JNICALL ScriptMethodsContainersNamespace::putInOverloaded(JNIEnv *env, jobject self, jlong item, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -500,7 +500,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putInOverloaded(JNIEnv *env, } else { - retval = ContainerInterface::transferItemToVolumeContainer(*containerOwner, *itemObj, NULL, tmp, true); + retval = ContainerInterface::transferItemToVolumeContainer(*containerOwner, *itemObj, nullptr, tmp, true); } return retval; @@ -509,11 +509,11 @@ jboolean JNICALL ScriptMethodsContainersNamespace::putInOverloaded(JNIEnv *env, //-------------------------------------------------------------------------------------- jboolean JNICALL ScriptMethodsContainersNamespace::equip(JNIEnv *env, jobject self, jlong item, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -521,7 +521,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equip(JNIEnv *env, jobject se if (!test) return JNI_FALSE; Container::ContainerErrorCode tmp = Container::CEC_Success; - return ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, NULL, tmp); + return ContainerInterface::transferItemToGeneralContainer(*containerOwner, *itemObj, nullptr, tmp); } @@ -532,11 +532,11 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equipIn(JNIEnv *env, jobject JavaStringParam localSlot(slot); //@todo better error checking for invalid slot name. Do it above too. - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return JNI_FALSE; - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -554,7 +554,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equipIn(JNIEnv *env, jobject Container::ContainerErrorCode tmp = Container::CEC_Success; int arrangement = slotted ? slotted->getBestArrangementForSlot(slotName) : -1; - return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, NULL, tmp); + return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, nullptr, tmp); } @@ -565,14 +565,14 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equipOverride(JNIEnv *env, j //This function will equip and object into the first valid arrangement, deleting objects if necessary. //Before it deletes things, it looks for a valid unoccupied arrangement. - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) { DEBUG_WARNING(true, ("JNI: EquipOverride param container could not be found")); return JNI_FALSE; } - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) { DEBUG_WARNING(true, ("JNI: EquipOverride param item could not be found")); @@ -592,7 +592,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equipOverride(JNIEnv *env, j if (slotContainer->getFirstUnoccupiedArrangement(*itemObj, arrangement, tmp)) { //Found one - return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, NULL, tmp); + return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, nullptr, tmp); } //Couldn't find an unoccupied arrangement, so it's time to delete objects to make room for this one @@ -634,14 +634,14 @@ jboolean JNICALL ScriptMethodsContainersNamespace::equipOverride(JNIEnv *env, j } } - return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, NULL, tmp); + return ContainerInterface::transferItemToSlottedContainer(*containerOwner, *itemObj, arrangement, nullptr, tmp); } //-------------------------------------------------------------------------------------- jint JNICALL ScriptMethodsContainersNamespace::getFilledVolume(JNIEnv *env, jobject self, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -656,7 +656,7 @@ jint JNICALL ScriptMethodsContainersNamespace::getFilledVolume(JNIEnv *env, jobj jint JNICALL ScriptMethodsContainersNamespace::getTotalVolume(JNIEnv *env, jobject self, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -672,7 +672,7 @@ jint JNICALL ScriptMethodsContainersNamespace::getTotalVolume(JNIEnv *env, jobje jint JNICALL ScriptMethodsContainersNamespace::getVolumeFree(JNIEnv *env, jobject self, jlong container) { - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; @@ -691,7 +691,7 @@ void JNICALL ScriptMethodsContainersNamespace::sendContainerErrorToClient(JNIEnv if (errorCode == 0) return; - ServerObject * playerObject = NULL; + ServerObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) { DEBUG_WARNING(true, ("Player object not found in sendContainerErrorToClient")); @@ -767,7 +767,7 @@ void JNICALL ScriptMethodsContainersNamespace::moveToOfflinePlayerDatapadAndUnlo jboolean JNICALL ScriptMethodsContainersNamespace::isInSecureTrade(JNIEnv *env, jobject self, jlong item) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(item, itemObj)) return JNI_FALSE; @@ -807,7 +807,7 @@ void JNICALL ScriptMethodsContainersNamespace::fixLoadWith(JNIEnv *env, jobject jboolean JNICALL ScriptMethodsContainersNamespace::addUserToAccessList(JNIEnv *env, jobject self, jlong object, jlong user) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -829,7 +829,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::addUserToAccessList(JNIEnv *e jboolean JNICALL ScriptMethodsContainersNamespace::removeUserFromAccessList(JNIEnv * env, jobject self, jlong object, jlong user) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -851,7 +851,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::removeUserFromAccessList(JNIE jboolean JNICALL ScriptMethodsContainersNamespace::clearUserAccessList(JNIEnv * env, jobject self, jlong object) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -871,7 +871,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::clearUserAccessList(JNIEnv * jboolean JNICALL ScriptMethodsContainersNamespace::addGuildToAccessList(JNIEnv *env, jobject self, jlong object, jint guild) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -891,7 +891,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::addGuildToAccessList(JNIEnv * jboolean JNICALL ScriptMethodsContainersNamespace::removeGuildFromAccessList(JNIEnv * env, jobject self, jlong object, jint guild) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -911,7 +911,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::removeGuildFromAccessList(JNI jboolean JNICALL ScriptMethodsContainersNamespace::clearGuildAccessList(JNIEnv * env, jobject self, jlong object) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -931,7 +931,7 @@ jboolean JNICALL ScriptMethodsContainersNamespace::clearGuildAccessList(JNIEnv * jlongArray JNICALL ScriptMethodsContainersNamespace::getUserAccessList(JNIEnv * env, jobject self, jlong object) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; @@ -970,7 +970,7 @@ jlongArray JNICALL ScriptMethodsContainersNamespace::getUserAccessList(JNIEnv * jintArray JNICALL ScriptMethodsContainersNamespace::getGuildAccessList(JNIEnv * env, jobject self, jlong object) { - ServerObject * itemObj = NULL; + ServerObject * itemObj = nullptr; if (!JavaLibrary::getObject(object, itemObj)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp index b5d325eb..735a0d23 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp @@ -232,7 +232,7 @@ void ScriptMethodsCraftingNamespace::collectRangedIntVariableCallback(const std: * @param draftSchematic draft schematic the attribute belongs to * @param attribIndex index of the attribute * - * @return the attribute instance, or NULL on error + * @return the attribute instance, or nullptr on error */ LocalRefPtr JavaLibrary::createObjectAttribute(const ManufactureObjectInterface & manfSchematic, const DraftSchematicObject & draftSchematic, int attribIndex) @@ -291,7 +291,7 @@ LocalRefPtr JavaLibrary::createObjectAttribute(const ManufactureObjectInterface * @param manfSchematic manufacture schematic the attribute belongs to * @param attribName name of the attribute * - * @return the attribute instance, or NULL on error + * @return the attribute instance, or nullptr on error */ LocalRefPtr JavaLibrary::createExperimentAttribute(const ManufactureObjectInterface & manfSchematic, const StringId & attribName) @@ -341,7 +341,7 @@ int i; const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( source.getDraftSchematic()); - if (draft == NULL) + if (draft == nullptr) return LocalRef::cms_nullPtr; LocalRefPtr target = allocObject(ms_clsDraftSchematic); @@ -501,7 +501,7 @@ int i; // set the customization info from the shared object template const ServerObjectTemplate * objectTemplate = draft->getCraftedObjectTemplate(); - if (objectTemplate == NULL) + if (objectTemplate == nullptr) { return LocalRef::cms_nullPtr; } @@ -509,7 +509,7 @@ int i; ObjectTemplateList::fetch(objectTemplate->getSharedTemplate())); const SharedTangibleObjectTemplate * sharedTangibleTemplate = dynamic_cast< const SharedTangibleObjectTemplate *>(sharedTemplate); - if (sharedTangibleTemplate != NULL) + if (sharedTangibleTemplate != nullptr) { // New method using the AssetCustomizationManager mechanism. @@ -818,9 +818,9 @@ int i; // set the created item template crc value const ServerObjectTemplate * craftedTemplate = source.getCraftedObjectTemplate(); - if (craftedTemplate == NULL) + if (craftedTemplate == nullptr) { - WARNING(true, ("JavaLibrary::convert DraftSchematicObject got null crafted " + WARNING(true, ("JavaLibrary::convert DraftSchematicObject got nullptr crafted " "template for draft schematic %s", source.getObjectTemplateName())); return 0; } @@ -830,7 +830,7 @@ int i; const ServerDraftSchematicObjectTemplate * const sourceSchematicTemplate = safe_cast(source.getObjectTemplate()); NOT_NULL(sourceSchematicTemplate); - if (sourceSchematicTemplate == NULL) + if (sourceSchematicTemplate == nullptr) { // emergency case for release mode return 0; @@ -873,11 +873,11 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::startCraftingSession(JNIEnv *en UNREF(env); UNREF(self); - CreatureObject* playerObj = NULL; + CreatureObject* playerObj = nullptr; if (!JavaLibrary::getObject(player, playerObj)) return JNI_FALSE; - TangibleObject* stationObj = NULL; + TangibleObject* stationObj = nullptr; if (!JavaLibrary::getObject(station, stationObj)) return JNI_FALSE; @@ -894,7 +894,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::startCraftingSession(JNIEnv *en * @param self class calling this function * @param crafter the player that was crafting * @param tool the crafting tool that was being used - * @param prototype the prototype that was created (may be null) + * @param prototype the prototype that was created (may be nullptr) * * @return true on success, false on fail */ @@ -908,11 +908,11 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::endCraftingSession(JNIEnv *env, if (prototype == 0) return JNI_TRUE; - CreatureObject * crafterObj = NULL; + CreatureObject * crafterObj = nullptr; if (!JavaLibrary::getObject(crafter, crafterObj)) return JNI_FALSE; - TangibleObject * prototypeObj = NULL; + TangibleObject * prototypeObj = nullptr; if (!JavaLibrary::getObject(prototype, prototypeObj)) return JNI_FALSE; @@ -937,11 +937,11 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setCraftingLevelAndStation(JNIE { UNREF(self); - CreatureObject* creatureObject = NULL; + CreatureObject* creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject)) return JNI_FALSE; PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; if (craftingLevel >= 0 && craftingLevel <= Crafting::MAX_CRAFTING_LEVEL) @@ -949,12 +949,12 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setCraftingLevelAndStation(JNIE if (station != 0) { - const TangibleObject * stationObject = NULL; + const TangibleObject * stationObject = nullptr; const NetworkId stationId(station); if (stationId != NetworkId::cms_invalid) { stationObject = dynamic_cast(ServerWorld::findObjectByNetworkId(stationId)); - if (stationObject == NULL) + if (stationObject == nullptr) return JNI_FALSE; } playerObject->setCraftingStation(stationObject); @@ -976,11 +976,11 @@ jint JNICALL ScriptMethodsCraftingNamespace::getCraftingLevel(JNIEnv *env, jobje { UNREF(self); - const CreatureObject* creatureObject = NULL; + const CreatureObject* creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject)) return -1; const PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject == NULL) + if (playerObject == nullptr) return -1; return playerObject->getCraftingLevel(); @@ -999,11 +999,11 @@ jlong JNICALL ScriptMethodsCraftingNamespace::getCraftingStation(JNIEnv *env, jo { UNREF(self); - const CreatureObject* creatureObject = NULL; + const CreatureObject* creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject)) return 0; const PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject == NULL) + if (playerObject == nullptr) return 0; return (playerObject->getCraftingStation()).getValue(); @@ -1023,11 +1023,11 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::sendUseableDraftSchematics(JNIE { UNREF(self); - CreatureObject* creatureObject = NULL; + CreatureObject* creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject)) return JNI_FALSE; PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creatureObject); - if (playerObject == NULL) + if (playerObject == nullptr) { DEBUG_WARNING(true, ("JavaLibrary::sendUseableDraftSchematics non-player " "object %s\n", creatureObject->getNetworkId().getValueString().c_str())); @@ -1038,8 +1038,8 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::sendUseableDraftSchematics(JNIE if (count == 0) return JNI_FALSE; - jint * schematicsArray = env->GetIntArrayElements(schematics, NULL); - if (schematicsArray != NULL) + jint * schematicsArray = env->GetIntArrayElements(schematics, nullptr); + if (schematicsArray != nullptr) { std::vector schematicCrcs(schematicsArray, &schematicsArray[count]); playerObject->sendUseableDraftSchematics(schematicCrcs); @@ -1072,7 +1072,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicAttribute(JNIEnv *e if (manufacturingSchematic == 0 || attribute == 0) return JNI_FALSE; - ManufactureObjectInterface * schematic = NULL; + ManufactureObjectInterface * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1120,7 +1120,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicAttributes(JNIEnv * if (manufacturingSchematic == 0 || attributes == 0) return JNI_FALSE; - ManufactureObjectInterface * schematic = NULL; + ManufactureObjectInterface * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1169,7 +1169,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicAttributes(JNIEnv * * @param name name of the attribute to get * @param experiment flag that these are experimental attributes * - * @return the attribute, or null on error + * @return the attribute, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicAttribute(JNIEnv *env, jobject self, jlong manufacturingSchematic, jobject name, jboolean experiment) { @@ -1178,13 +1178,13 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicAttribute(JNIEnv *en if (manufacturingSchematic == 0 || name == 0) return 0; - ManufactureObjectInterface * schematic = NULL; + ManufactureObjectInterface * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return 0; const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( schematic->getDraftSchematic()); - if (draft == NULL) + if (draft == nullptr) return 0; StringId nameId; @@ -1210,7 +1210,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicAttribute(JNIEnv *en * @param names names of the attributes to get * @param experiment flag that these are experimental attributes * - * @return the attributes, or null on error + * @return the attributes, or nullptr on error */ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getSchematicAttributes(JNIEnv *env, jobject self, jlong manufacturingSchematic, jobjectArray names, jboolean experiment) { @@ -1219,13 +1219,13 @@ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getSchematicAttributes(JNIE if (manufacturingSchematic == 0) return 0; - ManufactureObjectInterface * schematic = NULL; + ManufactureObjectInterface * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return 0; const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( schematic->getDraftSchematic()); - if (draft == NULL) + if (draft == nullptr) return 0; int numAttribs = env->GetArrayLength(names); @@ -1276,7 +1276,7 @@ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getSchematicAttributes(JNIE * @param manufacturingSchematic the schematic * @param experiment flag that these are experimental attributes * - * @return the attributes, or null on error + * @return the attributes, or nullptr on error */ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getAllSchematicAttributes(JNIEnv *env, jobject self, jlong manufacturingSchematic, jboolean experiment) { @@ -1286,13 +1286,13 @@ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getAllSchematicAttributes(J if (manufacturingSchematic == 0) return 0; - ManufactureObjectInterface * schematic = NULL; + ManufactureObjectInterface * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return 0; const DraftSchematicObject * draft = DraftSchematicObject::getSchematic( schematic->getDraftSchematic()); - if (draft == NULL) + if (draft == nullptr) return 0; // set the attributes @@ -1337,7 +1337,7 @@ jobjectArray JNICALL ScriptMethodsCraftingNamespace::getAllSchematicAttributes(J * @param manufacturingSchematic the schematic to get the data from * @param attributeNames the experimental attributes we're interested about * - * @return the draft_schematic object, or null on error + * @return the draft_schematic object, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicForExperimentalAttributes(JNIEnv *env, jobject self, jlong manufacturingSchematic, jobjectArray attributeNames) { @@ -1348,13 +1348,13 @@ int i; if (manufacturingSchematic == 0 || attributeNames == 0) return 0; - const ManufactureObjectInterface * manfSchematic = NULL; + const ManufactureObjectInterface * manfSchematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, manfSchematic)) return 0; const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic( manfSchematic->getDraftSchematic()); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) return 0; // create a draft_schematic object to return @@ -1481,7 +1481,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicExperimentMod(JNIEn { UNREF(self); - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1510,7 +1510,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicAppearances(JNIEnv if (manufacturingSchematic == 0 || appearances == 0) return JNI_FALSE; - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1550,7 +1550,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicCustomizations(JNIE if (manufacturingSchematic == 0 || customizations == 0) return JNI_FALSE; - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1596,7 +1596,7 @@ jint JNICALL ScriptMethodsCraftingNamespace::getSchematicItemCount(JNIEnv *env, if (manufacturingSchematic == 0) return -1; - const ManufactureSchematicObject * schematic = NULL; + const ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return -1; @@ -1622,7 +1622,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicItemCount(JNIEnv *e if (manufacturingSchematic == 0) return JNI_FALSE; - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1649,7 +1649,7 @@ jint JNICALL ScriptMethodsCraftingNamespace::getSchematicItemsPerContainer(JNIEn if (manufacturingSchematic == 0) return -1; - const ManufactureSchematicObject * schematic = NULL; + const ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return -1; @@ -1676,7 +1676,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicItemsPerContainer(J if (manufacturingSchematic == 0) return JNI_FALSE; - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1703,7 +1703,7 @@ jfloat JNICALL ScriptMethodsCraftingNamespace::getSchematicManufactureTime(JNIEn if (manufacturingSchematic == 0) return -1.0f; - const ManufactureSchematicObject * schematic = NULL; + const ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return -1.0f; @@ -1730,7 +1730,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSchematicManufactureTime(JNI if (manufacturingSchematic == 0) return JNI_FALSE; - ManufactureSchematicObject * schematic = NULL; + ManufactureSchematicObject * schematic = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematic)) return JNI_FALSE; @@ -1754,7 +1754,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setCreatorXp(JNIEnv *env, jobje { UNREF(self); - TangibleObject * target = NULL; + TangibleObject * target = nullptr; if (!JavaLibrary::getObject(object, target)) return JNI_FALSE; @@ -1778,7 +1778,7 @@ void JNICALL ScriptMethodsCraftingNamespace::getIngredientsForManufactureStation if (station == 0 || ingredients == 0) return; - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return; @@ -1786,7 +1786,7 @@ void JNICALL ScriptMethodsCraftingNamespace::getIngredientsForManufactureStation return; const ManufactureSchematicObject * const schematic = manfStation->getSchematic(); - if (schematic == NULL) + if (schematic == nullptr) return; static ManufactureSchematicObject::IngredientInfoVector iiv; @@ -1841,7 +1841,7 @@ void JNICALL ScriptMethodsCraftingNamespace::getIngredientsForManufactureStation * @param self class calling this function * @param station the station id * - * @return the hopper id, or null on error + * @return the hopper id, or nullptr on error */ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationInputHopper(JNIEnv *env, jobject self, jlong station) { @@ -1850,12 +1850,12 @@ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationInputHopper(J if (station == 0) return 0; - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return 0; ServerObject * hopper = manfStation->getInputHopper(); - if (hopper == NULL) + if (hopper == nullptr) return 0; return (hopper->getNetworkId()).getValue(); @@ -1870,7 +1870,7 @@ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationInputHopper(J * @param self class calling this function * @param station the station id * - * @return the hopper id, or null on error + * @return the hopper id, or nullptr on error */ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationOutputHopper(JNIEnv *env, jobject self, jlong station) { @@ -1879,12 +1879,12 @@ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationOutputHopper( if (station == 0) return 0; - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return 0; ServerObject * hopper = manfStation->getOutputHopper(); - if (hopper == NULL) + if (hopper == nullptr) return 0; return (hopper->getNetworkId()).getValue(); @@ -1899,7 +1899,7 @@ jlong JNICALL ScriptMethodsCraftingNamespace::getManufactureStationOutputHopper( * @param self class calling this function * @param station the station id * - * @return a string of the form "*" , or null if the station has no schematic + * @return a string of the form "*" , or nullptr if the station has no schematic */ jstring JNICALL ScriptMethodsCraftingNamespace::getManufactureStationSchematic(JNIEnv *env, jobject self, jlong station) { @@ -1907,12 +1907,12 @@ jstring JNICALL ScriptMethodsCraftingNamespace::getManufactureStationSchematic(J UNREF(self); - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return 0; const ManufactureSchematicObject * manfSchematic = manfStation->getSchematic(); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) return 0; return JavaString( @@ -1943,11 +1943,11 @@ void JNICALL ScriptMethodsCraftingNamespace::getValidManufactureSchematicsForSta if (player == 0 || station == 0 || schematics == 0) return; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return; - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return; @@ -1997,11 +1997,11 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::hasValidManufactureSchematicsFo if (player == 0 || station == 0) return JNI_FALSE; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return JNI_FALSE; - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return JNI_FALSE; @@ -2030,24 +2030,24 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::transferManufactureSchematicToP { UNREF(self); - const ManufactureInstallationObject * manfStation = NULL; + const ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return JNI_FALSE; ManufactureSchematicObject * schematic = manfStation->getSchematic(); - if (schematic == NULL) + if (schematic == nullptr) return JNI_TRUE; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return JNI_FALSE; ServerObject * datapad = playerCreature->getDatapad(); - if (datapad == NULL) + if (datapad == nullptr) return JNI_FALSE; Container::ContainerErrorCode tmp = Container::CEC_Success; - if (ContainerInterface::transferItemToVolumeContainer(*datapad, *schematic, NULL, tmp)) + if (ContainerInterface::transferItemToVolumeContainer(*datapad, *schematic, nullptr, tmp)) return JNI_TRUE; return JNI_FALSE; } // JavaLibrary::transferManufactureSchematicToPlayer @@ -2068,15 +2068,15 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::transferManufactureSchematicToS { UNREF(self); - ManufactureSchematicObject * manfSchematic = NULL; + ManufactureSchematicObject * manfSchematic = nullptr; if (!JavaLibrary::getObject(schematic, manfSchematic)) return JNI_FALSE; - ManufactureInstallationObject * manfStation = NULL; + ManufactureInstallationObject * manfStation = nullptr; if (!JavaLibrary::getObject(station, manfStation)) return JNI_FALSE; - if (manfStation->addSchematic(*manfSchematic, NULL)) + if (manfStation->addSchematic(*manfSchematic, nullptr)) return JNI_TRUE; return JNI_FALSE; } // JavaLibrary::transferManufactureSchematicToStation @@ -2099,11 +2099,11 @@ void JNICALL ScriptMethodsCraftingNamespace::getRepairableObjectsForTool(JNIEnv if (player == 0 || tool == 0 || objects == 0) return; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return; - const TangibleObject * toolObject = NULL; + const TangibleObject * toolObject = nullptr; if (!JavaLibrary::getObject(tool, toolObject)) return; if (!toolObject->isRepairTool()) @@ -2123,11 +2123,11 @@ void JNICALL ScriptMethodsCraftingNamespace::getRepairableObjectsForTool(JNIEnv // objects const ServerObject * inventory = playerCreature->getInventory(); - if (inventory == NULL) + if (inventory == nullptr) return; const VolumeContainer * inventoryContainer = ContainerInterface::getVolumeContainer(*inventory); - if (inventoryContainer == NULL) + if (inventoryContainer == nullptr) return; std::vector objList; @@ -2136,7 +2136,7 @@ void JNICALL ScriptMethodsCraftingNamespace::getRepairableObjectsForTool(JNIEnv { const CachedNetworkId & objId = (*iter); const TangibleObject * obj = safe_cast(objId.getObject()); - if (obj != NULL && !obj->isCraftingTool() && !obj->isRepairTool() && + if (obj != nullptr && !obj->isCraftingTool() && !obj->isRepairTool() && obj->getDamageTaken() > 0) { if ((genericTool && (toolType & obj->getGameObjectType()) != 0) || @@ -2172,22 +2172,22 @@ void JNICALL ScriptMethodsCraftingNamespace::getRepairableObjectsForTool(JNIEnv * @param self class calling this function * @param target the object * - * @return an array with the bonus for each attribute, or null on error + * @return an array with the bonus for each attribute, or nullptr on error */ jintArray JNICALL ScriptMethodsCraftingNamespace::getAttributeBonuses(JNIEnv *env, jobject self, jlong target) { UNREF(self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; std::vector > bonuses; - if (object->asTangibleObject() != NULL) + if (object->asTangibleObject() != nullptr) { object->asTangibleObject()->getAttribBonuses(bonuses); } - else if (object->asManufactureSchematicObject() != NULL) + else if (object->asManufactureSchematicObject() != nullptr) { object->asManufactureSchematicObject()->getAttribBonuses(bonuses); } @@ -2235,16 +2235,16 @@ jint JNICALL ScriptMethodsCraftingNamespace::getAttributeBonus(JNIEnv *env, jobj if (attribute < 0 || attribute >= Attributes::NumberOfAttributes) return 0; - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; jint bonus = 0; - if (object->asTangibleObject() != NULL) + if (object->asTangibleObject() != nullptr) { bonus = object->asTangibleObject()->getAttribBonus(attribute); } - else if (object->asManufactureSchematicObject() != NULL) + else if (object->asManufactureSchematicObject() != nullptr) { bonus = object->asManufactureSchematicObject()->getAttribBonus(attribute); } @@ -2271,15 +2271,15 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setAttributeBonus(JNIEnv *env, if (attribute < 0 || attribute >= Attributes::NumberOfAttributes) return JNI_FALSE; - ServerObject * object = NULL; + ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; - if (object->asTangibleObject() != NULL) + if (object->asTangibleObject() != nullptr) { object->asTangibleObject()->setAttribBonus(attribute, bonus); } - else if (object->asManufactureSchematicObject() != NULL) + else if (object->asManufactureSchematicObject() != nullptr) { object->asManufactureSchematicObject()->setAttribBonus(attribute, bonus); } @@ -2307,7 +2307,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setAttributeBonuses(JNIEnv *env if (bonuses == 0) return JNI_FALSE; - ServerObject * object = NULL; + ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2322,13 +2322,13 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setAttributeBonuses(JNIEnv *env jint buffer[Attributes::NumberOfAttributes]; env->GetIntArrayRegion(bonuses, 0, count, buffer); - if (object->asTangibleObject() != NULL) + if (object->asTangibleObject() != nullptr) { TangibleObject * tangibleObject = object->asTangibleObject(); for (jsize i = 0; i < count; ++i) tangibleObject->setAttribBonus(i, buffer[i]); } - else if (object->asManufactureSchematicObject() != NULL) + else if (object->asManufactureSchematicObject() != nullptr) { ManufactureSchematicObject * manufactureSchematicObject = object->asManufactureSchematicObject(); for (jsize i = 0; i < count; ++i) @@ -2349,13 +2349,13 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setAttributeBonuses(JNIEnv *env * @param self class calling this function * @param target the object * - * @return a dictionary of skill mod names -> mod values, or null on error + * @return a dictionary of skill mod names -> mod values, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getSkillModBonuses(JNIEnv *env, jobject self, jlong target) { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -2393,7 +2393,7 @@ jint JNICALL ScriptMethodsCraftingNamespace::getSkillModBonus(JNIEnv *env, jobje JavaStringParam jskillMod(skillMod); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -2423,7 +2423,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSkillModBonus(JNIEnv *env, j JavaStringParam jskillMod(skillMod); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2452,7 +2452,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSkillModBonuses(JNIEnv *env, { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2469,7 +2469,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSkillModBonuses(JNIEnv *env, } std::string skillName; - const jint * bonusArray = env->GetIntArrayElements(bonus, NULL); + const jint * bonusArray = env->GetIntArrayElements(bonus, nullptr); for (int i = 0; i < skillModCount; ++i) { JavaStringParam jskillName(static_cast(env->GetObjectArrayElement(skillMod, i))); @@ -2505,7 +2505,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setCategorizedSkillModBonus(JNI JavaStringParam jcategory(category); JavaStringParam jskillMod(skillMod); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2540,7 +2540,7 @@ void JNICALL ScriptMethodsCraftingNamespace::removeCategorizedSkillModBonuses(JN JavaStringParam jcategory(category); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return; @@ -2566,7 +2566,7 @@ jint JNICALL ScriptMethodsCraftingNamespace::getSkillModSockets(JNIEnv *env, job { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -2589,7 +2589,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSkillModSockets(JNIEnv *env, { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2610,7 +2610,7 @@ jboolean JNICALL ScriptMethodsCraftingNamespace::setSkillModSockets(JNIEnv *env, * @param qualityPercent % stat adjustment * @param container the container to create the item in * - * @return the item, or null on error + * @return the item, or nullptr on error */ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobject self, jstring draftSchematic, jfloat qualityPercent, jlong container) { @@ -2618,7 +2618,7 @@ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobje if (draftSchematic == 0 || container == 0) { - WARNING(true, ("[script bug] null schematic or container passed to " + WARNING(true, ("[script bug] nullptr schematic or container passed to " "makeCraftedItem")); return 0; } @@ -2634,21 +2634,21 @@ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobje const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( draftSchematicName); - if (schematic == NULL) + if (schematic == nullptr) { WARNING(true, ("[script bug] bad schematic name %s passed to " "makeCraftedItem", draftSchematicName.c_str())); return 0; } - ServerObject * target = NULL; + ServerObject * target = nullptr; if (!JavaLibrary::getObject(container, target)) { WARNING(true, ("[script bug] bad container id passed to makeCraftedItem")); return 0; } Object * targetParent = ContainerInterface::getFirstParentInWorld(*target); - if (targetParent == NULL) + if (targetParent == nullptr) { WARNING(true, ("JavaLibrary::makeCraftedItem can't find parent in world " "for container %s", target->getNetworkId().getValueString().c_str())); @@ -2660,14 +2660,14 @@ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobje // create a manf schematic and prototype ManufactureSchematicObject * manfSchematic = ServerWorld::createNewManufacturingSchematic( *schematic, createPos, false); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) { WARNING(true, ("JavaLibrary::makeCraftedItem: error creating manf " "schematic!")); return 0; } ServerObject * prototype = manfSchematic->manufactureObject(createPos); - if (prototype == NULL) + if (prototype == nullptr) { WARNING(true, ("JavaLibrary::makeCraftedItem: error creating " "prototype!")); @@ -2690,7 +2690,7 @@ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobje manfSchematic->permanentlyDestroy(DeleteReasons::Consumed); Container::ContainerErrorCode error; if (!ContainerInterface::transferItemToVolumeContainer (*target, *prototype, - NULL, error, true)) + nullptr, error, true)) { WARNING(true, ("JavaLibrary::makeCraftedItem: error can't store prototype " "in container, error = %d", error)); @@ -2711,14 +2711,14 @@ jlong JNICALL ScriptMethodsCraftingNamespace::makeCraftedItem(JNIEnv *env, jobje * @param self class calling this function * @param manufacturingSchematic the schematic to get the data from * - * @return the draft_schematic object, or null on error + * @return the draft_schematic object, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicData(JNIEnv *env, jobject self, jlong manufacturingSchematic) { if (manufacturingSchematic == 0) return 0; - const ManufactureSchematicObject * schematicObject = NULL; + const ManufactureSchematicObject * schematicObject = nullptr; if (!JavaLibrary::getObject(manufacturingSchematic, schematicObject)) return 0; @@ -2735,7 +2735,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getSchematicData(JNIEnv *env, jo * @param self class calling this function * @param draftSchematic the schematic to get the data from * - * @return the draft_schematic object, or null on error + * @return the draft_schematic object, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicData(JNIEnv *env, jobject self, jstring draftSchematic) @@ -2749,7 +2749,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicData(JNIEnv *en return 0; const DraftSchematicObject * schematicObject = DraftSchematicObject::getSchematic(schematicName); - if (schematicObject == NULL) + if (schematicObject == nullptr) return 0; return JavaLibrary::convert(*schematicObject); @@ -2765,7 +2765,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicData(JNIEnv *en * @param self class calling this function * @param draftSchematicCrc the schematic to get the data from * - * @return the draft_schematic object, or null on error + * @return the draft_schematic object, or nullptr on error */ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicDataCrc(JNIEnv *env, jobject self, jint draftSchematicCrc) @@ -2774,7 +2774,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicDataCrc(JNIEnv return 0; const DraftSchematicObject * schematicObject = DraftSchematicObject::getSchematic(draftSchematicCrc); - if (schematicObject == NULL) + if (schematicObject == nullptr) return 0; return JavaLibrary::convert(*schematicObject); @@ -2794,7 +2794,7 @@ jobject JNICALL ScriptMethodsCraftingNamespace::getDraftSchematicDataCrc(JNIEnv */ void JNICALL ScriptMethodsCraftingNamespace::recomputeCrateAttributes(JNIEnv *env, jobject self, jlong crate) { - FactoryObject * factory = NULL; + FactoryObject * factory = nullptr; if (!JavaLibrary::getObject(crate, factory)) return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsDebug.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsDebug.cpp index 9946fc28..6769ff57 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsDebug.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsDebug.cpp @@ -188,7 +188,7 @@ void JNICALL ScriptMethodsDebugNamespace::debugServerConsoleMsg(JNIEnv *env, job ServerObject * object = 0; JavaLibrary::getObject(objId, object); - if (object == NULL) + if (object == nullptr) { DEBUG_REPORT_LOG(true, ("debugServerConsoleMsg from : %s\n", msgString.c_str())); @@ -212,8 +212,8 @@ void JNICALL ScriptMethodsDebugNamespace::debugServerConsoleMsg(JNIEnv *env, job * @param channel the channel to log to * @param msg the message to log * @param logger id of the object where the log is coming from - * @param player1 the 1st player for the message (may be null) - * @param player2 the 2nd player for the message (may be null) + * @param player1 the 1st player for the message (may be nullptr) + * @param player2 the 2nd player for the message (may be nullptr) * @param alwaysLog flag to ignore the disableScriptLogs flag and always log this message */ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring channel, jstring msg, jlong logger, jlong player1, jlong player2, jboolean alwaysLog) @@ -222,7 +222,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring if (channel == 0 || msg == 0) { - JavaLibrary::throwInternalScriptError("[designer bug] JavaLibrary::log called with null channel or message"); + JavaLibrary::throwInternalScriptError("[designer bug] JavaLibrary::log called with nullptr channel or message"); return; } @@ -248,7 +248,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring if (player1 != 0) { - const ServerObject * playerObject = NULL; + const ServerObject * playerObject = nullptr; if (JavaLibrary::getObject(player1, playerObject)) { std::string::size_type p = msgStr.find("%TU"); @@ -264,7 +264,7 @@ void JNICALL ScriptMethodsDebugNamespace::log(JNIEnv *env, jobject self, jstring if (player2 != 0) { - const ServerObject * playerObject = NULL; + const ServerObject * playerObject = nullptr; if (JavaLibrary::getObject(player2, playerObject)) { std::string::size_type p = msgStr.find("%TT"); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsDynamicVariable.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsDynamicVariable.cpp index dbf13ac0..effd5bed 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsDynamicVariable.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsDynamicVariable.cpp @@ -39,7 +39,7 @@ namespace NonAuthObjvarNamespace if (!ConfigServerGame::getTrackNonAuthoritativeObjvarSets()) return; - if (name == NULL || *name == '\0') + if (name == nullptr || *name == '\0') return; if (obj.isAuthoritative()) return; @@ -504,13 +504,13 @@ LocalRefPtr ScriptMethodsDynamicVariableNamespace::convertDynamicVariableListToO * @param buffer a buffer to be filled in with the converted C name * @param bufferSize the length of buffer * - * @return the ServerObject * for the obj_id, or null on error + * @return the ServerObject * for the obj_id, or nullptr on error */ ServerObject * ScriptMethodsDynamicVariableNamespace::getObjectAndName(JNIEnv *env, jlong objId, jstring name, char * buffer, size_t bufferSize) { NOT_NULL(buffer); - ServerObject * object = NULL; + ServerObject * object = nullptr; JavaStringParam localName(name); if (localName.fillBuffer(buffer, bufferSize) > 1) { @@ -523,7 +523,7 @@ ServerObject * ScriptMethodsDynamicVariableNamespace::getObjectAndName(JNIEnv *e { fprintf(stderr, "WARNING: Could not get objvar name\n"); } - if (object == NULL && !ConfigServerGame::getDisableObjvarNullCheck()) + if (object == nullptr && !ConfigServerGame::getDisableObjvarNullCheck()) JavaLibrary::printJavaStack(); return object; @@ -540,15 +540,15 @@ ServerObject * ScriptMethodsDynamicVariableNamespace::getObjectAndName(JNIEnv *e * @param buffer a buffer to be filled in with the converted C name * @param bufferSize the length of buffer * - * @return the DynamicVariableList * for the obj_id, or null on error + * @return the DynamicVariableList * for the obj_id, or nullptr on error */ const DynamicVariableList * ScriptMethodsDynamicVariableNamespace::getObjvarsAndName(JNIEnv *env, jlong objId, jstring name, char * buffer, size_t bufferSize) { NOT_NULL(buffer); - const DynamicVariableList * objvars = NULL; + const DynamicVariableList * objvars = nullptr; const ServerObject * object = getObjectAndName(env, objId, name, buffer, bufferSize); - if (object != NULL) + if (object != nullptr) { testIsSafeToReadObjvar(*object, buffer); objvars = &object->getObjVars(); @@ -582,7 +582,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getDynamicVariable(JNIEnv char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvars = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvars == NULL) + if (objvars == nullptr) return 0; const std::string objvarName(buffer); @@ -751,7 +751,7 @@ jint JNICALL ScriptMethodsDynamicVariableNamespace::getIntDynamicVariable(JNIEnv char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; int localValue=0; @@ -781,7 +781,7 @@ jintArray JNICALL ScriptMethodsDynamicVariableNamespace::getIntArrayDynamicVaria char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -816,7 +816,7 @@ jfloat JNICALL ScriptMethodsDynamicVariableNamespace::getFloatDynamicVariable(JN char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; float localValue = 0; @@ -846,7 +846,7 @@ jfloatArray JNICALL ScriptMethodsDynamicVariableNamespace::getFloatArrayDynamicV char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -878,7 +878,7 @@ jstring JNICALL ScriptMethodsDynamicVariableNamespace::getStringDynamicVariable( char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; Unicode::String value; @@ -908,7 +908,7 @@ jobjectArray JNICALL ScriptMethodsDynamicVariableNamespace::getStringArrayDynami char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -944,7 +944,7 @@ jlong JNICALL ScriptMethodsDynamicVariableNamespace::getObjIdDynamicVariable(JNI char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; NetworkId localValue; @@ -972,7 +972,7 @@ jlongArray JNICALL ScriptMethodsDynamicVariableNamespace::getObjIdArrayDynamicVa char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList *objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -1013,7 +1013,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getLocationDynamicVariabl char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; DynamicVariableLocationData value; @@ -1046,7 +1046,7 @@ jobjectArray JNICALL ScriptMethodsDynamicVariableNamespace::getLocationArrayDyna char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -1092,7 +1092,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getStringIdDynamicVariabl char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; StringId value; @@ -1125,7 +1125,7 @@ jobjectArray JNICALL ScriptMethodsDynamicVariableNamespace::getStringIdArrayDyna char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -1168,7 +1168,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getTransformDynamicVariab char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; Transform value; @@ -1201,7 +1201,7 @@ jobjectArray JNICALL ScriptMethodsDynamicVariableNamespace::getTransformArrayDyn char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -1244,7 +1244,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getVectorDynamicVariable( char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; Vector value; @@ -1277,7 +1277,7 @@ jobjectArray JNICALL ScriptMethodsDynamicVariableNamespace::getVectorArrayDynami char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const DynamicVariableList * objvarList = getObjvarsAndName(env, objId, name, buffer, sizeof(buffer)); - if (objvarList == NULL) + if (objvarList == nullptr) return 0; std::vector value; @@ -1320,7 +1320,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getDynamicVariableList(JN JavaStringParam localName(name); - const ServerObject* object = NULL; + const ServerObject* object = nullptr; if (!JavaLibrary::getObject(objId, object)) return 0; @@ -1342,7 +1342,7 @@ jobject JNICALL ScriptMethodsDynamicVariableNamespace::getDynamicVariableList(JN } } - if (result.get() == NULL) + if (result.get() == nullptr) return 0; return result->getReturnValue(); } // JavaLibrary::getDynamicVariableList @@ -1364,7 +1364,7 @@ void JNICALL ScriptMethodsDynamicVariableNamespace::removeDynamicVariable(JNIEnv char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return; object->removeObjVarItem(buffer); @@ -1384,7 +1384,7 @@ void JNICALL ScriptMethodsDynamicVariableNamespace::removeAllDynamicVariables(JN if (objId == 0) return; - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(objId, object)) return; @@ -1410,7 +1410,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::hasDynamicVariable(JNIEn char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; const ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return 0; const DynamicVariableList &objvarList = object->getObjVars(); @@ -1441,11 +1441,11 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setDynamicVariable(JNIEn char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; const DynamicVariableList *objvarList = &(object->getObjVars()); - if (objvarList == NULL) + if (objvarList == nullptr) return JNI_FALSE; // determine what type the data is @@ -1454,9 +1454,9 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setDynamicVariable(JNIEn { // name is the name of an objvar list we will add data to DynamicVariable *objvar = objvarList->getItemByName(localName); - if (objvar == NULL) + if (objvar == nullptr) objvar = objvarList->addNestedList(localName); - if (objvar != NULL && objvar->getType() == DynamicVariable::LIST) + if (objvar != nullptr && objvar->getType() == DynamicVariable::LIST) return updateDynamicVariableList(env, *dynamic_cast(objvar), data); return JNI_FALSE; } @@ -1474,7 +1474,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setDynamicVariable(JNIEn } else if (env->IsInstanceOf(data, ms_clsString) == JNI_TRUE) { - if (objvarList->setItem(localName, Unicode::String(env->GetStringChars(static_cast(data), NULL)))) + if (objvarList->setItem(localName, Unicode::String(env->GetStringChars(static_cast(data), nullptr)))) #error must release characters return JNI_TRUE; return JNI_FALSE; @@ -1503,7 +1503,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setIntDynamicVariable(JN char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; addSetObjvar(*object, buffer); @@ -1531,7 +1531,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setIntArrayDynamicVariab char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; size_t size = env->GetArrayLength(value); @@ -1574,7 +1574,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setFloatDynamicVariable( char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; addSetObjvar(*object, buffer); @@ -1602,7 +1602,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setFloatArrayDynamicVari char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; size_t size = env->GetArrayLength(value); @@ -1645,7 +1645,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setStringDynamicVariable if (name == 0) { - DEBUG_WARNING(true, ("NULL name passed from script to JavaLibrary::setStringDynamicValue")); + DEBUG_WARNING(true, ("nullptr name passed from script to JavaLibrary::setStringDynamicValue")); return JNI_FALSE; } @@ -1653,17 +1653,17 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setStringDynamicVariable char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; if (value == 0) { - DEBUG_WARNING(true, ("NULL string passed from script to JavaLibrary::setStringDynamicValue (%s)",buffer)); + DEBUG_WARNING(true, ("nullptr string passed from script to JavaLibrary::setStringDynamicValue (%s)",buffer)); return JNI_FALSE; } const DynamicVariableList *objvarList = &(object->getObjVars()); - if (objvarList == NULL) + if (objvarList == nullptr) return JNI_FALSE; Unicode::String valueString; @@ -1698,7 +1698,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setStringArrayDynamicVar char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -1754,7 +1754,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setObjIdDynamicVariable( char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; NetworkId oidValue(static_cast @@ -1785,7 +1785,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setObjIdArrayDynamicVari char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -1838,7 +1838,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setLocationDynamicVariab char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; DynamicVariableLocationData locValue; @@ -1878,7 +1878,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setLocationArrayDynamicV char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -1942,7 +1942,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setStringIdDynamicVariab char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; StringId locValue; @@ -1977,7 +1977,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setStringIdArrayDynamicV char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -2033,7 +2033,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setTransformDynamicVaria char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; Transform locValue; @@ -2068,7 +2068,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setTransformArrayDynamic char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -2120,7 +2120,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setVectorDynamicVariable char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; Vector locValue; @@ -2155,7 +2155,7 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::setVectorArrayDynamicVar char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; ServerObject * object = getObjectAndName(env, objId, name, buffer, sizeof(buffer)); - if (object == NULL) + if (object == nullptr) return JNI_FALSE; std::vector valueArray; @@ -2227,10 +2227,10 @@ jboolean JNICALL ScriptMethodsDynamicVariableNamespace::copyDynamicVariable(JNIE return JNI_TRUE; ServerObject* fromObject = dynamic_cast(from.getObject()); - if (fromObject == NULL) + if (fromObject == nullptr) return JNI_FALSE; ServerObject* toObject = dynamic_cast(to.getObject()); - if (toObject == NULL) + if (toObject == nullptr) return JNI_FALSE; char buffer[DynamicVariable::MAX_DYNAMIC_VARIABLE_NAME_LEN]; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsForm.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsForm.cpp index 3ca7c226..3247b76e 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsForm.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsForm.cpp @@ -48,7 +48,7 @@ const JNINativeMethod NATIVES[] = { jboolean JNICALL ScriptMethodsFormNamespace::editFormData(JNIEnv * env, jobject self, jlong player, jlong jObjectToEdit, jobjectArray jKeys, jobjectArray jValues) { UNREF(self); - ServerObject * playerServerObject = NULL; + ServerObject * playerServerObject = nullptr; if (!JavaLibrary::getObject(player, playerServerObject) || !playerServerObject) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] can't get player in editFormData")); @@ -62,7 +62,7 @@ jboolean JNICALL ScriptMethodsFormNamespace::editFormData(JNIEnv * env, jobject return JNI_FALSE; } - ServerObject * objectToEditServerObject = NULL; + ServerObject * objectToEditServerObject = nullptr; if (!JavaLibrary::getObject(jObjectToEdit, objectToEditServerObject) || !objectToEditServerObject) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] objectToEdit is not a ServerObject in editFormData")); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsHateList.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsHateList.cpp index 324d719e..758d57e9 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsHateList.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsHateList.cpp @@ -90,7 +90,7 @@ void JNICALL ScriptMethodsHateListNamespace::setAggroImmuneDuration(JNIEnv * /*e NetworkId const playerNetworkId(player); PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(playerNetworkId)); - if (playerObject == NULL) + if (playerObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::setAggroImmuneDuration() player(%s) Unable to resolve the object to a PlayerObject.", playerNetworkId.getValueString().c_str())); return; @@ -105,7 +105,7 @@ jboolean JNICALL ScriptMethodsHateListNamespace::isAggroImmune(JNIEnv * /*env*/, NetworkId const playerNetworkId(player); PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(playerNetworkId)); - if (playerObject == NULL) + if (playerObject == nullptr) { return JNI_FALSE; } @@ -120,7 +120,7 @@ void JNICALL ScriptMethodsHateListNamespace::addHate(JNIEnv * /*env*/, jobject / NetworkId const hateTargetNetworkId(hateTarget); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::addHate() object(%s) hateTarget(%s) hate(%.2f) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str(), hate)); return; @@ -148,7 +148,7 @@ void JNICALL ScriptMethodsHateListNamespace::addHateDot(JNIEnv * /*env*/, jobjec NetworkId const hateTargetNetworkId(hateTarget); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::addHateDot() object(%s) hateTarget(%s) hate(%.2f) seconds(%d) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str(), hate, seconds)); return; @@ -178,7 +178,7 @@ void JNICALL ScriptMethodsHateListNamespace::setHate(JNIEnv * /*env*/, jobject / NetworkId const hateTargetNetworkId(hateTarget); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { WARNING(true, ("ScriptMethodsHateList::setHate() object(%s) hateTarget(%s) hate(%.2f) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str(), hate)); return; @@ -208,7 +208,7 @@ void JNICALL ScriptMethodsHateListNamespace::removeHateTarget(JNIEnv * /*env*/, NetworkId const hateTargetNetworkId(hateTarget); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { WARNING(true, ("ScriptMethodsHateList::removeHateTarget() object(%s) hateTarget(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str())); return; @@ -238,7 +238,7 @@ jfloat JNICALL ScriptMethodsHateListNamespace::getHate(JNIEnv * /*env*/, jobject NetworkId const hateTargetNetworkId(hateTarget); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::getHate() object(%s) hateTarget(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str())); return 0.0f; @@ -264,7 +264,7 @@ jfloat JNICALL ScriptMethodsHateListNamespace::getMaxHate(JNIEnv * /*env*/, jobj NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::getMaxHate() object(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str())); return 0.0f; @@ -281,7 +281,7 @@ void JNICALL ScriptMethodsHateListNamespace::clearHateList(JNIEnv * /*env*/, job NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::clearHateList() Unable to resolve the object(%s) to a TangibleObject.", networkId.getValueString().c_str())); return; @@ -298,7 +298,7 @@ jlong JNICALL ScriptMethodsHateListNamespace::getHateTarget(JNIEnv * /*env*/, jo NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::getHateTarget() Unable to resolve the object(%s) to a TangibleObject.", networkId.getValueString().c_str())); return 0; @@ -317,7 +317,7 @@ jlongArray JNICALL ScriptMethodsHateListNamespace::getHateList(JNIEnv * /*env*/, LOGC(AiLogManager::isLogging(networkId), "debug_ai", ("ScriptMethodsHateList::getHateList() object(%s)", networkId.getValueString().c_str())); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::getHateList() Unable to resolve the object(%s) to a TangibleObject.", networkId.getValueString().c_str())); return 0; @@ -348,7 +348,7 @@ jboolean JNICALL ScriptMethodsHateListNamespace::isOnHateList(JNIEnv * /*env*/, NetworkId const targetNetworkId(target); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::isOnHateList() object(%s) target(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), targetNetworkId.getValueString().c_str())); return JNI_FALSE; @@ -369,7 +369,7 @@ void JNICALL ScriptMethodsHateListNamespace::resetHateTimer(JNIEnv * /*env*/, jo NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::resetHateTimer() object(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str())); return; @@ -385,7 +385,7 @@ void JNICALL ScriptMethodsHateListNamespace::setAILeashTime(JNIEnv * /*env*/, jo NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::setAILeashTime() object(%s) time(%.2f) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), time)); return; @@ -408,7 +408,7 @@ jfloat JNICALL ScriptMethodsHateListNamespace::getAILeashTime(JNIEnv * /*env*/, NetworkId const networkId(object); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsHateList::setAILeashTime() object(%s) time(%.2f) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), time)); return 0.0; @@ -434,7 +434,7 @@ void JNICALL ScriptMethodsHateListNamespace::forceHateTarget(JNIEnv * env, jobje NetworkId const hateTargetNetworkId(target); TangibleObject * const objectTangibleObject = TangibleObject::getTangibleObject(networkId); - if (objectTangibleObject == NULL) + if (objectTangibleObject == nullptr) { WARNING(true, ("ScriptMethodsHateList::forceHateTarget() object(%s) hateTarget(%s) Unable to resolve the object to a TangibleObject.", networkId.getValueString().c_str(), hateTargetNetworkId.getValueString().c_str())); return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsHolocube.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsHolocube.cpp index 51088b13..31a83e7c 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsHolocube.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsHolocube.cpp @@ -47,7 +47,7 @@ jboolean JNICALL ScriptMethodsHolocubeNamespace::openHolocronToPage(JNIEnv *env, { JavaStringParam localPage(jpage); - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) { WARNING (true, ("[Script bug] Could not get ServerObject for value passed in for paramter:client in JavaLibrary::openHolocronToPage")); @@ -76,7 +76,7 @@ jboolean JNICALL ScriptMethodsHolocubeNamespace::openHolocronToPage(JNIEnv *env, jboolean JNICALL ScriptMethodsHolocubeNamespace::closeHolocron(JNIEnv *env, jobject self, jlong client) { - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) { WARNING (true, ("[Script bug] Could not get ServerObject for value passed in for paramter:client in JavaLibrary::closeHolocron")); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsHyperspace.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsHyperspace.cpp index 665f9460..784a2717 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsHyperspace.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsHyperspace.cpp @@ -131,10 +131,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToLocation(JNIEnv // Make sure the ship is not docking - Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL; - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; + Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; - if ( (shipController != NULL) + if ( (shipController != nullptr) && shipController->isDocking()) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToLocation - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str())); @@ -211,10 +211,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToLocationCellNam // Make sure the ship is not docking - Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL; - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; + Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; - if ( (shipController != NULL) + if ( (shipController != nullptr) && shipController->isDocking()) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToLocation - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str())); @@ -272,7 +272,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToHyperspacePoint return; } - CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL; + CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr; if(!playerCreature) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature")); @@ -309,10 +309,10 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePlayerToHyperspacePoint // Make sure the ship is not docking - Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL; - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; + Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; - if ( (shipController != NULL) + if ( (shipController != nullptr) && shipController->isDocking()) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - Hyperspacing is not allowed on ships that are currently docking: %s", shipObject->getDebugInformation().c_str())); @@ -395,7 +395,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePrepareShipOnClient(JNI return; } - CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL; + CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr; if(playerCreature == 0) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature")); @@ -425,8 +425,8 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspacePrepareShipOnClient(JNI if (HyperspaceManager::getHyperspacePoint(hyperspacePoint, location)) { - Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL; - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; + Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; if (shipController != 0) { @@ -467,7 +467,7 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspaceRestoreShipOnClientFrom return; } - CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : NULL; + CreatureObject * const playerCreature = playerObject ? playerObject->asCreatureObject() : nullptr; if(playerCreature == 0) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("hyperspacePlayerToHyperspacePoint - player is not a creature")); @@ -482,8 +482,8 @@ void JNICALL ScriptMethodsHyperspaceNamespace::hyperspaceRestoreShipOnClientFrom return; } - Controller const * const controller = (shipObject != NULL) ? shipObject->getController() : NULL; - ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL; + Controller const * const controller = (shipObject != nullptr) ? shipObject->getController() : nullptr; + ShipController const * const shipController = (controller != nullptr) ? controller->asShipController() : nullptr; if (shipController != 0) { @@ -514,7 +514,7 @@ jstring JNICALL ScriptMethodsHyperspaceNamespace::getSceneForHyperspacePoint(JNI if (!JavaLibrary::convert(localHyperspacePoint, hyperspacePoint)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("getSceneForHyperspacePoint - could not get hyperspace point name")); - return NULL; + return nullptr; } if(HyperspaceManager::isValidHyperspacePoint(hyperspacePoint)) @@ -528,7 +528,7 @@ jstring JNICALL ScriptMethodsHyperspaceNamespace::getSceneForHyperspacePoint(JNI return str.getReturnValue(); } } - return NULL; + return nullptr; } //------------------------------------------------------------------------------------------------ diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsImageDesign.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsImageDesign.cpp index b85f1516..4866318b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsImageDesign.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsImageDesign.cpp @@ -70,7 +70,7 @@ void JNICALL ScriptMethodsImageDesignNamespace::imagedesignStart(JNIEnv *env, jo return; } - //the terminal can be NULL (that means no ID terminal is being used, which is fine) + //the terminal can be nullptr (that means no ID terminal is being used, which is fine) ServerObject * terminalObj = 0; JavaLibrary::getObject(jterminalId, terminalObj); @@ -185,8 +185,8 @@ jboolean JNICALL ScriptMethodsImageDesignNamespace::imagedesignValidated(JNIEnv WARNING(true, ("morph keys and values arrays are of diffent sizes")); return JNI_FALSE; } - jfloat * const morphChangesValuesArray = env->GetFloatArrayElements(jmorphChangesValues, NULL); - if (morphChangesValuesArray == NULL) + jfloat * const morphChangesValuesArray = env->GetFloatArrayElements(jmorphChangesValues, nullptr); + if (morphChangesValuesArray == nullptr) { return JNI_FALSE; } @@ -211,8 +211,8 @@ jboolean JNICALL ScriptMethodsImageDesignNamespace::imagedesignValidated(JNIEnv WARNING(true, ("index keys and values arrays are of diffent sizes")); return JNI_FALSE; } - jint * const indexChangesValuesArray = env->GetIntArrayElements(jindexChangesValues, NULL); - if (indexChangesValuesArray == NULL) + jint * const indexChangesValuesArray = env->GetIntArrayElements(jindexChangesValues, nullptr); + if (indexChangesValuesArray == nullptr) { return JNI_FALSE; } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsInstallation.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsInstallation.cpp index b96b27d2..5c159849 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsInstallation.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsInstallation.cpp @@ -224,7 +224,7 @@ void JNICALL ScriptMethodsInstallationNamespace::displayStructurePermissionData( UNREF(self); //get the player id from player - CreatureObject* creatureObject = NULL; + CreatureObject* creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject)) return; @@ -290,7 +290,7 @@ jfloat JNICALL ScriptMethodsInstallationNamespace::getPowerValue(JNIEnv *env, jo UNREF(self); //get the player id from player - const InstallationObject * installation = NULL; + const InstallationObject * installation = nullptr; if (!JavaLibrary::getObject(target, installation)) return 0; @@ -314,7 +314,7 @@ jboolean JNICALL ScriptMethodsInstallationNamespace::setPowerValue(JNIEnv *env, UNREF(self); //get the player id from player - InstallationObject * installation = NULL; + InstallationObject * installation = nullptr; if (!JavaLibrary::getObject(target, installation)) return JNI_FALSE; @@ -340,7 +340,7 @@ jboolean JNICALL ScriptMethodsInstallationNamespace::incrementPowerValue(JNIEnv UNREF(self); //get the player id from player - InstallationObject * installation = NULL; + InstallationObject * installation = nullptr; if (!JavaLibrary::getObject(target, installation)) return JNI_FALSE; @@ -365,7 +365,7 @@ jfloat JNICALL ScriptMethodsInstallationNamespace::getPowerRate(JNIEnv *env, job UNREF(self); //get the player id from player - const InstallationObject * installation = NULL; + const InstallationObject * installation = nullptr; if (!JavaLibrary::getObject(target, installation)) return 0; @@ -389,7 +389,7 @@ jboolean JNICALL ScriptMethodsInstallationNamespace::setPowerRate(JNIEnv *env, j UNREF(self); //get the player id from player - InstallationObject * installation = NULL; + InstallationObject * installation = nullptr; if (!JavaLibrary::getObject(target, installation)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsInteriors.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsInteriors.cpp index fb6c3557..da0c833b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsInteriors.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsInteriors.cpp @@ -137,7 +137,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::createObjectInCell(JNIEnv *env, j return 0; std::string templateName; - ServerObject* sourceObject = NULL; + ServerObject* sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) return 0; templateName = sourceObject->getTemplateName(); @@ -149,7 +149,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellInternal(JNIEn { JavaStringParam localCellName(cellName); - ServerObject * portallizedObject = NULL; + ServerObject * portallizedObject = nullptr; if (!JavaLibrary::getObject(building, portallizedObject)) return 0; @@ -183,7 +183,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellInternal(JNIEn Transform tr; tr.setPosition_p(newPos); ServerObject *newObject = ServerWorld::createNewObject(templateName, tr, cellObject, false); - if (newObject == NULL) + if (newObject == nullptr) return 0; //@todo do we need to snap to floor or something? @@ -226,7 +226,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::createObjectInCellAnywhere(JNIEnv return 0; std::string templateName; - ServerObject* sourceObject = NULL; + ServerObject* sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) return 0; templateName = sourceObject->getTemplateName(); @@ -261,7 +261,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern //@todo need to find a way to get a good location in a cell. For now just use the coordinates of the cell? JavaStringParam localCellName(cellName); - ServerObject *portallizedObject = NULL; + ServerObject *portallizedObject = nullptr; if (!JavaLibrary::getObject(building, portallizedObject)) return 0; @@ -289,7 +289,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern Transform tr; tr.setPosition_p(createPosition); ServerObject *newObject = ServerWorld::createNewObject(templateName, tr, cellObject, false); - if (newObject == NULL) + if (newObject == nullptr) return 0; // create an networkId to return @@ -306,7 +306,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::_createObjectInCellAnywhereIntern jobjectArray JNICALL ScriptMethodsInteriorsNamespace::getCellNames(JNIEnv *env, jobject self, jlong target) { - ServerObject const *portallizedObject = NULL; + ServerObject const *portallizedObject = nullptr; if (!JavaLibrary::getObject(target, portallizedObject)) return 0; @@ -329,7 +329,7 @@ jobjectArray JNICALL ScriptMethodsInteriorsNamespace::getCellNames(JNIEnv *env, jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobject self, jlong target) { - CellObject const *cellObject = NULL; + CellObject const *cellObject = nullptr; if (!JavaLibrary::getObject(target, cellObject)) return 0; @@ -342,7 +342,7 @@ jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobjec } ServerObject const * const portallizedObject = safe_cast(ContainerInterface::getContainedByObject(*cellObject)); - if (portallizedObject == NULL) + if (portallizedObject == nullptr) return 0; PortalProperty const * const cellProp = portallizedObject->getPortalProperty(); @@ -370,7 +370,7 @@ jstring JNICALL ScriptMethodsInteriorsNamespace::getCellName(JNIEnv *env, jobjec jlongArray JNICALL ScriptMethodsInteriorsNamespace::getCellIds(JNIEnv *env, jobject self, jlong target) { - ServerObject const *portallizedObject = NULL; + ServerObject const *portallizedObject = nullptr; if (!JavaLibrary::getObject(target, portallizedObject)) return 0; @@ -387,11 +387,11 @@ jlongArray JNICALL ScriptMethodsInteriorsNamespace::getCellIds(JNIEnv *env, jobj cellIds.reserve(count); for (int i = 0; i < count; ++i) { - ServerObject const * cellObject = NULL; + ServerObject const * cellObject = nullptr; CellProperty const * const cellProp = portalProp->getCell(nameList[i]); - if (cellProp != NULL) + if (cellProp != nullptr) cellObject = cellProp->getOwner().asServerObject(); - if (cellObject != NULL) + if (cellObject != nullptr) { cellIds.push_back(cellObject->getNetworkId()); } @@ -412,7 +412,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::hasCell(JNIEnv *env, jobject s { JavaStringParam localCellName(cellName); - ServerObject const * serverObject = NULL; + ServerObject const * serverObject = nullptr; if (!JavaLibrary::getObject(portallizedObject, serverObject)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::hasCell passed invalid object")); @@ -448,7 +448,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::getCellId(JNIEnv *env, jobject se { JavaStringParam localCellName(cellName); - ServerObject const * serverObject = NULL; + ServerObject const * serverObject = nullptr; if (!JavaLibrary::getObject(portallizedObject, serverObject)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("[script bug] JavaLibrary::getCellId passed invalid object")); @@ -571,7 +571,7 @@ jobject JNICALL ScriptMethodsInteriorsNamespace::getBuildingEjectLocation(JNIEnv if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] getBuildingEjectLocation was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] getBuildingEjectLocation was passed a nullptr building objid")); return 0; } @@ -598,7 +598,7 @@ jobject JNICALL ScriptMethodsInteriorsNamespace::getBuildingEjectLocation(JNIEnv CellProperty const *worldCell = CellProperty::getWorldCellProperty(); if (!worldCell) { - DEBUG_WARNING(true, ("getBuildingEjectLocation get a NULL worldCell back from CellProperty::getWorldCellProperty()")); + DEBUG_WARNING(true, ("getBuildingEjectLocation get a nullptr worldCell back from CellProperty::getWorldCellProperty()")); return 0; } @@ -666,7 +666,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::moveHouseItemToPlayer(JNIEnv * /* { if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer was passed a nullptr building objid")); return 0; } @@ -693,7 +693,7 @@ jlong JNICALL ScriptMethodsInteriorsNamespace::moveHouseItemToPlayer2(JNIEnv * / { if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer2 was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] moveHouseItemToPlayer2 was passed a nullptr building objid")); return 0; } @@ -721,7 +721,7 @@ void JNICALL ScriptMethodsInteriorsNamespace::deleteAllHouseItems(JNIEnv * /*env { if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] deleteAllHouseItems was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] deleteAllHouseItems was passed a nullptr building objid")); return ; } @@ -747,11 +747,11 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::areAllContentsLoaded(JNIEnv * { if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a nullptr building objid")); return JNI_FALSE; } - const BuildingObject * buildingObject = NULL; + const BuildingObject * buildingObject = nullptr; if (!JavaLibrary::getObject(building, buildingObject)) { DEBUG_WARNING(true, ("[designer bug] areAllContentsLoaded was passed a non-ServerObject objid")); @@ -767,11 +767,11 @@ void JNICALL ScriptMethodsInteriorsNamespace::loadBuildingContents(JNIEnv * /*en { if (building == 0) { - DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a NULL building objid")); + DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a nullptr building objid")); return; } - BuildingObject * buildingObject = NULL; + BuildingObject * buildingObject = nullptr; if (!JavaLibrary::getObject(building, buildingObject)) { DEBUG_WARNING(true, ("[designer bug] loadBuildingContents was passed a non-ServerObject objid")); @@ -815,9 +815,9 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::isAtPendingLoadRequestLimit(JN jstring JNICALL ScriptMethodsInteriorsNamespace::getCellLabel(JNIEnv * env, jobject self, jlong target) { - CellObject const *cellObject = NULL; + CellObject const *cellObject = nullptr; if (!JavaLibrary::getObject(target, cellObject)) - return NULL; + return nullptr; JavaString cellLabel(cellObject->getCellLabel()); return cellLabel.getReturnValue(); @@ -833,7 +833,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabel(JNIEnv * env, job if (!JavaLibrary::convert(localCellLabel, cellLabelString)) return JNI_FALSE; - CellObject * cellObject = NULL; + CellObject * cellObject = nullptr; if (!JavaLibrary::getObject(target, cellObject)) return JNI_FALSE; @@ -846,7 +846,7 @@ jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabel(JNIEnv * env, job jboolean JNICALL ScriptMethodsInteriorsNamespace::setCellLabelOffset(JNIEnv * env, jobject self, jlong target, jfloat x, jfloat y, jfloat z) { - CellObject * cellObject = NULL; + CellObject * cellObject = nullptr; if (!JavaLibrary::getObject(target, cellObject)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsJedi.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsJedi.cpp index 1afeec06..188193c7 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsJedi.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsJedi.cpp @@ -120,7 +120,7 @@ jint JNICALL ScriptMethodsJediNamespace::getMaxForcePower(JNIEnv *env, jobject s { UNREF(self); - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return 0; @@ -128,7 +128,7 @@ jint JNICALL ScriptMethodsJediNamespace::getMaxForcePower(JNIEnv *env, jobject s return 0; PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return 0; return playerObject->getMaxForcePower(); @@ -148,7 +148,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setMaxForcePower(JNIEnv *env, jobje { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -159,7 +159,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setMaxForcePower(JNIEnv *env, jobje } PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; playerObject->setMaxForcePower(value); @@ -180,7 +180,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::alterMaxForcePower(JNIEnv *env, job { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -191,7 +191,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::alterMaxForcePower(JNIEnv *env, job } PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; playerObject->setMaxForcePower(playerObject->getMaxForcePower() + delta); @@ -211,7 +211,7 @@ jint JNICALL ScriptMethodsJediNamespace::getForcePower(JNIEnv *env, jobject self { UNREF(self); - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return 0; @@ -219,7 +219,7 @@ jint JNICALL ScriptMethodsJediNamespace::getForcePower(JNIEnv *env, jobject self return 0; PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return 0; return playerObject->getForcePower(); @@ -239,7 +239,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setForcePower(JNIEnv *env, jobject { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -250,7 +250,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setForcePower(JNIEnv *env, jobject } PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; playerObject->setForcePower(value); @@ -271,7 +271,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::alterForcePower(JNIEnv *env, jobjec { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -282,7 +282,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::alterForcePower(JNIEnv *env, jobjec } PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; playerObject->setForcePower(playerObject->getForcePower() + delta); @@ -302,7 +302,7 @@ jfloat JNICALL ScriptMethodsJediNamespace::getForcePowerRegenRate(JNIEnv *env, j { UNREF(self); - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return 0; @@ -310,7 +310,7 @@ jfloat JNICALL ScriptMethodsJediNamespace::getForcePowerRegenRate(JNIEnv *env, j return 0; PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return 0; return playerObject->getForcePowerRegenRate(); @@ -330,7 +330,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setForcePowerRegenRate(JNIEnv *env, { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -341,7 +341,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setForcePowerRegenRate(JNIEnv *env, } PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return JNI_FALSE; playerObject->setForcePowerRegenRate(rate); @@ -359,7 +359,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setForcePowerRegenRate(JNIEnv *env, */ jint JNICALL ScriptMethodsJediNamespace::getJediState(JNIEnv *env, jobject self, jlong jedi) { - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(jedi, object)) { WARNING(true, ("JavaLibrary::getJediState did not find creature for id passed in")); @@ -367,7 +367,7 @@ jint JNICALL ScriptMethodsJediNamespace::getJediState(JNIEnv *env, jobject self, } const SwgPlayerObject * player = safe_cast(PlayerCreatureController::getPlayerObject(object)); - if (player == NULL) + if (player == nullptr) { WARNING(true, ("JavaLibrary::getJediState did not find player for creature " "%s", object->getNetworkId().getValueString().c_str())); @@ -389,12 +389,12 @@ jint JNICALL ScriptMethodsJediNamespace::getJediState(JNIEnv *env, jobject self, */ jboolean JNICALL ScriptMethodsJediNamespace::setJediState(JNIEnv *env, jobject self, jlong jedi, jint state) { - CreatureObject * object = NULL; + CreatureObject * object = nullptr; if (!JavaLibrary::getObject(jedi, object)) return JNI_FALSE; SwgPlayerObject * const player = safe_cast(PlayerCreatureController::getPlayerObject(object)); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; if (state == JS_none || @@ -424,7 +424,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setJediState(JNIEnv *env, jobject s */ jboolean JNICALL ScriptMethodsJediNamespace::hasJediSlot(JNIEnv * env, jobject self, jlong target) { - const ServerObject * player = NULL; + const ServerObject * player = nullptr; if (!JavaLibrary::getObject(target, player)) return JNI_FALSE; @@ -444,12 +444,12 @@ jboolean JNICALL ScriptMethodsJediNamespace::hasJediSlot(JNIEnv * env, jobject s */ jboolean JNICALL ScriptMethodsJediNamespace::addJediSlot(JNIEnv * env, jobject self, jlong target) { - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; PlayerObject const * const player = PlayerCreatureController::getPlayerObject(object); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; player->addJediToAccount(); @@ -475,12 +475,12 @@ jboolean JNICALL ScriptMethodsJediNamespace::isJedi(JNIEnv * env, jobject self, { UNREF(self); - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; const PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; const SwgPlayerObject * jedi = safe_cast(player); @@ -502,12 +502,12 @@ jint JNICALL ScriptMethodsJediNamespace::getJediVisibility(JNIEnv * env, jobject { UNREF(self); - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return -1; const PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; const SwgPlayerObject * jedi = safe_cast(player); @@ -531,12 +531,12 @@ jboolean JNICALL ScriptMethodsJediNamespace::setJediVisibility(JNIEnv * env, job { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; SwgPlayerObject * jedi = safe_cast(player); @@ -561,12 +561,12 @@ jboolean JNICALL ScriptMethodsJediNamespace::changeJediVisibility(JNIEnv * env, { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; PlayerObject * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; SwgPlayerObject * jedi = safe_cast(player); @@ -591,19 +591,19 @@ jboolean JNICALL ScriptMethodsJediNamespace::setJediBountyValue(JNIEnv * env, jo { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; SwgCreatureObject const * jediCreature = safe_cast(creature); PlayerObject const * player = PlayerCreatureController::getPlayerObject(creature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; SwgPlayerObject const * jediPlayer = safe_cast(player); JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return JNI_FALSE; jediManager->addJedi(creature->getNetworkId(), creature->getObjectName(), @@ -631,7 +631,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::setJediBountyValue(JNIEnv * env, jo * @param bounties limit for number of bounties on the Jedi statistic * @param state what state(s) the Jedi should have * - * @return a dictionary with the Jedi data on success, null on error + * @return a dictionary with the Jedi data on success, nullptr on error */ jobject JNICALL ScriptMethodsJediNamespace::requestJedi(JNIEnv * env, jobject self, jint visibility, jint bountyValue, jint minLevel, jint maxLevel, jint hoursAlive, jint bounties, jint state) @@ -640,7 +640,7 @@ jobject JNICALL ScriptMethodsJediNamespace::requestJedi(JNIEnv * env, jobject se JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return 0; ScriptParams params; @@ -658,7 +658,7 @@ jobject JNICALL ScriptMethodsJediNamespace::requestJedi(JNIEnv * env, jobject se * @param self class calling this function * @param target the id of the Jedi * - * @return a dictionary with the Jedi data on success, null on error + * @return a dictionary with the Jedi data on success, nullptr on error */ jobject JNICALL ScriptMethodsJediNamespace::requestOneJedi(JNIEnv * env, jobject self, jlong target) { @@ -666,7 +666,7 @@ jobject JNICALL ScriptMethodsJediNamespace::requestOneJedi(JNIEnv * env, jobject JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return 0; const NetworkId id(target); @@ -704,7 +704,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::requestJediBounty(JNIEnv * env, job JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return JNI_FALSE; const NetworkId targetId(target); @@ -751,7 +751,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::removeJediBounty(JNIEnv * env, jobj JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return JNI_FALSE; const NetworkId targetId(target); @@ -781,7 +781,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::removeAllJediBounties(JNIEnv * env, JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return JNI_FALSE; const NetworkId targetId(target); @@ -799,7 +799,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::removeAllJediBounties(JNIEnv * env, * @param self class calling this function * @param target the Jedi * - * @return an array of hunter ids, or null on error + * @return an array of hunter ids, or nullptr on error */ jlongArray JNICALL ScriptMethodsJediNamespace::getJediBounties(JNIEnv * env, jobject self, jlong target) { @@ -807,7 +807,7 @@ jlongArray JNICALL ScriptMethodsJediNamespace::getJediBounties(JNIEnv * env, job JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return 0; const NetworkId targetId(target); @@ -837,7 +837,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::isBeingHuntedByBountyHunter(JNIEnv JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return JNI_FALSE; const NetworkId targetId(target); @@ -861,7 +861,7 @@ jboolean JNICALL ScriptMethodsJediNamespace::isBeingHuntedByBountyHunter(JNIEnv * @param self class calling this function * @param hunter the bounty hunter * - * @return an array of jedi ids, or null on error + * @return an array of jedi ids, or nullptr on error */ jlongArray JNICALL ScriptMethodsJediNamespace::getBountyHunterBounties(JNIEnv * env, jobject self, jlong hunter) { @@ -869,7 +869,7 @@ jlongArray JNICALL ScriptMethodsJediNamespace::getBountyHunterBounties(JNIEnv * JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return 0; const NetworkId hunterId(hunter); @@ -899,7 +899,7 @@ void JNICALL ScriptMethodsJediNamespace::updateJediScriptData(JNIEnv * env, jobj { JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return; const NetworkId targetId(target); @@ -926,7 +926,7 @@ void JNICALL ScriptMethodsJediNamespace::removeJediScriptData(JNIEnv * env, jobj { JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager == NULL) + if (jediManager == nullptr) return; const NetworkId targetId(target); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMap.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMap.cpp index 9bcaa8d8..9d7f4dc1 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMap.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMap.cpp @@ -253,7 +253,7 @@ jobjectArray JNICALL ScriptMethodsMapNamespace::getPlanetaryMapLocations( if(!JavaLibrary::convert(localCategory, categoryName)) { DEBUG_WARNING(true, ("[script bug] invalid category passed to getPlanetaryMapLocations")); - return NULL; + return nullptr; } } @@ -264,7 +264,7 @@ jobjectArray JNICALL ScriptMethodsMapNamespace::getPlanetaryMapLocations( if(!JavaLibrary::convert(localSubCategory, subCategoryName)) { DEBUG_WARNING(true, ("[script bug] invalid SubCategory passed to getPlanetaryMapLocations")); - return NULL; + return nullptr; } } @@ -282,12 +282,12 @@ jobjectArray JNICALL ScriptMethodsMapNamespace::getPlanetaryMapLocations( jlong jLocationId = mapLocation.getLocationId().getValue(); if (!jLocationId) - return NULL; + return nullptr; JavaString jNameString(mapLocation.getLocationName()); if (jNameString.getValue() == 0) - return NULL; + return nullptr; LocalRefPtr jMapLocation = createNewObject(JavaLibrary::getClsMapLocation(), JavaLibrary::getMidMapLocation(), @@ -299,7 +299,7 @@ jobjectArray JNICALL ScriptMethodsMapNamespace::getPlanetaryMapLocations( static_cast (mapLocation.getFlags())); if (jMapLocation == LocalRef::cms_nullPtr) - return NULL; + return nullptr; setObjectArrayElement(*jlocs, index, *jMapLocation); } @@ -318,7 +318,7 @@ jobjectArray JNICALL ScriptMethodsMapNamespace::getPlanetaryMapCategories (JNI if(!JavaLibrary::convert(localCategory, categoryName)) { DEBUG_WARNING(true, ("[script bug] invalid category passed to getPlanetaryMapCategories")); - return NULL; + return nullptr; } } @@ -350,14 +350,14 @@ jobject JNICALL ScriptMethodsMapNamespace::getPlanetaryMapLocation (JNI if (id == NetworkId::cms_invalid) { DEBUG_WARNING(true, ("[script bug] invalid locationId passed to getPlanetaryMapCategories")); - return NULL; + return nullptr; } int mlt = 0; const MapLocation * const mapLocation = PlanetMapManagerServer::getLocation (id, mlt); if (!mapLocation) - return NULL; + return nullptr; const JavaString jLocName (mapLocation->m_locationName); const JavaString jLocCategoryName (PlanetMapManager::findCategoryName (mapLocation->m_category)); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp index c4dd20c1..fc11623f 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMentalStates.cpp @@ -310,7 +310,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::addMentalStateModifier(JNIE * @param mob id of creature to access * @param mentalState mental state we are interested in * - * @return the mental state modifiers for the creature, or null if it has none + * @return the mental state modifiers for the creature, or nullptr if it has none */ jobjectArray JNICALL ScriptMethodsMentalStatesNamespace::getMentalStateModifiers(JNIEnv *env, jobject self, jlong mob, jint mentalState) { @@ -697,7 +697,7 @@ jboolean JNICALL ScriptMethodsMentalStatesNamespace::addMentalStateModifierTowar * @param mob id of creature to access * @param mentalState mental state we are interested in * - * @return the mental state modifiers for the creature, or null if it has none + * @return the mental state modifiers for the creature, or nullptr if it has none */ jobjectArray JNICALL ScriptMethodsMentalStatesNamespace::getMentalStateModifiersToward(JNIEnv *env, jobject self, jlong mob, jlong target, jint mentalState) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMission.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMission.cpp index 815bb35a..13e82707 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMission.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMission.cpp @@ -170,17 +170,17 @@ void JNICALL ScriptMethodsMissionNamespace::abortMission(JNIEnv * env, jobject s } else { - DEBUG_WARNING(true, ("[designer bug] abortMission() missionObject is NULL")); + DEBUG_WARNING(true, ("[designer bug] abortMission() missionObject is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] abortMission() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] abortMission() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] abortMission() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] abortMission() JNIEnv is nullptr")); } } @@ -283,17 +283,17 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionCreator(JNIEnv * env, j } else { - DEBUG_WARNING(true, ("[designer bug] getMissionCreator() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionCreator() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionCreator() JNIEnv is nullptr")); } return result; } @@ -304,13 +304,13 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionDescription(JNIEnv * en { if(! env) { - DEBUG_WARNING(true, ("[programmer bug] getMissionDescription() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionDescription() JNIEnv is nullptr")); return 0; } if(! missionObject) { - DEBUG_WARNING(true, ("[designer bug] getMissionDescription() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionDescription() missionObject (parameter 1) is nullptr")); return 0; } @@ -352,17 +352,17 @@ jint JNICALL ScriptMethodsMissionNamespace::getMissionDifficulty(JNIEnv * env, j } else { - DEBUG_WARNING(true, ("[designer bug] getMissionDifficulty() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionDifficulty() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionDifficulty() JNIEnv is nullptr")); } return result; } @@ -390,7 +390,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionEndLocation(JNIEnv * en } else { - DEBUG_WARNING(true, ("[designer bug] getMissionEndLocation() missionObject (parameter1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionEndLocation() missionObject (parameter1) is nullptr")); } return 0; } @@ -418,17 +418,17 @@ jint JNICALL ScriptMethodsMissionNamespace::getMissionReward(JNIEnv * env, jobje } else { - DEBUG_WARNING(true, ("[designer bug] getMissionReward() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionReward() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionReward() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionReward() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionReward() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionReward() JNIEnv is nullptr")); } return result; } @@ -454,7 +454,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionStartLocation(JNIEnv * } else { - DEBUG_WARNING(true, ("[designer bug] getMissionStartLocation() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionStartLocation() missionObject (parameter 1) is nullptr")); } return 0; } @@ -483,7 +483,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionTargetName(JNIEnv * env } else { - DEBUG_WARNING(true, ("[designer bug] getMissionTargetName() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionTargetName() missionObject (parameter 1) is nullptr")); } return 0; } @@ -494,7 +494,7 @@ jobject JNICALL ScriptMethodsMissionNamespace::getMissionTitle(JNIEnv * env, job { if(! missionObject) { - DEBUG_WARNING(true, ("[designer bug] getMissionTitle() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionTitle() missionObject (parameter 1) is nullptr")); return 0; } @@ -537,7 +537,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionType(JNIEnv * env, jobj } else { - DEBUG_WARNING(true, ("[designer bug] getMissionType() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionType() missionObject (parameter 1) is nullptr")); } return 0; } @@ -556,7 +556,7 @@ jlong JNICALL ScriptMethodsMissionNamespace::getMissionHolder(JNIEnv * env, jobj MissionObject * mo = 0; if(JavaLibrary::getObject(missionObject, mo)) { - if (mo != NULL && mo->getMissionHolderId() != NetworkId::cms_invalid) + if (mo != nullptr && mo->getMissionHolderId() != NetworkId::cms_invalid) { result = (mo->getMissionHolderId()).getValue(); } @@ -572,17 +572,17 @@ jlong JNICALL ScriptMethodsMissionNamespace::getMissionHolder(JNIEnv * env, jobj } else { - DEBUG_WARNING(true, ("[designer bug] getMissionHolder() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionHolder() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] getMissionHolder() JNIEnv is nullptr")); } return result; } @@ -609,7 +609,7 @@ jstring JNICALL ScriptMethodsMissionNamespace::getMissionRootScriptName(JNIEnv * } else { - DEBUG_WARNING(true, ("[designer bug] getMissionRootScriptName() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] getMissionRootScriptName() missionObject (parameter 1) is nullptr")); } return 0; } @@ -641,22 +641,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionCreator(JNIEnv *env, jobje } else { - DEBUG_WARNING(true, ("[designer bug] setMissionCreator() creator (parameter 2) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionCreator() creator (parameter 2) is nullptr")); } } else { - DEBUG_WARNING(true, ("[designer bug] setMissionCreator() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionCreator() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionCreator() JNIEnv is nullptr")); } } @@ -686,7 +686,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionDescription(JNIEnv * env, } else { - DEBUG_WARNING(true, ("[designer bug] setMissionDescription() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionDescription() missionObject (parameter 1) is nullptr")); } } @@ -708,7 +708,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionDifficulty(JNIEnv * env, j } else { - DEBUG_WARNING(true, ("[designer bug] setMissionDifficulty() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionDifficulty() missionObject (parameter 1) is nullptr")); } } @@ -764,17 +764,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionReward(JNIEnv * env, jobje } else { - DEBUG_WARNING(true, ("[designer bug] setMissionProfessionRank() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionProfessionRank() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionProfessionRank() JNIEnv is nullptr")); } } @@ -806,7 +806,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionStartLocation(JNIEnv * env } else { - DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() location (parameter 2) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() location (parameter 2) is nullptr")); } } else @@ -816,17 +816,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionStartLocation(JNIEnv * env } else { - DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionStartLocation() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionStartLocation() JNIEnv is nullptr")); } } @@ -856,17 +856,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTargetAppearance(JNIEnv * } else { - DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is nullptr")); } } @@ -896,17 +896,17 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTargetName(JNIEnv * env, j } else { - DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionTarget() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionTarget() JNIEnv is nullptr")); } } @@ -936,7 +936,7 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionTitle(JNIEnv * env, jobjec } else { - DEBUG_WARNING(true, ("[designer bug] setMissionTitle() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionTitle() missionObject (parameter 1) is nullptr")); } } @@ -969,22 +969,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionType(JNIEnv *env, jobject } else { - DEBUG_WARNING(true, ("[designer bug] setMissionType() typeName (parameter 2) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionType() typeName (parameter 2) is nullptr")); } } else { - DEBUG_WARNING(true, ("[designer bug] setMissionType() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionType() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionType() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionType() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionType() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionType() JNIEnv is nullptr")); } } @@ -1022,22 +1022,22 @@ void JNICALL ScriptMethodsMissionNamespace::setMissionRootScriptName(JNIEnv *env } else { - DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() rootScriptName (parameter 2) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() rootScriptName (parameter 2) is nullptr")); } } else { - DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() missionObject (parameter 1) is NULL")); + DEBUG_WARNING(true, ("[designer bug] setMissionRootScriptName() missionObject (parameter 1) is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() self is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() self is nullptr")); } } else { - DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() JNIEnv is NULL")); + DEBUG_WARNING(true, ("[programmer bug] setMissionRootScriptName() JNIEnv is nullptr")); } } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMoney.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMoney.cpp index 542b801e..d0afcd98 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMoney.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMoney.cpp @@ -110,7 +110,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::transferCashTo(JNIEnv *env, jobjec return JNI_FALSE; ServerObject *sourceObj = ServerWorld::findObjectByNetworkId(sourceObjId); - if (sourceObj == NULL || targetObjId == NetworkId::cms_invalid || ownerOID == NetworkId::cms_invalid) + if (sourceObj == nullptr || targetObjId == NetworkId::cms_invalid || ownerOID == NetworkId::cms_invalid) return JNI_FALSE; // Do money transfer (will be forwarded if object is not authoritative) @@ -157,7 +157,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::transferBankCreditsTo(JNIEnv *env, return JNI_FALSE; ServerObject *sourceObj = ServerWorld::findObjectByNetworkId(sourceObjId); - if (sourceObj == NULL || targetObjId == NetworkId::cms_invalid || ownerOID == NetworkId::cms_invalid) + if (sourceObj == nullptr || targetObjId == NetworkId::cms_invalid || ownerOID == NetworkId::cms_invalid) return JNI_FALSE; // Do money transfer (will be forwarded if object is not authoritative) @@ -203,7 +203,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::withdrawCashFromBank (JNIEnv *env, return JNI_FALSE; ServerObject *sourceObj = ServerWorld::findObjectByNetworkId(sourceObjId); - if (sourceObj == NULL || ownerOID == NetworkId::cms_invalid) + if (sourceObj == nullptr || ownerOID == NetworkId::cms_invalid) return JNI_FALSE; // Do money transfer (will be forwarded if object is not authoritative) @@ -243,7 +243,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::depositCashToBank(JNIEnv *env, job if (failCallbackFunction != 0 && !JavaLibrary::convert(JavaStringParam(failCallbackFunction), failCallback)) return JNI_FALSE; - ServerObject *sourceObj = NULL; + ServerObject *sourceObj = nullptr; if (!JavaLibrary::getObject(source, sourceObj)) return JNI_FALSE; @@ -260,7 +260,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::depositCashToBank(JNIEnv *env, job void JNICALL ScriptMethodsMoneyNamespace::depositToGalacticReserve(JNIEnv *env, jobject self, jlong player) { - CreatureObject * objPlayer = NULL; + CreatureObject * objPlayer = nullptr; if (!JavaLibrary::getObject(player, objPlayer) || !objPlayer) return; @@ -275,7 +275,7 @@ void JNICALL ScriptMethodsMoneyNamespace::depositToGalacticReserve(JNIEnv *env, void JNICALL ScriptMethodsMoneyNamespace::withdrawFromGalacticReserve(JNIEnv *env, jobject self, jlong player) { - CreatureObject * objPlayer = NULL; + CreatureObject * objPlayer = nullptr; if (!JavaLibrary::getObject(player, objPlayer) || !objPlayer) return; @@ -290,7 +290,7 @@ void JNICALL ScriptMethodsMoneyNamespace::withdrawFromGalacticReserve(JNIEnv *en jboolean JNICALL ScriptMethodsMoneyNamespace::canAccessGalacticReserve(JNIEnv *env, jobject self, jlong player) { - CreatureObject * objPlayer = NULL; + CreatureObject * objPlayer = nullptr; if (!JavaLibrary::getObject(player, objPlayer) || !objPlayer) return JNI_FALSE; @@ -376,7 +376,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::transferBankCreditsToNamedAccount( return JNI_FALSE; ServerObject *sourceObj = ServerWorld::findObjectByNetworkId(sourceObjId); - if (sourceObj == NULL || targetString.size() == 0 || ownerOID == NetworkId::cms_invalid) + if (sourceObj == nullptr || targetString.size() == 0 || ownerOID == NetworkId::cms_invalid) return JNI_FALSE; // Do money transfer (will be forwarded if object is not authoritative) @@ -426,7 +426,7 @@ jboolean JNICALL ScriptMethodsMoneyNamespace::transferBankCreditsFromNamedAccoun return JNI_FALSE; ServerObject *targetObj = ServerWorld::findObjectByNetworkId(targetObjId); - if (targetObj == NULL || sourceString.size() == 0 || ownerOID == NetworkId::cms_invalid) + if (targetObj == nullptr || sourceString.size() == 0 || ownerOID == NetworkId::cms_invalid) return JNI_FALSE; // Do money transfer (will be forwarded if object is not authoritative) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsMount.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsMount.cpp index 4f0e9c9f..2779be7b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsMount.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsMount.cpp @@ -235,7 +235,7 @@ void JNICALL ScriptMethodsMountNamespace::dismountCreature(JNIEnv *env, jobject CreatureObject *const mountObject = riderObject->getMountedCreature(); if (!mountObject) { - LOG(LOCAL_LOG_CHANNEL, ("JavaLibrary::dismountCreature(): server id=[%d],rider id=[%s] has RidingMount state but CreatureObject::getMountedCreature() returns NULL, skipping dismount.", GameServer::getInstance().getProcessId(), riderObject->getNetworkId().getValueString().c_str())); + LOG(LOCAL_LOG_CHANNEL, ("JavaLibrary::dismountCreature(): server id=[%d],rider id=[%s] has RidingMount state but CreatureObject::getMountedCreature() returns nullptr, skipping dismount.", GameServer::getInstance().getProcessId(), riderObject->getNetworkId().getValueString().c_str())); return; } @@ -393,7 +393,7 @@ void JNICALL JNICALL ScriptMethodsMountNamespace::makeContainerStateInconsistent //-- Get the ServerObject from the object id. if (!containedObjectId) { - LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containedObjectId is NULL")); + LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containedObjectId is nullptr")); return; } @@ -428,7 +428,7 @@ void JNICALL JNICALL ScriptMethodsMountNamespace::makeContainerStateInconsistent Container* container = ContainerInterface::getContainer(*containerObject); if (!container) { - LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containerObject [%s] returned a NULL container", containerObject->getNetworkId().getValueString().c_str())); + LOG("script-bug", ("makeContainerStateInconsistentTestOnly(): containerObject [%s] returned a nullptr container", containerObject->getNetworkId().getValueString().c_str())); return; } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp index b94f7349..037b7ff5 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp @@ -439,7 +439,7 @@ jobject JNICALL ScriptMethodsNewbieTutorialNamespace::getStartingLocationInf if (!jName) { - WARNING (true, ("getStartingLocationInfo null name")); + WARNING (true, ("getStartingLocationInfo nullptr name")); return JNI_FALSE; } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNotification.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNotification.cpp index 8c8cff43..06d6b672 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNotification.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNotification.cpp @@ -52,7 +52,7 @@ const JNINativeMethod NATIVES[] = { jint JNICALL ScriptMethodsNotificationNamespace::addNotification(JNIEnv *env, jobject self, jlong player, jstring contents, jboolean useNotificationIcon, jint iconStyle, jfloat timeout, jint channel, jstring sound) { - CreatureObject const * playerObject = NULL; + CreatureObject const * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return 0; @@ -79,7 +79,7 @@ jint JNICALL ScriptMethodsNotificationNamespace::addNotification(JNIEnv *env, jo void JNICALL ScriptMethodsNotificationNamespace::cancelNotification(JNIEnv *env, jobject self, jlong player, jint notification) { - CreatureObject const * playerObject = NULL; + CreatureObject const * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return; ClientNotificationBoxMessage cnbm(notification, playerObject->getNetworkId(), Unicode::emptyString, FALSE, 0, 0.0f, ClientNotificationBoxMessage::NC_SPECIAL_CANCEL, std::string("")); @@ -94,7 +94,7 @@ void JNICALL ScriptMethodsNotificationNamespace::cancelNotification(JNIEnv *env, void JNICALL ScriptMethodsNotificationNamespace::cancelAllNotifications(JNIEnv *env, jobject self, jlong player) { - CreatureObject const * playerObject = NULL; + CreatureObject const * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return; ClientNotificationBoxMessage cnbm(0, playerObject->getNetworkId(), Unicode::emptyString, FALSE, 0, 0.0f, ClientNotificationBoxMessage::NC_SPECIAL_CANCEL_ALL, std::string("")); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNpc.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNpc.cpp index a617593b..f9c5e4ed 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNpc.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNpc.cpp @@ -190,14 +190,14 @@ jboolean JNICALL ScriptMethodsNpcNamespace::_npcStartConversation(JNIEnv *env, j if (!JavaLibrary::convert (localConvoName, convoNameStr)) return JNI_FALSE; - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; if (playerObject->isInNpcConversation()) return JNI_FALSE; - TangibleObject * npcObject = NULL; + TangibleObject * npcObject = nullptr; if (!JavaLibrary::getObject(npc, npcObject)) return JNI_FALSE; @@ -234,7 +234,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::_npcStartConversation(JNIEnv *env, j jboolean JNICALL ScriptMethodsNpcNamespace::npcStartConversation(JNIEnv *env, jobject self, jlong player, jlong npc, jstring convoName, jobject greeting, jstring greetingOob, jobjectArray responses) { - TangibleObject * speakerObject = NULL; + TangibleObject * speakerObject = nullptr; if (!JavaLibrary::getObject(npc, speakerObject) || !speakerObject) return JNI_FALSE; @@ -243,7 +243,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcStartConversation(JNIEnv *env, jo uint32 crc = Crc::crcNull; ObjectTemplate const * const ot = ObjectTemplateList::fetch(conversationAppearanceOverride); - ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : NULL; + ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : nullptr; if(sot) { std::string const & sharedTemplateName = sot->getSharedTemplate(); @@ -263,7 +263,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcStartConversationAppearanceOverri return JNI_FALSE; ObjectTemplate const * const ot = ObjectTemplateList::fetch(appearanceOverrideSharedTemplateNameStr); - ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : NULL; + ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : nullptr; if(!sot) { return JNI_FALSE; @@ -290,7 +290,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcEndConversation(JNIEnv *env, jobj { UNREF(self); - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -318,7 +318,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcSpeak(JNIEnv *env, jobject self, { UNREF(self); - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -367,7 +367,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcSetConversationResponses(JNIEnv * { UNREF(self); - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -396,7 +396,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcAddConversationResponse(JNIEnv *e { UNREF(self); - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -455,7 +455,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcRemoveConversationResponse(JNIEnv { UNREF(self); - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -488,7 +488,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::isInNpcConversation(JNIEnv *env, job { UNREF(self); - TangibleObject * tangibleObject = NULL; + TangibleObject * tangibleObject = nullptr; if (!JavaLibrary::getObject(creature, tangibleObject)) return JNI_FALSE; @@ -506,13 +506,13 @@ jboolean JNICALL ScriptMethodsNpcNamespace::isInNpcConversation(JNIEnv *env, job * @param self class calling this function * @param creature creature being asked about * - * @return an array of obj_ids the creature is in conversation with, or null on error + * @return an array of obj_ids the creature is in conversation with, or nullptr on error */ jlongArray JNICALL ScriptMethodsNpcNamespace::getNpcConversants(JNIEnv *env, jobject self, jlong creature) { UNREF(self); - TangibleObject * tangibleObject = NULL; + TangibleObject * tangibleObject = nullptr; if (!JavaLibrary::getObject(creature, tangibleObject)) return 0; @@ -621,7 +621,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::isNameReservedIgnoreRules(JNIEnv *en jboolean JNICALL ScriptMethodsNpcNamespace::npcEndConversationWithMessage(JNIEnv * /*env*/, jobject /*self*/, jlong player, jobject response, jstring responseOob) { - TangibleObject * playerObject = NULL; + TangibleObject * playerObject = nullptr; if(!JavaLibrary::getObject(player, playerObject)) return JNI_FALSE; @@ -658,7 +658,7 @@ jboolean JNICALL ScriptMethodsNpcNamespace::npcEndConversationWithMessage(JNIEnv jboolean JNICALL ScriptMethodsNpcNamespace::setNpcDifficulty(JNIEnv *env, jobject self, jlong npc, jlong difficulty) { - TangibleObject * npcObject = NULL; + TangibleObject * npcObject = nullptr; if (!JavaLibrary::getObject(npc, npcObject)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp index 37ab2bac..2f967f59 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp @@ -257,11 +257,11 @@ jlong ScriptMethodsObjectCreateNamespace::createTheater(const std::vector float centerX = minx + dx / 2.0f + center.x; float centerZ = minz + dz / 2.0f + center.z; - TerrainGenerator::Layer * layer = NULL; + TerrainGenerator::Layer * layer = nullptr; if (locationType == IntangibleObject::TLT_flatten) { layer = TerrainModificationHelper::importLayer(THEATER_FLATTEN_LAYER.c_str()); - if (layer == NULL) + if (layer == nullptr) { WARNING (true, ("Layer %s not found for theater, using getGoodLocation " "instead", THEATER_FLATTEN_LAYER.c_str())); @@ -292,7 +292,7 @@ jlong ScriptMethodsObjectCreateNamespace::createTheater(const std::vector IntangibleObject * theater = safe_cast(ServerWorld::createNewObject(THEATER_TEMPLATE, tr, 0, false)); NOT_NULL(theater); theater->setTheater(); - if (layer != NULL) + if (layer != nullptr) { theater->setLayer(layer); } @@ -328,7 +328,7 @@ jlong ScriptMethodsObjectCreateNamespace::createTheater(const std::vector * @param source the template id or the object id to create the object with * @param location where to put the object * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInWorld(JNIEnv *env, jobject self, jlong source, jobject location) { @@ -340,7 +340,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInWorld(JNIEnv // determine what source is and create the object std::string localName; - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(source, object)) return 0; localName = object->getTemplateName(); @@ -366,7 +366,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInWorld(JNIEnv * @param source the template id or the object id to create the object with * @param location where to put the object * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInWorldString(JNIEnv *env, jobject self, jobject source, jobject location) { @@ -445,7 +445,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectAt(JNIEnv *env, * @param container the object we want to put our new object into * @param slot the container slot we want to put the object in * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainer(JNIEnv *env, jobject self, jlong source, jlong container, jstring slot) { @@ -457,7 +457,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainer(JNI // determine what source is and create the object std::string templateName; - const ServerObject* object = NULL; + const ServerObject* object = nullptr; if (!JavaLibrary::getObject(source, object)) return 0; templateName = object->getTemplateName(); @@ -536,7 +536,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerOver // determine what source is and create the object std::string templateName; - const ServerObject* object = NULL; + const ServerObject* object = nullptr; if (!JavaLibrary::getObject(source, object)) return 0; templateName = object->getTemplateName(); @@ -598,7 +598,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerOver * @param sourceName the template name used to create the object * @param target the creature to create the object in * - * @return the obj_id of the created object, or null on error + * @return the obj_id of the created object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOverloaded(JNIEnv *env, jobject self, jstring sourceName, jlong target) { @@ -624,7 +624,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOver * @param sourceCrc the template crc to create the object with * @param location where to put the object * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectCrc(JNIEnv *env, jobject self, int sourceCrc, jobject location) { @@ -656,7 +656,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectCrc(JNIEnv *env Transform tr; tr.setPosition_p(newPos); ServerObject *newObject = ServerWorld::createNewObject(sourceCrc, tr, cell, false); - if (newObject != NULL) + if (newObject != nullptr) { // get the networkId to return NetworkId netId = newObject->getNetworkId(); @@ -693,7 +693,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectCrc(JNIEnv *env * @param container the object we want to put our new object into * @param slot the container slot we want to put the object in * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerCrc(JNIEnv *env, jobject self, int sourceCrc, jlong container, jstring slot) { @@ -707,10 +707,10 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerCrc( return 0; // make sure the container exists - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; - if (ContainerInterface::getContainer(*containerOwner) == NULL) + if (ContainerInterface::getContainer(*containerOwner) == nullptr) return 0; //Create the object @@ -773,10 +773,10 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerOver return 0; // make sure the container exists - ServerObject * containerOwner = NULL; + ServerObject * containerOwner = nullptr; if (!JavaLibrary::getObject(container, containerOwner)) return 0; - if (ContainerInterface::getVolumeContainer(*containerOwner) == NULL) + if (ContainerInterface::getVolumeContainer(*containerOwner) == nullptr) { DEBUG_WARNING(true, ("createObjectin an overloaded container only works on volume containers")); return 0; @@ -811,7 +811,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInContainerOver * @param sourceCrc the template crc used to create the object * @param target the creature to create the object in * - * @return the obj_id of the created object, or null on error + * @return the obj_id of the created object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOverloadedCrc( JNIEnv *env, jobject self, int sourceCrc, jlong target) @@ -819,16 +819,16 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOver if (sourceCrc == 0 || target == 0) return 0; - CreatureObject * targetObject = NULL; + CreatureObject * targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return 0; ServerObject * inventory = targetObject->getInventory(); - if (inventory == NULL) + if (inventory == nullptr) return 0; VolumeContainer * volContainer = ContainerInterface::getVolumeContainer(*inventory); - if (volContainer == NULL) + if (volContainer == nullptr) return 0; int oldCapacity = volContainer->debugDoNotUseSetCapacity(-1); @@ -838,7 +838,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOver volContainer->debugDoNotUseSetCapacity(oldCapacity); volContainer->recalculateVolume(); - if (newObject == NULL) + if (newObject == nullptr) return 0; return (newObject->getNetworkId()).getValue(); @@ -852,7 +852,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectInInventoryOver * @param self class calling this function * @param sourceCrc the template crc of the new object to create * @param target an object whose location and container/cell will be used to create the object. - * @return the obj_id of the created object, or null on error + * @return the obj_id of the created object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectAtCrc(JNIEnv *env, jobject self, int sourceCrc, jlong target) { @@ -863,7 +863,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectAtCrc(JNIEnv *e if (target == 0) return 0; - ServerObject *sourceObject = NULL; + ServerObject *sourceObject = nullptr; if (!JavaLibrary::getObject(target, sourceObject)) return 0; @@ -878,7 +878,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectAtCrc(JNIEnv *e Transform tr; tr.setPosition_p(sourceObject->getPosition_p()); ServerObject *newObject = ServerWorld::createNewObject(sourceCrc, tr, cell, false); - if (newObject == NULL) + if (newObject == nullptr) { fprintf(stderr, "WARNING: Could not create object from crc %d\n", sourceCrc); JavaLibrary::printJavaStack(); @@ -911,7 +911,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectAtCrc(JNIEnv *e * @param source the template id or the object id to create the object with * @param location where to put the object * - * @return the new object, or null on error + * @return the new object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectSimulator(JNIEnv *env, jobject self, jstring source, jobject location) { @@ -963,7 +963,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectSimulator(JNIEn Transform tr; tr.setPosition_p(newPos); ServerObject *newObject = ServerWorld::createNewObject(sourceCrc, tr, cell, false); - if (newObject != NULL) + if (newObject != nullptr) { // add on the player object CreatureObject * creature = dynamic_cast(newObject); @@ -1007,7 +1007,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectSimulator(JNIEn */ jboolean JNICALL ScriptMethodsObjectCreateNamespace::destroyObjectSimulator(JNIEnv *env, jobject self, jlong target) { - CreatureObject *playerObject = NULL; + CreatureObject *playerObject = nullptr; // get the object if (!JavaLibrary::getObject(target, playerObject)) { @@ -1046,7 +1046,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::destroyObject(JNIEnv *env, if (targetId == NetworkId::cms_invalid) return JNI_FALSE; - ServerObject* object = NULL; + ServerObject* object = nullptr; bool retval = JavaLibrary::getObject(target, object); if (!retval || !object) // || object->isPersisted()) will be done in permanently destroy @@ -1060,7 +1060,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::destroyObject(JNIEnv *env, { // check if the object is in a FactoryObject crate Object * container = ContainerInterface::getContainedByObject(*object); - if (container != NULL && dynamic_cast(container) != NULL) + if (container != nullptr && dynamic_cast(container) != nullptr) { // destroy an object in the factory; if it is the last object, // the factory will destroy itself @@ -1093,7 +1093,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::destroyObjectHyperspace(JNI if (targetId == NetworkId::cms_invalid) return JNI_FALSE; - ServerObject * object = NULL; + ServerObject * object = nullptr; bool retval = JavaLibrary::getObject(target, object); if(retval && object) { @@ -1120,7 +1120,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::persistObject(JNIEnv *env, UNREF(self); NOT_NULL(env); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; if (object->persist()) { @@ -1144,7 +1144,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::isObjectPersisted(JNIEnv *e UNREF(self); NOT_NULL(env); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -1320,7 +1320,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createNewObjectTransformCrcInt * @param name the name of the theater * @param locationType how to create the theater * - * @return the id of the master theater object, or null on error (bad datatable name or position) + * @return the id of the master theater object, or nullptr on error (bad datatable name or position) */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createTheaterDatatableOnly(JNIEnv *env, jobject self, jstring datatable, jlong caller, jstring name, jint locationType) { @@ -1347,7 +1347,7 @@ int i; // read the object data from the datatable DataTable * dt = DataTableManager::getTable(datatableName, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("JavaLibrary::createTheaterDatatable could not open " "datatable %s", datatableName.c_str())); @@ -1429,7 +1429,7 @@ int i; * @param name the name of the theater * @param locationType how to create the theater * - * @return the id of the master theater object, or null on error (bad datatable name or position) + * @return the id of the master theater object, or nullptr on error (bad datatable name or position) */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createTheaterDatatable(JNIEnv *env, jobject self, jstring datatable, jobject basePosition, jstring script, jlong caller, jstring name, jint locationType) { @@ -1466,7 +1466,7 @@ int i; // read the object data from the datatable DataTable * dt = DataTableManager::getTable(datatableName, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("JavaLibrary::createTheaterDatatable could not open " "datatable %s", datatableName.c_str())); @@ -1567,7 +1567,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl // read the object data from the datatable DataTable * dt = DataTableManager::getTable(datatableName, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable could not open " "datatable %s", datatableName.c_str())); @@ -1613,7 +1613,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl params.addParam(locationType, "locationType"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() == NULL) + if (dictionary.get() == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable could not " "create dictionary for theater datatable %s", datatableName.c_str())); @@ -1624,7 +1624,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl Transform tr; tr.setPosition_p(location); ServerObject * spawner = ServerWorld::createNewObject("object/tangible/spawning/remote_theater_spawner.iff", tr, 0, false); - if (spawner == NULL) + if (spawner == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable unable to " "create remote theater spawner for datatable %s", datatableName.c_str())); @@ -1704,7 +1704,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl // read the object data from the datatable DataTable * dt = DataTableManager::getTable(datatableName, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable could not open " "datatable %s", datatableName.c_str())); @@ -1734,7 +1734,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl params.addParam(locationType, "locationType"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() == NULL) + if (dictionary.get() == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable could not " "create dictionary for theater datatable %s", datatableName.c_str())); @@ -1747,7 +1747,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl Transform tr; tr.setPosition_p(theaterCenter); ServerObject * spawner = ServerWorld::createNewObject("object/tangible/spawning/remote_theater_spawner.iff", tr, 0, false); - if (spawner == NULL) + if (spawner == nullptr) { WARNING(true, ("JavaLibrary::createRemoteTheaterDatatable unable to " "create remote theater spawner for datatable %s", datatableName.c_str())); @@ -1778,7 +1778,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::createRemoteTheaterDatatabl * theater objects have been created * @param caller who's creating the theater * - * @return the id of the master theater object, or null on error + * @return the id of the master theater object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createTheaterCrc(JNIEnv *env, jobject self, jintArray crcs, jobjectArray positions, jobject basePosition, jstring script, jlong caller) { @@ -1843,7 +1843,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createTheaterCrc(JNIEnv *env, * theater objects have been created * @param caller who's creating the theater * - * @return the id of the master theater object, or null on error + * @return the id of the master theater object, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createTheaterString(JNIEnv *env, jobject self, jobjectArray templates, jobjectArray positions, jobject basePosition, jstring script, jlong caller) { @@ -1922,13 +1922,13 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::assignTheaterToPlayer(JNIEn JavaStringParam jdatatable(datatable); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return JNI_FALSE; PlayerObject * const player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; if (player->hasTheater()) @@ -1962,7 +1962,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::assignTheaterToPlayer(JNIEn // read the object data from the datatable DataTable * dt = DataTableManager::getTable(datatableName, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("JavaLibrary::assignTheaterToPlayer could not open " "datatable %s", datatableName.c_str())); @@ -2026,13 +2026,13 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::assignTheaterToPlayerLocati JavaStringParam jdatatable(datatable); JavaStringParam jscript(script); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return JNI_FALSE; PlayerObject * const player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; std::string datatableName; @@ -2094,13 +2094,13 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::unassignTheaterFromPlayer(J if (playerId == 0) return JNI_FALSE; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return JNI_FALSE; PlayerObject * const player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; player->clearTheater(); @@ -2123,13 +2123,13 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::hasTheaterAssigned(JNIEnv * if (playerId == 0) return JNI_FALSE; - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return JNI_FALSE; const PlayerObject * player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return JNI_FALSE; return player->hasTheater(); @@ -2142,7 +2142,7 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::hasTheaterAssigned(JNIEnv * * * @param theater the theater id * - * @return the theater's name, or null if it doesn't have one + * @return the theater's name, or nullptr if it doesn't have one */ jstring JNICALL ScriptMethodsObjectCreateNamespace::getTheaterName(JNIEnv *env, jobject self, jlong theater) { @@ -2167,7 +2167,7 @@ jstring JNICALL ScriptMethodsObjectCreateNamespace::getTheaterName(JNIEnv *env, * * @param name the theater name to look for * - * @return the theater's id, or null if the theater doesn't exist + * @return the theater's id, or nullptr if the theater doesn't exist */ jlong JNICALL ScriptMethodsObjectCreateNamespace::findTheater(JNIEnv *env, jobject self, jstring name) { @@ -2196,7 +2196,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::findTheater(JNIEnv *env, jobje * @param draftSchematic the draft schematic template to create the manufacturing schematic from * @param container the container to put the manufacturing schematic in * - * @return the id of the manufacturing schematic, or null on error + * @return the id of the manufacturing schematic, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createSchematicString(JNIEnv *env, jobject self, jstring draftSchematic, jlong container) { @@ -2222,25 +2222,25 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createSchematicString(JNIEnv * * @param draftSchematicCrc the draft schematic template crc value to create the manufacturing schematic from * @param container the container to put the manufacturing schematic in * - * @return the id of the manufacturing schematic, or null on error + * @return the id of the manufacturing schematic, or nullptr on error */ jlong JNICALL ScriptMethodsObjectCreateNamespace::createSchematicCrc(JNIEnv *env, jobject self, jint draftSchematicCrc, jlong container) { if (draftSchematicCrc == 0 || container == 0) return 0; - ServerObject * containerObject = NULL; + ServerObject * containerObject = nullptr; if (!JavaLibrary::getObject(container, containerObject)) return 0; const DraftSchematicObject * const draftSchematic = DraftSchematicObject::getSchematic( draftSchematicCrc); - if (draftSchematic == NULL) + if (draftSchematic == nullptr) return 0; ManufactureSchematicObject * manfSchematic = ServerWorld::createNewManufacturingSchematic( *draftSchematic, *containerObject, false); - if (manfSchematic == NULL) + if (manfSchematic == nullptr) return 0; return (manfSchematic->getNetworkId()).getValue(); @@ -2260,7 +2260,7 @@ jlong JNICALL ScriptMethodsObjectCreateNamespace::createSchematicCrc(JNIEnv *env jboolean JNICALL ScriptMethodsObjectCreateNamespace::updateNetworkTriggerVolume(JNIEnv *env, jobject self, jlong target, jfloat radius) { - ServerObject * object = NULL; + ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index c50ab576..b285e0be 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -561,15 +561,15 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container { const ServerObject * owner = safe_cast( ContainerInterface::getFirstParentInWorld(container.getOwner())); - const ServerObject * ownerInventory = NULL; - const ServerObject * ownerDatapad = NULL; - const ServerObject * ownerAppearanceInventory = NULL; - const ServerObject * ownerHangar = NULL; + const ServerObject * ownerInventory = nullptr; + const ServerObject * ownerDatapad = nullptr; + const ServerObject * ownerAppearanceInventory = nullptr; + const ServerObject * ownerHangar = nullptr; - if (owner != NULL) + if (owner != nullptr) { const CreatureObject * creature = owner->asCreatureObject(); - if (creature != NULL) + if (creature != nullptr) { ownerInventory = creature->getInventory(); ownerDatapad = creature->getDatapad(); @@ -583,7 +583,7 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container const CachedNetworkId & itemId = *i; const ServerObject * item = safe_cast( itemId.getObject()); - if (item != NULL && item->asTangibleObject() != NULL && + if (item != nullptr && item->asTangibleObject() != nullptr && item->asTangibleObject()->isVisible()) { // @@ -591,14 +591,14 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container // // no player inventory - if (ownerInventory != NULL && ownerInventory->getNetworkId() == + if (ownerInventory != nullptr && ownerInventory->getNetworkId() == item->getNetworkId()) { continue; } // no player datapad - if (ownerDatapad != NULL && ownerDatapad->getNetworkId() == + if (ownerDatapad != nullptr && ownerDatapad->getNetworkId() == item->getNetworkId()) { continue; @@ -613,14 +613,14 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container continue; // no creatures (pets/droids) - if (item->asCreatureObject() != NULL) + if (item->asCreatureObject() != nullptr) continue; // no hair const ServerObjectTemplate * itemTemplate = safe_cast< const ServerObjectTemplate *>(item->getObjectTemplate()); NOT_NULL(itemTemplate); - if (strstr(itemTemplate->getName(), "tangible/hair") != NULL) + if (strstr(itemTemplate->getName(), "tangible/hair") != nullptr) continue; // no Trandoshan feet @@ -631,7 +631,7 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container // see if the item is a container and go through its contents const Container * itemContainer = ContainerInterface::getContainer(*item); - if (itemContainer != NULL) + if (itemContainer != nullptr) getGoodItemsFromContainer(*itemContainer, goodItems); } } @@ -644,7 +644,7 @@ void ScriptMethodsObjectInfoNamespace::getGoodItemsFromContainer(const Container * @param self class calling this function * @param jtemplateCrcs the template crcs * - * @return the names, or null on error + * @return the names, or nullptr on error */ jobjectArray ScriptMethodsObjectInfoNamespace::getNamesFromCrcs(JNIEnv *env, const std::vector & templateCrcs) @@ -661,7 +661,7 @@ jobjectArray ScriptMethodsObjectInfoNamespace::getNamesFromCrcs(JNIEnv *env, // get the server template const ObjectTemplate * ot = ObjectTemplateList::fetch(templateCrcs[i]); - if (ot == NULL) + if (ot == nullptr) { WARNING(true, ("JavaLibrary::getNamesFromTemplateCrcs: Could not " "find object template for crc %d", templateCrcs[i])); @@ -670,13 +670,13 @@ jobjectArray ScriptMethodsObjectInfoNamespace::getNamesFromCrcs(JNIEnv *env, // get the shared template const ServerObjectTemplate * serverOt = ot->asServerObjectTemplate(); - if (serverOt != NULL) + if (serverOt != nullptr) { const std::string sharedTemplateName(serverOt->getSharedTemplate()); serverOt->releaseReference(); - serverOt = NULL; + serverOt = nullptr; ot = ObjectTemplateList::fetch(sharedTemplateName); - if (ot == NULL) + if (ot == nullptr) { WARNING(true, ("JavaLibrary::getNamesFromTemplateCrcs: Could not " "find shared object template %s", sharedTemplateName.c_str())); @@ -685,18 +685,18 @@ jobjectArray ScriptMethodsObjectInfoNamespace::getNamesFromCrcs(JNIEnv *env, } const SharedObjectTemplate * sharedOt = ot->asSharedObjectTemplate(); - if (sharedOt == NULL) + if (sharedOt == nullptr) { WARNING(true, ("JavaLibrary::getNamesFromTemplateCrcs: template %s " "is not a shared template", ot->getName())); ot->releaseReference(); continue; } - ot = NULL; + ot = nullptr; const StringId objectName(sharedOt->getObjectName()); sharedOt->releaseReference(); - sharedOt = NULL; + sharedOt = nullptr; LocalRefPtr jobjectName; if (ScriptConversion::convert(objectName, jobjectName)) @@ -734,7 +734,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setNameFromString(JNIEnv *env JavaStringParam localName(name); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -813,7 +813,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setDescriptionStringId(JNIEnv * e * @param self class calling this function * @param target id of object whose name to get * -* @return the description, or null on error +* @return the description, or nullptr on error */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getDescriptionStringId(JNIEnv * env, jobject self, jlong target) { @@ -837,13 +837,13 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getDescriptionStringId(JNIEnv * @param self class calling this function * @param target id of object whose name to get * - * @return the name, or null on error + * @return the name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getName(JNIEnv *env, jobject self, jlong target) { UNREF(self); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -859,7 +859,7 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getName(JNIEnv *env, jobject s * @param self class calling this function * @param player id of the player to get * - * @return the name, or null on error + * @return the name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getPlayerName(JNIEnv *env, jobject self, jlong target) { @@ -894,13 +894,13 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getPlayerFullName(JNIEnv *env, * @param self class calling this function * @param target id of object whose name to get * - * @return the name, or null on error + * @return the name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getAssignedName(JNIEnv *env, jobject self, jlong target) { UNREF(self); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -915,7 +915,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setCreatureName(JNIEnv * /*env*/, NetworkId const networkId(creature); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { WARNING(true, ("ERROR: ScriptMethodsObjectInfo::setCreatureName() Unable to resolve the object(%s) to a CreatureObject.", networkId.getValueString().c_str())); return; @@ -923,7 +923,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setCreatureName(JNIEnv * /*env*/, AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { WARNING(true, ("ERROR: ScriptMethodsObjectInfo::setCreatureName() Unable to resolve the object's(%s) controller to an AiCreatureController.", creatureObject->getDebugInformation().c_str())); return; @@ -941,14 +941,14 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getCreatureName(JNIEnv * /*env NetworkId const networkId(creature); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { return 0; } AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { return 0; } @@ -972,13 +972,13 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getCreatureName(JNIEnv * /*env * @param self class calling this function * @param target id of object whose name to get * - * @return the name, or null on error + * @return the name, or nullptr on error */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameStringId(JNIEnv *env, jobject self, jlong target) { UNREF(self); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -997,7 +997,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameStringId(JNIEnv *env, j * @param self class calling this function * @param jtemplateName the template name * - * @return the name, or null if the template doesn't exist + * @return the name, or nullptr if the template doesn't exist */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameFromTemplate(JNIEnv *env, jobject self, jstring jtemplateName) @@ -1020,41 +1020,41 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameFromTemplate(JNIEnv *en * @param self class calling this function * @param templateCrc the template crc * - * @return the name, or null if the template doesn't exist + * @return the name, or nullptr if the template doesn't exist */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameFromTemplateCrc(JNIEnv *env, jobject self, jint templateCrc) { const ObjectTemplate * ot = ObjectTemplateList::fetch(templateCrc); - if (ot == NULL) + if (ot == nullptr) return 0; // the name is stored in the shared template, so if this is a server template, // get the shared one from it - const SharedObjectTemplate * sharedOt = NULL; + const SharedObjectTemplate * sharedOt = nullptr; const ServerObjectTemplate * serverOt = dynamic_cast( ot); - if (serverOt != NULL) + if (serverOt != nullptr) { const std::string sharedTemplateName(serverOt->getSharedTemplate()); serverOt->releaseReference(); - serverOt = NULL; + serverOt = nullptr; ot = ObjectTemplateList::fetch(sharedTemplateName); - if (ot == NULL) + if (ot == nullptr) return 0; } sharedOt = dynamic_cast(ot); - if (sharedOt == NULL) + if (sharedOt == nullptr) { ot->releaseReference(); return 0; } - ot = NULL; + ot = nullptr; const StringId objectName(sharedOt->getObjectName()); sharedOt->releaseReference(); - sharedOt = NULL; + sharedOt = nullptr; LocalRefPtr jobjectName; if (!ScriptConversion::convert(objectName, jobjectName)) @@ -1069,7 +1069,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getNameFromTemplateCrc(JNIEnv * @param self class calling this function * @param jtemplateNames the template names * - * @return the names, or null on error + * @return the names, or nullptr on error */ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getNamesFromTemplates(JNIEnv *env, jobject self, jobjectArray jtemplateNames) @@ -1102,7 +1102,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getNamesFromTemplates(JNI * @param self class calling this function * @param jtemplateCrcs the template crcs * - * @return the names, or null on error + * @return the names, or nullptr on error */ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getNamesFromTemplateCrcs(JNIEnv *env, jobject self, jintArray jtemplateCrcs) @@ -1140,7 +1140,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::internalIsAuthoritative(JNIEn { UNREF(self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -1173,7 +1173,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::hasProxyOrAuthObject(JNIEnv * UNREF(self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; // if I'm not authoritative, then I must have an authoritative object on another game server // if I'm authoritative, then see if I'm proxied on any other game server @@ -1447,12 +1447,12 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isAwayFromKeyBoard(JNIEnv *en { UNREF(self); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return JNI_FALSE; PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(playerCreature); - if (playerObj != NULL && playerObj->isAwayFromKeyBoard()) + if (playerObj != nullptr && playerObj->isAwayFromKeyBoard()) { return JNI_TRUE; } @@ -1473,7 +1473,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getObjType(JNIEnv *env, jobject s { UNREF(self); - const Object *object = NULL; + const Object *object = nullptr; if (!JavaLibrary::getObject(target, object)) return -1; @@ -1487,13 +1487,13 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getObjType(JNIEnv *env, jobject s * @param self class calling this function * @param target object we want to check * - * @return the template type, or null on error + * @return the template type, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateId(JNIEnv *env, jobject self, jlong target) { UNREF(self); - const Object *object = NULL; + const Object *object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -1507,12 +1507,12 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateId(JNIEnv *env, job * @param self class calling this function * @param target object we want to check * - * @return the template type, or null on error + * @return the template type, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getSharedObjectTemplateName(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - Object const * object = NULL; + Object const * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -2039,7 +2039,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isDisabled(JNIEnv *env, jobje return JNI_FALSE; // make sure the object isn't a creature or is a vehicle - if (object->asCreatureObject () != NULL && + if (object->asCreatureObject () != nullptr && !GameObjectTypes::isTypeOf (object->getGameObjectType (), SharedObjectTemplate::GOT_vehicle)) return JNI_FALSE; @@ -2093,7 +2093,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isCrafted(JNIEnv *env, jobjec return JNI_FALSE; // make sure the object isn't a creature - if (dynamic_cast(object) != NULL) + if (dynamic_cast(object) != nullptr) return JNI_FALSE; if (object->isCrafted()) @@ -2110,7 +2110,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isCrafted(JNIEnv *env, jobjec * @param self class calling this function * @param target object we want to know about * - * @return the crafter id, or null on error or if the item was not crafted + * @return the crafter id, or nullptr on error or if the item was not crafted */ jlong JNICALL ScriptMethodsObjectInfoNamespace::getCrafter(JNIEnv *env, jobject self, jlong target) { @@ -2168,7 +2168,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setCrafter(JNIEnv *env, jobje */ jfloat JNICALL ScriptMethodsObjectInfoNamespace::getScale(JNIEnv *env, jobject self, jlong target) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return -1.0f; @@ -2190,7 +2190,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setScale(JNIEnv *env, jobject if (scale <= 0) return JNI_FALSE; - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -2375,11 +2375,11 @@ jfloat JNICALL ScriptMethodsObjectInfoNamespace::getLocationDistance(JNIEnv *env // translate local coordinates to world coordinates Object * cell1 = NetworkIdManager::getObjectById(targetCell1); - if (cell1 == NULL) + if (cell1 == nullptr) return -1; const Vector & worldLoc1 = cell1->rotateTranslate_o2w(targetLoc1); Object * cell2 = NetworkIdManager::getObjectById(targetCell2); - if (cell2 == NULL) + if (cell2 == nullptr) return -1; const Vector & worldLoc2 = cell2->rotateTranslate_o2w(targetLoc2); @@ -2433,13 +2433,13 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isLocationInConicalFrustum(JN // translate local coordinates to world coordinates if they are in cells Object * testCell = NetworkIdManager::getObjectById(testCellId); - Vector testWorldLoc = (testCell != NULL) ? testCell->rotateTranslate_o2w(testLoc) : testLoc; + Vector testWorldLoc = (testCell != nullptr) ? testCell->rotateTranslate_o2w(testLoc) : testLoc; Object * startCell = NetworkIdManager::getObjectById(startCellId); - Vector startWorldLoc = (startCell != NULL) ? startCell->rotateTranslate_o2w(startLoc) : startLoc; + Vector startWorldLoc = (startCell != nullptr) ? startCell->rotateTranslate_o2w(startLoc) : startLoc; Object * endCell = NetworkIdManager::getObjectById(endCellId); - Vector endWorldLoc = (endCell != NULL) ? endCell->rotateTranslate_o2w(endLoc) : endLoc; + Vector endWorldLoc = (endCell != nullptr) ? endCell->rotateTranslate_o2w(endLoc) : endLoc; if(use2d) { @@ -2504,13 +2504,13 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isLocationInCone(JNIEnv *env, // translate local coordinates to world coordinates if they are in cells Object * testCell = NetworkIdManager::getObjectById(testCellId); - Vector const& testWorldLoc = (testCell != NULL) ? testCell->rotateTranslate_o2w(testLoc) : testLoc; + Vector const& testWorldLoc = (testCell != nullptr) ? testCell->rotateTranslate_o2w(testLoc) : testLoc; Object * startCell = NetworkIdManager::getObjectById(startCellId); - Vector const & startWorldLoc = (startCell != NULL) ? startCell->rotateTranslate_o2w(startLoc) : startLoc; + Vector const & startWorldLoc = (startCell != nullptr) ? startCell->rotateTranslate_o2w(startLoc) : startLoc; Object * endCell = NetworkIdManager::getObjectById(endCellId); - Vector const & endWorldLoc = (endCell != NULL) ? endCell->rotateTranslate_o2w(endLoc) : endLoc; + Vector const & endWorldLoc = (endCell != nullptr) ? endCell->rotateTranslate_o2w(endLoc) : endLoc; Vector testPointConeSpace = testWorldLoc - startWorldLoc; if(use2d) @@ -2606,7 +2606,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isInWorldCell(JNIEnv *env, jo UNREF(self); NOT_NULL(env); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -2704,7 +2704,7 @@ namespace //-- validate arguments if (!customizationVariable || !context) { - DEBUG_FATAL(true, ("programmer error: callback made with NULL arguments.\n")); + DEBUG_FATAL(true, ("programmer error: callback made with nullptr arguments.\n")); return; } @@ -2736,7 +2736,7 @@ namespace * Java custom_var. * * @return the Java-accessible custom_var instance, the script-side counterpart to - * the given C++-side CustomizationVariable. Will return NULL if + * the given C++-side CustomizationVariable. Will return nullptr if * a Java exception or other error occurs. */ LocalRefPtr ScriptMethodsObjectInfoNamespace::createCustomVar(const jlong &objId, const std::string &variablePathName, CustomizationVariable &variable) @@ -2779,7 +2779,7 @@ LocalRefPtr ScriptMethodsObjectInfoNamespace::createCustomVar(const jlong &objId * Java custom_var. * * @return the Java-accessible ranged_int_custom_var instance, the script-side counterpart to - * the given C++-side CustomizationVariable. Will return NULL if + * the given C++-side CustomizationVariable. Will return nullptr if * a Java exception or other error occurs. */ LocalRefPtr ScriptMethodsObjectInfoNamespace::createRangedIntCustomVar(const jlong &objId, const std::string &variablePathName, RangedIntCustomizationVariable &rangedIntVariable) @@ -2818,7 +2818,7 @@ LocalRefPtr ScriptMethodsObjectInfoNamespace::createRangedIntCustomVar(const jlo * Java custom_var. * * @return the Java-accessible palcolor_custom_var instance, the script-side counterpart to - * the given C++-side CustomizationVariable. Will return NULL if + * the given C++-side CustomizationVariable. Will return nullptr if * a Java exception or other error occurs. */ LocalRefPtr ScriptMethodsObjectInfoNamespace::createPalcolorCustomVar(const jlong &objId, const std::string &variablePathName, PaletteColorCustomizationVariable &variable) @@ -2854,10 +2854,10 @@ LocalRefPtr ScriptMethodsObjectInfoNamespace::createColor(int r, int g, int b, i * Fetch the CustomizationData instance associated with the Object * specified by the given obj_id. * - * This function may return NULL if the specified object doesn't have + * This function may return nullptr if the specified object doesn't have * customization data or if some other error occurs. * - * The caller must call CustomizationData::release() on the non-NULL return + * The caller must call CustomizationData::release() on the non-nullptr return * value when the reference no longer is needed. Failure to do so will cause * a memory leak. * @@ -2865,21 +2865,21 @@ LocalRefPtr ScriptMethodsObjectInfoNamespace::createColor(int r, int g, int b, i * CustomizationData instance should be retrieved. * * @return the CustomizationData instance associated with the specified - * Object. May return NULL if the Object doesn't have customization + * Object. May return nullptr if the Object doesn't have customization * data or if an error occurs. */ CustomizationData *ScriptMethodsObjectInfoNamespace::fetchCustomizationDataFromObjId(jlong objId) { PROFILER_AUTO_BLOCK_DEFINE("JNI::fetchCustomizationDataFromObjId"); if (!objId) - return NULL; + return nullptr; //-- Get the target TangibleObject. TangibleObject *object = 0; if (!JavaLibrary::getObject(objId, object)) { // this Object doesn't exist or isn't derived from TangibleObject - return NULL; + return nullptr; } //-- Fetch the CustomizationData. @@ -2887,15 +2887,15 @@ CustomizationData *ScriptMethodsObjectInfoNamespace::fetchCustomizationDataFromO if (!cdProperty) { // this Object doesn't expose any customization data - return NULL; + return nullptr; } CustomizationData *const customizationData = cdProperty->fetchCustomizationData(); if (!customizationData) { // this shouldn't happen - DEBUG_WARNING(true, ("CustomizationDataProperty returned NULL CustomizationData on fetch().\n")); - return NULL; + DEBUG_WARNING(true, ("CustomizationDataProperty returned nullptr CustomizationData on fetch().\n")); + return nullptr; } //-- return the CustomizationData instance. @@ -2910,7 +2910,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getAllCustomVars(JNIEnv * //-- get the CustomizationData instance for the target object. CustomizationData *const customizationData = fetchCustomizationDataFromObjId(target); if (!customizationData) - return NULL; + return nullptr; //-- collect all local CustomizationVariable instances. // NOTE: if we allow multithreaded access to this code from script, we cannot use this static @@ -2961,7 +2961,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getAllCustomVars(JNIEnv * customizationData->release(); //-- return result - if (customVarArray.get() != NULL) + if (customVarArray.get() != nullptr) return customVarArray->getReturnValue(); return 0; } @@ -2975,7 +2975,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getCustomVarByName(JNIEnv * /* //-- get the CustomizationData instance for the target object. CustomizationData *const customizationData = fetchCustomizationDataFromObjId(target); if (!customizationData) - return NULL; + return nullptr; //-- get the CustomizationVariable for the specified variable name std::string nativeVarPathName; @@ -2983,7 +2983,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getCustomVarByName(JNIEnv * /* CustomizationVariable *const variable = customizationData->findVariable(nativeVarPathName); if (!variable) - return NULL; + return nullptr; //-- create a Java custom_var based on this CustomizationVariable LocalRefPtr newCustomVar = createCustomVar(target, nativeVarPathName, *variable); @@ -3089,7 +3089,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getPalcolorCustomVarSelectedCo customizationData->release(); if (error) - return NULL; + return nullptr; //-- return value return createColor(color.getR(), color.getG(), color.getB(), color.getA())->getReturnValue(); @@ -3196,7 +3196,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getPalcolorCustomVarColor customizationData->release(); //-- return result - if (colorArray.get() != NULL) + if (colorArray.get() != nullptr) return colorArray->getReturnValue(); return 0; } @@ -3205,7 +3205,7 @@ jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getPalcolorCustomVarColor jobjectArray JNICALL ScriptMethodsObjectInfoNamespace::getCtsDestinationClusters(JNIEnv * /*env*/, jobject /*self*/) { - static std::set * s_ctsDestinationClusters = NULL; + static std::set * s_ctsDestinationClusters = nullptr; if (!s_ctsDestinationClusters) { s_ctsDestinationClusters = new std::set; @@ -3449,15 +3449,15 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::kill(JNIEnv *env, jobject sel * @param env Java environment * @param self class calling this function * @param player the player - * @param killer who killed the player (may be null) + * @param killer who killed the player (may be nullptr) * - * @return the corpse id of the player, or null on error + * @return the corpse id of the player, or nullptr on error */ jobject JNICALL ScriptMethodsObjectInfoNamespace::killPlayer(JNIEnv *env, jobject self, jobject player, jobject killer) { static const std::string corpseTemplateName("object/tangible/container/corpse/player_corpse.iff"); - CreatureObject * playerObject = NULL; + CreatureObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return 0; @@ -3474,7 +3474,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::killPlayer(JNIEnv *env, jobjec Transform tr; tr.setPosition_p(playerObject->getPosition_p()); ServerObject * corpse = ServerWorld::createNewObject(corpseTemplateName, tr, cell, true); - if (corpse == NULL) + if (corpse == nullptr) return 0; if (playerObject->makeDead(killerId, corpse->getNetworkId())) @@ -3557,7 +3557,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setInvulnerable(JNIEnv *env, { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -3580,7 +3580,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isInvulnerable(JNIEnv *env, j { UNREF(self); - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -3602,7 +3602,7 @@ jfloat JNICALL ScriptMethodsObjectInfoNamespace::getComplexity(JNIEnv *env, jobj { UNREF(self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return -1; @@ -3625,7 +3625,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setComplexity(JNIEnv *env, jo { UNREF(self); - ServerObject * object = NULL; + ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -3639,7 +3639,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getGameObjectType(JNIEnv *env, jo { UNREF (self); - ServerObject * object = NULL; + ServerObject * object = nullptr; if (!JavaLibrary::getObject(obj, object)) return JNI_FALSE; @@ -3662,13 +3662,13 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getGameObjectTypeFromTemplate(JNI jint JNICALL ScriptMethodsObjectInfoNamespace::getGameObjectTypeFromTemplateCrc(JNIEnv *env, jobject self, jint templateCrc) { const ObjectTemplate * objectTemplate = ObjectTemplateList::fetch(templateCrc); - if (objectTemplate == NULL) + if (objectTemplate == nullptr) return 0; const std::string & sharedTemplateName = safe_cast(objectTemplate)->getSharedTemplate(); const ObjectTemplate * sharedTemplate = ObjectTemplateList::fetch(sharedTemplateName); objectTemplate->releaseReference(); - if (sharedTemplate == NULL) + if (sharedTemplate == nullptr) return 0; jint got = safe_cast(sharedTemplate)->getGameObjectType(); @@ -3710,11 +3710,11 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isGod(JNIEnv *env, jobject se { UNREF (self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; - if (object->getClient() == NULL) + if (object->getClient() == nullptr) return JNI_FALSE; return object->getClient()->isGod(); @@ -3735,11 +3735,11 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getGodLevel(JNIEnv *env, jobject { UNREF (self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; - if (object->getClient() == NULL) + if (object->getClient() == nullptr) return 0; if (object->getClient()->isGod()) @@ -3763,13 +3763,13 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getCount(JNIEnv *env, jobject sel // both Tangible and Intangible have counters, so we have to test for both // cases - const TangibleObject * tangibleObject = NULL; + const TangibleObject * tangibleObject = nullptr; if (JavaLibrary::getObject(target, tangibleObject)) { return tangibleObject->getCount(); } - const IntangibleObject * intangibleObject = NULL; + const IntangibleObject * intangibleObject = nullptr; if (JavaLibrary::getObject(target, intangibleObject)) { return intangibleObject->getCount(); @@ -3795,14 +3795,14 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setCount(JNIEnv *env, jobject // both Tangible and Intangible have counters, so we have to test for both // cases - TangibleObject * tangibleObject = NULL; + TangibleObject * tangibleObject = nullptr; if (JavaLibrary::getObject(target, tangibleObject)) { tangibleObject->setCount(value); return JNI_TRUE; } - IntangibleObject * intangibleObject = NULL; + IntangibleObject * intangibleObject = nullptr; if (JavaLibrary::getObject(target, intangibleObject)) { intangibleObject->setCount(value); @@ -3829,14 +3829,14 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::incrementCount(JNIEnv *env, j // both Tangible and Intangible have counters, so we have to test for both // cases - TangibleObject * tangibleObject = NULL; + TangibleObject * tangibleObject = nullptr; if (JavaLibrary::getObject(target, tangibleObject)) { tangibleObject->incrementCount(delta); return JNI_TRUE; } - IntangibleObject * intangibleObject = NULL; + IntangibleObject * intangibleObject = nullptr; if (JavaLibrary::getObject(target, intangibleObject)) { intangibleObject->incrementCount(delta); @@ -3859,7 +3859,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::incrementCount(JNIEnv *env, j */ jint JNICALL ScriptMethodsObjectInfoNamespace::getCondition(JNIEnv *env, jobject self, jlong target) { - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -3880,7 +3880,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getCondition(JNIEnv *env, jobject */ jboolean JNICALL ScriptMethodsObjectInfoNamespace::hasCondition(JNIEnv *env, jobject self, jlong target, jint condition) { - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -3901,7 +3901,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::hasCondition(JNIEnv *env, job */ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setCondition(JNIEnv *env, jobject self, jlong target, jint condition) { - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -3923,7 +3923,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setCondition(JNIEnv *env, job */ jboolean JNICALL ScriptMethodsObjectInfoNamespace::clearCondition(JNIEnv *env, jobject self, jlong target, jint condition) { - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -4748,7 +4748,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getGroupLevel(JNIEnv *, jobject, { if (!target) { - DEBUG_WARNING (true, ("JavaLibrary::getGroupLevel null target ")); + DEBUG_WARNING (true, ("JavaLibrary::getGroupLevel nullptr target ")); return 0; } @@ -4864,18 +4864,18 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::getVisibleOnMapAndRadar(JNIEn * @param self class calling this function * @param target the object * - * @return the appearance name, or null on error + * @return the appearance name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getAppearance(JNIEnv * env, jobject self, jlong target) { UNREF(self); - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; const SharedObjectTemplate * sharedTemplate = object->getSharedTemplate(); - if (sharedTemplate == NULL) + if (sharedTemplate == nullptr) return 0; JavaString appearance(sharedTemplate->getAppearanceFilename()); @@ -4897,7 +4897,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isInsured(JNIEnv * env, jobje { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -4919,7 +4919,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isAutoInsured(JNIEnv * env, j { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -4941,7 +4941,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isUninsurable(JNIEnv * env, j { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -4959,13 +4959,13 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isUninsurable(JNIEnv * env, j * @param self class calling this function * @param player the player to get objects from * - * @return an array of objects, or null on error + * @return an array of objects, or nullptr on error */ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getInventoryAndEquipment(JNIEnv * env, jobject self, jlong player) { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; @@ -4973,11 +4973,11 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getInventoryAndEquipment(JN // go through the player's inventory const ServerObject * inventoryObject = playerCreature->getInventory(); - if (inventoryObject != NULL) + if (inventoryObject != nullptr) { const VolumeContainer * inventoryContainer = ContainerInterface::getVolumeContainer(*inventoryObject); - if (inventoryContainer != NULL) + if (inventoryContainer != nullptr) { getGoodItemsFromContainer(*inventoryContainer, objectIds); } @@ -4998,7 +4998,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getInventoryAndEquipment(JN // go through the player's equipment SlottedContainer const * const equipmentContainer = ContainerInterface::getSlottedContainer(*playerCreature); - if (equipmentContainer != NULL) + if (equipmentContainer != nullptr) getGoodItemsFromContainer(*equipmentContainer, objectIds); else { @@ -5022,12 +5022,12 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setCheaterLevel(JNIEnv * env, { UNREF(self); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return JNI_FALSE; PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(playerCreature); - if (playerObj != NULL && playerObj->isAuthoritative()) + if (playerObj != nullptr && playerObj->isAuthoritative()) { playerObj->setCheaterLevel(static_cast(level)); return JNI_TRUE; @@ -5042,12 +5042,12 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getCheaterLevel(JNIEnv * env, job { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; PlayerObject const * const playerObj = PlayerCreatureController::getPlayerObject(playerCreature); - if (playerObj != NULL) + if (playerObj != nullptr) { return static_cast(playerObj->getCheaterLevel()); } @@ -5071,7 +5071,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setHouseId(JNIEnv * env, jobj { UNREF(self); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return JNI_FALSE; @@ -5090,13 +5090,13 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setHouseId(JNIEnv * env, jobj * @param self class calling this function * @param player the player * - * @return the house id, or null on error + * @return the house id, or nullptr on error */ jlong JNICALL ScriptMethodsObjectInfoNamespace::getHouseId(JNIEnv * env, jobject self, jlong player) { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; @@ -5113,16 +5113,16 @@ jlong JNICALL ScriptMethodsObjectInfoNamespace::getHouseId(JNIEnv * env, jobject * @param self class calling this function * @param object the manf schematic or factory id * - * @return the draft schematic name, or null on error + * @return the draft schematic name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getDraftSchematic(JNIEnv * env, jobject self, jlong object) { UNREF(self); - const ManufactureObjectInterface * craftable = NULL; + const ManufactureObjectInterface * craftable = nullptr; - const FactoryObject * factoryObject = NULL; - const ManufactureSchematicObject * manfSchematicObject = NULL; + const FactoryObject * factoryObject = nullptr; + const ManufactureSchematicObject * manfSchematicObject = nullptr; if (JavaLibrary::getObject(object, manfSchematicObject)) { craftable = manfSchematicObject; @@ -5136,7 +5136,7 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getDraftSchematic(JNIEnv * env const ConstCharCrcString draftSchematic(ObjectTemplateList::lookUp( craftable->getDraftSchematic())); - if (draftSchematic.getString() == NULL) + if (draftSchematic.getString() == nullptr) return 0; return JavaString(draftSchematic.getString()).getReturnValue(); @@ -5152,16 +5152,16 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getDraftSchematic(JNIEnv * env * @param self class calling this function * @param object the manf schematic or factory id * - * @return the draft schematic name crc, or null on error + * @return the draft schematic name crc, or nullptr on error */ jint JNICALL ScriptMethodsObjectInfoNamespace::getDraftSchematicCrc(JNIEnv * env, jobject self, jlong object) { UNREF(self); - const ManufactureObjectInterface * craftable = NULL; + const ManufactureObjectInterface * craftable = nullptr; - const FactoryObject * factoryObject = NULL; - const ManufactureSchematicObject * manfSchematicObject = NULL; + const FactoryObject * factoryObject = nullptr; + const ManufactureSchematicObject * manfSchematicObject = nullptr; if (JavaLibrary::getObject(object, manfSchematicObject)) { craftable = manfSchematicObject; @@ -5175,7 +5175,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getDraftSchematicCrc(JNIEnv * env const ConstCharCrcString draftSchematic(ObjectTemplateList::lookUp( craftable->getDraftSchematic())); - if (draftSchematic.getString() == NULL) + if (draftSchematic.getString() == nullptr) return 0; return draftSchematic.getCrc(); @@ -5196,7 +5196,7 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getSourceDraftSchematic(JNIEnv * { UNREF(self); - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -5219,13 +5219,13 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getPlayerBirthDate(JNIEnv * env, { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return -1; const PlayerObject * player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return -1; return player->getBornDate(); @@ -5263,13 +5263,13 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getPlayerPlayedTime(JNIEnv * env, { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(playerId, playerCreature)) return -1; const PlayerObject * player = PlayerCreatureController::getPlayerObject( playerCreature); - if (player == NULL) + if (player == nullptr) return -1; return player->getPlayedTime(); @@ -5306,7 +5306,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setBuildingCityId(JNIEnv *env, jo * @param self class calling this function * @param jschematicName the schematic name * - * @return the object name, or null if the schematic doesn't exist + * @return the object name, or nullptr if the schematic doesn't exist */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getProductNameFromSchematic(JNIEnv *env, jobject self, jstring jschematicName) @@ -5319,30 +5319,30 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getProductNameFromSchematic(JN const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( schematicName); - if (schematic == NULL) + if (schematic == nullptr) return 0; const ServerObjectTemplate * serverOt = schematic->getCraftedObjectTemplate(); - if (serverOt == NULL) + if (serverOt == nullptr) return 0; const std::string sharedTemplateName(serverOt->getSharedTemplate()); const ObjectTemplate * ot = ObjectTemplateList::fetch(sharedTemplateName); - if (ot == NULL) + if (ot == nullptr) return 0; const SharedObjectTemplate * sharedOt = dynamic_cast( ot); - if (sharedOt == NULL) + if (sharedOt == nullptr) { ot->releaseReference(); return 0; } - ot = NULL; + ot = nullptr; const StringId objectName(sharedOt->getObjectName()); sharedOt->releaseReference(); - sharedOt = NULL; + sharedOt = nullptr; LocalRefPtr jobjectName; if (!ScriptConversion::convert(objectName, jobjectName)) @@ -5360,37 +5360,37 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getProductNameFromSchematic(JN * @param self class calling this function * @param schematicCrc the schematic name crc * - * @return the object name, or null if the schematic doesn't exist + * @return the object name, or nullptr if the schematic doesn't exist */ jobject JNICALL ScriptMethodsObjectInfoNamespace::getProductNameFromSchematicCrc(JNIEnv *env, jobject self, jint schematicCrc) { const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( schematicCrc); - if (schematic == NULL) + if (schematic == nullptr) return 0; const ServerObjectTemplate * serverOt = schematic->getCraftedObjectTemplate(); - if (serverOt == NULL) + if (serverOt == nullptr) return 0; const std::string sharedTemplateName(serverOt->getSharedTemplate()); const ObjectTemplate * ot = ObjectTemplateList::fetch(sharedTemplateName); - if (ot == NULL) + if (ot == nullptr) return 0; const SharedObjectTemplate * sharedOt = dynamic_cast( ot); - if (sharedOt == NULL) + if (sharedOt == nullptr) { ot->releaseReference(); return 0; } - ot = NULL; + ot = nullptr; const StringId objectName(sharedOt->getObjectName()); sharedOt->releaseReference(); - sharedOt = NULL; + sharedOt = nullptr; LocalRefPtr jobjectName; if (!ScriptConversion::convert(objectName, jobjectName)) @@ -5407,7 +5407,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getProductNameFromSchematicCrc * @param self class calling this function * @param draftSchematic the draft schematic's template * - * @return the template for the item the schematic creates, or null on error + * @return the template for the item the schematic creates, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateCreatedFromSchematic(JNIEnv *env, jobject self, jstring draftSchematic) @@ -5433,7 +5433,7 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateCreatedFromSchemati * @param self class calling this function * @param draftSchematicCrc the draft schematic's template crc * - * @return the template for the item the schematic creates, or null on error + * @return the template for the item the schematic creates, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateCreatedFromSchematicCrc(JNIEnv *env, jobject self, jint draftSchematicCrc) @@ -5445,11 +5445,11 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getTemplateCreatedFromSchemati const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( draftSchematicCrc); - if (schematic == NULL) + if (schematic == nullptr) return 0; const ServerObjectTemplate * serverOt = schematic->getCraftedObjectTemplate(); - if (serverOt == NULL) + if (serverOt == nullptr) return 0; JavaString templateName(serverOt->getName()); @@ -5503,11 +5503,11 @@ jint JNICALL ScriptMethodsObjectInfoNamespace::getTemplateCrcCreatedFromSchemati const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic( draftSchematicCrc); - if (schematic == NULL) + if (schematic == nullptr) return 0; const ServerObjectTemplate * serverOt = schematic->getCraftedObjectTemplate(); - if (serverOt == NULL) + if (serverOt == nullptr) return 0; return Crc::calculate(serverOt->getName()); @@ -5717,7 +5717,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::requestPreloadCompleteTrigger(JNI void JNICALL ScriptMethodsObjectInfoNamespace::activateQuest(JNIEnv * env, jobject self, jlong target, jint questId) { - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5733,7 +5733,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::activateQuest(JNIEnv * env, jobje void JNICALL ScriptMethodsObjectInfoNamespace::deactivateQuest(JNIEnv * env, jobject self, jlong target, jint questId) { - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5749,7 +5749,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::deactivateQuest(JNIEnv * env, job void JNICALL ScriptMethodsObjectInfoNamespace::completeQuest(JNIEnv * env, jobject self, jlong target, jint questId) { - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5766,7 +5766,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::completeQuest(JNIEnv * env, jobje jboolean JNICALL ScriptMethodsObjectInfoNamespace::isQuestComplete(JNIEnv * env, jobject self, jlong target, jint questId) { jboolean result = false; - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { const PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5783,7 +5783,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isQuestComplete(JNIEnv * env, jboolean JNICALL ScriptMethodsObjectInfoNamespace::isQuestActive(JNIEnv * env, jobject self, jlong target, jint questId) { jboolean result = false; - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { const PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5801,7 +5801,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::clearCompletedQuest(JNIEnv * env, { if(questId >= 0) { - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(target, playerCreature)) { PlayerObject * player = PlayerCreatureController::getPlayerObject(playerCreature); @@ -5817,7 +5817,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::clearCompletedQuest(JNIEnv * env, jboolean JNICALL ScriptMethodsObjectInfoNamespace::canTrade(JNIEnv *env, jobject self, jlong target) { - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -5828,7 +5828,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::canTrade(JNIEnv *env, jobject jboolean JNICALL ScriptMethodsObjectInfoNamespace::isNoTradeShared(JNIEnv *env, jobject self, jlong target) { - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -5845,16 +5845,16 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isNoTradeShared(JNIEnv *env, * @param self class calling this function * @param player the player to check * - * @return the theater id, or null on error + * @return the theater id, or nullptr on error */ jlong JNICALL ScriptMethodsObjectInfoNamespace::getLastSpawnedTheater(JNIEnv *env, jobject self, jlong player) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(player, creature)) return 0; const PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature); - if (playerObject == NULL) + if (playerObject == nullptr) return 0; return (playerObject->getTheater()).getValue(); @@ -5930,7 +5930,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setAutoVariableFromByteStream(JNI */ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setBioLink(JNIEnv *env, jobject self, jlong target, jlong link) { - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -5955,7 +5955,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setBioLink(JNIEnv *env, jobje */ jboolean JNICALL ScriptMethodsObjectInfoNamespace::clearBioLink(JNIEnv *env, jobject self, jlong target) { - TangibleObject * object = NULL; + TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -5972,11 +5972,11 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::clearBioLink(JNIEnv *env, job * @param self class calling this function * @param target the item to get the link from * - * @return the bio-link id, null if the item isn't linked + * @return the bio-link id, nullptr if the item isn't linked */ jlong JNICALL ScriptMethodsObjectInfoNamespace::getBioLink(JNIEnv *env, jobject self, jlong target) { - const TangibleObject * object = NULL; + const TangibleObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return 0; @@ -5990,7 +5990,7 @@ jlong JNICALL ScriptMethodsObjectInfoNamespace::getBioLink(JNIEnv *env, jobject float JNICALL ScriptMethodsObjectInfoNamespace::getObjectCollisionRadius(JNIEnv * env, jobject self, jlong jobject_obj) { - const Object * object = NULL; + const Object * object = nullptr; if (!JavaLibrary::getObject(jobject_obj, object)) return 0.0f; @@ -6008,11 +6008,11 @@ float JNICALL ScriptMethodsObjectInfoNamespace::getObjectCollisionRadius(JNIEnv * @param self class calling this function * @param target id of the object * - * @return the name, or null on error + * @return the name, or nullptr on error */ jstring JNICALL ScriptMethodsObjectInfoNamespace::getStaticItemName(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - const ServerObject * o = NULL; + const ServerObject * o = nullptr; if (!JavaLibrary::getObject(target, o)) return 0; @@ -6026,7 +6026,7 @@ jstring JNICALL ScriptMethodsObjectInfoNamespace::getStaticItemName(JNIEnv * /*e jint JNICALL ScriptMethodsObjectInfoNamespace::getStaticItemVersion(JNIEnv *env, jobject /*self*/, jlong target) { - const ServerObject * o = NULL; + const ServerObject * o = nullptr; if (!JavaLibrary::getObject(target, o)) return 0; @@ -6040,7 +6040,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setStaticItemName(JNIEnv * /*env* NetworkId const networkId(target); ServerObject * const o = ServerObject::getServerObject(networkId); - if (o == NULL) + if (o == nullptr) { WARNING(true, ("ERROR: ScriptMethodsObjectInfo::setStaticItemName() Unable to resolve the object(%s).", networkId.getValueString().c_str())); return; @@ -6058,7 +6058,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setStaticItemVersion(JNIEnv * /*e NetworkId const networkId(target); ServerObject * const o = ServerObject::getServerObject(networkId); - if (o == NULL) + if (o == nullptr) { WARNING(true, ("ERROR: ScriptMethodsObjectInfo::setStaticItemVersion() Unable to resolve the object(%s).", networkId.getValueString().c_str())); return; @@ -6071,7 +6071,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setStaticItemVersion(JNIEnv * /*e jint JNICALL ScriptMethodsObjectInfoNamespace::getConversionId(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - const ServerObject * o = NULL; + const ServerObject * o = nullptr; if (!JavaLibrary::getObject(target, o)) return 0; @@ -6085,7 +6085,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setConversionId(JNIEnv * /*env*/, NetworkId const networkId(target); ServerObject * const o = ServerObject::getServerObject(networkId); - if (o == NULL) + if (o == nullptr) { WARNING(true, ("ERROR: ScriptMethodsObjectInfo::setConversionId() Unable to resolve the object(%s).", networkId.getValueString().c_str())); return; @@ -6098,7 +6098,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::setConversionId(JNIEnv * /*env*/, void JNICALL ScriptMethodsObjectInfoNamespace::openCustomizationWindow(JNIEnv *env, jobject self, jlong player, jlong object, jstring customVarName1, jint minVar1, jint maxVar1, jstring customVarName2, jint minVar2, jint maxVar2, jstring customVarName3, jint minVar3, jint maxVar3, jstring customVarName4, jint minVar4, jint maxVar4) { - CreatureObject * playerObject = NULL; + CreatureObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) return; std::string customVarName1String; @@ -6142,7 +6142,7 @@ void JNICALL ScriptMethodsObjectInfoNamespace::openCustomizationWindow(JNIEnv *e NetworkId const objectId(object); - if (playerObject->isPlayerControlled() && playerObject->getController() != NULL) + if (playerObject->isPlayerControlled() && playerObject->getController() != nullptr) { playerObject->getController()->appendMessage( static_cast(CM_openCustomizationWindow), @@ -6253,7 +6253,7 @@ jfloat JNICALL ScriptMethodsObjectInfoNamespace::getDefaultScaleFromSharedObject jboolean JNICALL ScriptMethodsObjectInfoNamespace::setOverrideMapColor(JNIEnv * env, jobject self, jlong object, jint r, jint g, jint b) { - TangibleObject * tangible = NULL; + TangibleObject * tangible = nullptr; if (!JavaLibrary::getObject(object, tangible)) return JNI_FALSE; @@ -6269,7 +6269,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setOverrideMapColor(JNIEnv * jboolean JNICALL ScriptMethodsObjectInfoNamespace::clearOverrideMapColor(JNIEnv * env, jobject self, jlong object) { - TangibleObject * tangible = NULL; + TangibleObject * tangible = nullptr; if (!JavaLibrary::getObject(object, tangible)) return JNI_FALSE; @@ -6285,14 +6285,14 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::clearOverrideMapColor(JNIEnv jobject JNICALL ScriptMethodsObjectInfoNamespace::getOverrideMapColor(JNIEnv * env, jobject self, jlong object) { - TangibleObject * tangible = NULL; + TangibleObject * tangible = nullptr; if (!JavaLibrary::getObject(object, tangible)) - return NULL; + return nullptr; uint8 r, g, b; if(!tangible->getOverrideMapColor(r,g,b)) { - return NULL; + return nullptr; } return createColor(r, g, b, 255)->getReturnValue(); @@ -6302,7 +6302,7 @@ jobject JNICALL ScriptMethodsObjectInfoNamespace::getOverrideMapColor(JNIEnv * e jboolean JNICALL ScriptMethodsObjectInfoNamespace::setForceShowHam(JNIEnv * env, jobject self, jlong object, jboolean show) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(object, creature)) return JNI_FALSE; @@ -6317,8 +6317,8 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setForceShowHam(JNIEnv * env, jboolean JNICALL ScriptMethodsObjectInfoNamespace::isContainedByPlayerAppearanceInventory(JNIEnv *env, jobject self, jlong player, jlong item) { UNREF(self); - ServerObject *itemObj = NULL; - CreatureObject *playerObj = NULL; + ServerObject *itemObj = nullptr; + CreatureObject *playerObj = nullptr; if(!JavaLibrary::getObject(item, itemObj)) { @@ -6348,7 +6348,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllItemsFromAppearanceIn { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; @@ -6356,11 +6356,11 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllItemsFromAppearanceIn // go through the player's appearance inventory const ServerObject * appearanceInventoryObject = playerCreature->getAppearanceInventory(); - if (appearanceInventoryObject != NULL) + if (appearanceInventoryObject != nullptr) { const SlottedContainer * appearanceInvContainer = ContainerInterface::getSlottedContainer(*appearanceInventoryObject); - if (appearanceInvContainer != NULL) + if (appearanceInvContainer != nullptr) { getGoodItemsFromContainer(*appearanceInvContainer, objectIds); } @@ -6395,7 +6395,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isAPlayerAppearanceInventoryC { UNREF(self); - const ServerObject * containerObj = NULL; + const ServerObject * containerObj = nullptr; if (!JavaLibrary::getObject(container, containerObj)) return JNI_FALSE; @@ -6412,7 +6412,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env { UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; @@ -6428,7 +6428,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env DEBUG_WARNING(true, ("JavaLibrary: getAllWornItems - Tried to get all the worn items(INCLUDING appearance items) from player [%s], but this player has no appearance inventory container.", playerCreature->getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } for (ContainerConstIterator i(appearanceInventory->begin()); i != appearanceInventory->end(); ++i) @@ -6436,7 +6436,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env const CachedNetworkId & itemId = *i; const ServerObject * item = safe_cast( itemId.getObject()); - if (item != NULL && item->asTangibleObject() != NULL && + if (item != nullptr && item->asTangibleObject() != nullptr && item->asTangibleObject()->isVisible()) { @@ -6459,7 +6459,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env DEBUG_WARNING(true, ("JavaLibrary: getAllWornItems - Tried to get all the worn items from player [%s], but this player has no creature slot container.", playerCreature->getNetworkId().getValueString().c_str())); - return NULL; + return nullptr; } for (ContainerConstIterator i(inventory->begin()); i != inventory->end(); ++i) @@ -6467,7 +6467,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env const CachedNetworkId & itemId = *i; const ServerObject * item = safe_cast( itemId.getObject()); - if (item != NULL && item->asTangibleObject() != NULL && + if (item != nullptr && item->asTangibleObject() != nullptr && item->asTangibleObject()->isVisible()) { const SlottedContainmentProperty * slottedContainment = ContainerInterface::getSlottedContainmentProperty(*item); // Get the slot property of our item. @@ -6507,7 +6507,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env return returnedIds->getReturnValue(); } - return NULL; + return nullptr; } @@ -6518,7 +6518,7 @@ jlong JNICALL ScriptMethodsObjectInfoNamespace::getAppearanceInventory(JNIEnv *e UNREF(env); UNREF(self); - const CreatureObject * playerCreature = NULL; + const CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) return 0; @@ -6536,11 +6536,11 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::setDecoyOrigin(JNIEnv *env, j UNREF(env); UNREF(self); - CreatureObject * decoyCreature = NULL; + CreatureObject * decoyCreature = nullptr; if (!JavaLibrary::getObject(creature, decoyCreature)) return JNI_FALSE; - const CreatureObject * originCreature = NULL; + const CreatureObject * originCreature = nullptr; if (!JavaLibrary::getObject(origin, originCreature)) return JNI_FALSE; @@ -6561,7 +6561,7 @@ jlong JNICALL ScriptMethodsObjectInfoNamespace::getDecoyOrigin(JNIEnv *env, jobj UNREF(env); UNREF(self); - CreatureObject * decoyCreature = NULL; + CreatureObject * decoyCreature = nullptr; if (!JavaLibrary::getObject(creature, decoyCreature)) return JNI_FALSE; @@ -6578,7 +6578,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::openRatingWindow(JNIEnv * env UNREF(env); UNREF(self); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) { DEBUG_WARNING(true, ("OpenRatingWindow: Failed to get valid creature object with OID %d", player)); @@ -6603,7 +6603,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::openRatingWindow(JNIEnv * env return JNI_FALSE; } - if (playerCreature->isPlayerControlled() && playerCreature->getController() != NULL) + if (playerCreature->isPlayerControlled() && playerCreature->getController() != nullptr) { playerCreature->getController()->appendMessage( static_cast(CM_openRatingWindow), @@ -6626,13 +6626,13 @@ void JNICALL ScriptMethodsObjectInfoNamespace::openExamineWindow(JNIEnv * env, j UNREF(env); UNREF(self); - CreatureObject const * playerCreature = NULL; + CreatureObject const * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature) || !playerCreature || !playerCreature->getClient()) { return; } - ServerObject const * itemObject = NULL; + ServerObject const * itemObject = nullptr; if (!JavaLibrary::getObject(item, itemObject) || !itemObject) { return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectMove.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectMove.cpp index d345c4f0..2ba2beda 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectMove.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectMove.cpp @@ -215,7 +215,7 @@ const JNINativeMethod NATIVES[] = { */ bool ScriptMethodsObjectMoveNamespace::testInvalidObjectMove(const ServerObject * object) { - if (object->getCacheVersion() > 0 || object->getCellProperty() != NULL) + if (object->getCacheVersion() > 0 || object->getCellProperty() != nullptr) { char buffer[1024]; sprintf(buffer, "A script is trying to move object %s, which is a cached " @@ -323,7 +323,7 @@ jboolean JNICALL ScriptMethodsObjectMoveNamespace::setLocationFromObj(JNIEnv *en * @param self class calling this function * @param objectId object to get * - * @return the object's location, or null on error + * @return the object's location, or nullptr on error */ jobject JNICALL ScriptMethodsObjectMoveNamespace::getLocation(JNIEnv *env, jobject self, jlong objectId) { @@ -337,13 +337,13 @@ jobject JNICALL ScriptMethodsObjectMoveNamespace::getLocation(JNIEnv *env, jobje // (e.g. for mounts, the immediate Container is the mount). NOT_NULL(object); CellProperty const *const cellProperty = object->getParentCell(); - Object const *const cell = (cellProperty != NULL) ? &(cellProperty->getOwner()) : NULL; + Object const *const cell = (cellProperty != nullptr) ? &(cellProperty->getOwner()) : nullptr; // Remember, just because we're not in a cell doesn't mean we're not contained by something else, // particularly in the case of a rider mounted where the mount is in the world cell. - Vector const positionRelativeToCellOrWorld = (cell != NULL) ? object->getPosition_c() : + Vector const positionRelativeToCellOrWorld = (cell != nullptr) ? object->getPosition_c() : object->getPosition_w(); - NetworkId const &networkIdForCellOrWorld = (cell != NULL) ? cell->getNetworkId() : + NetworkId const &networkIdForCellOrWorld = (cell != nullptr) ? cell->getNetworkId() : NetworkId::cms_invalid; LocalRefPtr location; @@ -362,7 +362,7 @@ jobject JNICALL ScriptMethodsObjectMoveNamespace::getLocation(JNIEnv *env, jobje * @param self class calling this function * @param objectId object to get * - * @return the object's world location, or null on error + * @return the object's world location, or nullptr on error */ jobject JNICALL ScriptMethodsObjectMoveNamespace::getWorldLocation(JNIEnv *env, jobject self, jlong objectId) { @@ -387,7 +387,7 @@ jobject JNICALL ScriptMethodsObjectMoveNamespace::getWorldLocation(JNIEnv *env, * @param self class calling this function * @param objectId object to get * - * @return the object's location, or null on error + * @return the object's location, or nullptr on error */ jobject JNICALL ScriptMethodsObjectMoveNamespace::getHeading(JNIEnv *env, jobject self, jlong objectId) { @@ -553,7 +553,7 @@ jboolean JNICALL ScriptMethodsObjectMoveNamespace::faceToBehavior(JNIEnv *env, j jfloat JNICALL ScriptMethodsObjectMoveNamespace::getYaw(JNIEnv *env, jobject self, jlong target) { - const ServerObject * object = NULL; + const ServerObject * object = nullptr; if (!JavaLibrary::getObject(target, object)) return -1.0f; @@ -565,7 +565,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getYaw(JNIEnv *env, jobject sel jboolean JNICALL ScriptMethodsObjectMoveNamespace::setYaw(JNIEnv *env, jobject self, jlong target, jfloat yaw) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::setYaw"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::setYaw::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -608,7 +608,7 @@ jboolean JNICALL ScriptMethodsObjectMoveNamespace::setYaw(JNIEnv *env, jobject s void JNICALL ScriptMethodsObjectMoveNamespace::modifyYaw(JNIEnv *env, jobject self, jlong target, jfloat degrees) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyYaw"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyYaw::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -650,7 +650,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::modifyYaw(JNIEnv *env, jobject se void JNICALL ScriptMethodsObjectMoveNamespace::modifyPitch(JNIEnv *env, jobject self, jlong target, jfloat degrees) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyPitch"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyPitch::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -692,7 +692,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::modifyPitch(JNIEnv *env, jobject void JNICALL ScriptMethodsObjectMoveNamespace::modifyRoll(JNIEnv *env, jobject self, jlong target, jfloat degrees) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyRoll"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::modifyRoll::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -734,7 +734,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::modifyRoll(JNIEnv *env, jobject s jfloatArray JNICALL ScriptMethodsObjectMoveNamespace::getQuaternion(JNIEnv *env, jobject self, jlong target) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::getQuaternion"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::getQuaternion::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -771,7 +771,7 @@ jfloatArray JNICALL ScriptMethodsObjectMoveNamespace::getQuaternion(JNIEnv *env, void JNICALL ScriptMethodsObjectMoveNamespace::setQuaternion(JNIEnv *env, jobject self, jlong target, jfloat qw, jfloat qx, jfloat qy, jfloat qz) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::setQuaternion"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::setQuaternion::getObject"); if (!JavaLibrary::getObject(target, object)) @@ -804,7 +804,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setQuaternion(JNIEnv *env, jobjec jint JNICALL ScriptMethodsObjectMoveNamespace::getFurnitureRotationDegree(JNIEnv *env, jobject self, jlong player) { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::getFurnitureRotationDegree"); - ServerObject * object = NULL; + ServerObject * object = nullptr; { PROFILER_AUTO_BLOCK_DEFINE("JavaLibrary::getFurnitureRotationDegree::getObject"); if (!JavaLibrary::getObject(player, object)) @@ -823,11 +823,11 @@ jint JNICALL ScriptMethodsObjectMoveNamespace::getFurnitureRotationDegree(JNIEnv void JNICALL ScriptMethodsObjectMoveNamespace::saveDecorationLayout(JNIEnv *env, jobject self, jlong player, jlong pob, jint saveSlotNumber, jstring description) { - CreatureObject * playerObject = NULL; + CreatureObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject) || !playerObject) return; - ServerObject const * pobObject = NULL; + ServerObject const * pobObject = nullptr; if (!JavaLibrary::getObject(pob, pobObject) || !pobObject) return; @@ -843,11 +843,11 @@ void JNICALL ScriptMethodsObjectMoveNamespace::saveDecorationLayout(JNIEnv *env, void JNICALL ScriptMethodsObjectMoveNamespace::restoreDecorationLayout(JNIEnv *env, jobject self, jlong player, jlong pob, jint saveSlotNumber) { - CreatureObject * playerObject = NULL; + CreatureObject * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject) || !playerObject) return; - ServerObject const * pobObject = NULL; + ServerObject const * pobObject = nullptr; if (!JavaLibrary::getObject(pob, pobObject) || !pobObject) return; @@ -1402,11 +1402,11 @@ jobject JNICALL ScriptMethodsObjectMoveNamespace::getConnectedPlayerLocation(JNI std::map const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData(); std::map::const_iterator const iterFind = connectedCharacterLfgData.find(NetworkId(static_cast(player))); if (iterFind == connectedCharacterLfgData.end()) - return NULL; + return nullptr; LocalRefPtr dictionary = createNewObject(JavaLibrary::getClsDictionary(), JavaLibrary::getMidDictionary()); if (dictionary == LocalRef::cms_nullPtr) - return NULL; + return nullptr; callObjectMethod(*dictionary, JavaLibrary::getMidDictionaryPut(), JavaString("planet").getValue(), JavaString(iterFind->second.locationPlanet).getValue()); @@ -1457,7 +1457,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getMovementSpeed(JNIEnv * /*env NetworkId const networkId(object); CreatureController * const creatureController = CreatureController::getCreatureController(networkId); - return (creatureController != NULL) ? creatureController->getCurrentVelocity().magnitude() : 0.0f; + return (creatureController != nullptr) ? creatureController->getCurrentVelocity().magnitude() : 0.0f; } // ---------------------------------------------------------------------- @@ -1467,7 +1467,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getWalkSpeed(JNIEnv * /*env*/, NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - return (creatureObject != NULL) ? creatureObject->getWalkSpeed() : 0.0f; + return (creatureObject != nullptr) ? creatureObject->getWalkSpeed() : 0.0f; } // ---------------------------------------------------------------------- @@ -1477,7 +1477,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getRunSpeed(JNIEnv * /*env*/, j NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - return (creatureObject != NULL) ? creatureObject->getRunSpeed() : 0.0f; + return (creatureObject != nullptr) ? creatureObject->getRunSpeed() : 0.0f; } // ---------------------------------------------------------------------- @@ -1487,7 +1487,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setBaseWalkSpeed(JNIEnv * /*env*/ NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setBaseWalkSpeed() Unable to resolve the object(%s) to a CreatureObject.", networkId.getValueString().c_str())); return; @@ -1505,7 +1505,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getBaseWalkSpeed(JNIEnv * /*env NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - return (creatureObject != NULL) ? creatureObject->getBaseWalkSpeed() : 0.0f; + return (creatureObject != nullptr) ? creatureObject->getBaseWalkSpeed() : 0.0f; } // ---------------------------------------------------------------------- @@ -1515,7 +1515,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setBaseRunSpeed(JNIEnv * /*env*/, NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setBaseRunSpeed() Unable to resolve the object(%s) to a CreatureObject.", networkId.getValueString().c_str())); return; @@ -1533,7 +1533,7 @@ jfloat JNICALL ScriptMethodsObjectMoveNamespace::getBaseRunSpeed(JNIEnv * /*env* NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - return (creatureObject != NULL) ? creatureObject->getBaseRunSpeed() : 0.0f; + return (creatureObject != nullptr) ? creatureObject->getBaseRunSpeed() : 0.0f; } // ---------------------------------------------------------------------- @@ -1543,7 +1543,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setMovementWalk(JNIEnv * /*env*/, NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setMovementWalk() Unable to resolve the object(%s) to a CreatureObject.", networkId.getValueString().c_str())); return; @@ -1551,7 +1551,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setMovementWalk(JNIEnv * /*env*/, AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setMovementWalk() Unable to resolve the object's(%s) controller to an AiCreatureController.", creatureObject->getDebugInformation().c_str())); return; @@ -1569,7 +1569,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setMovementRun(JNIEnv * /*env*/, NetworkId const networkId(object); CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId); - if (creatureObject == NULL) + if (creatureObject == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setMovementRun() Unable to resolve the object(%s) to a CreatureObject.", networkId.getValueString().c_str())); return; @@ -1577,7 +1577,7 @@ void JNICALL ScriptMethodsObjectMoveNamespace::setMovementRun(JNIEnv * /*env*/, AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController()); - if (aiCreatureController == NULL) + if (aiCreatureController == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsObjectMove::setMovementRun() Unable to resolve the object's(%s) controller to an AiCreatureController.", creatureObject->getDebugInformation().c_str())); return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPermissions.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPermissions.cpp index 732a9f6d..82bf242b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPermissions.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPermissions.cpp @@ -85,7 +85,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetBanned(JNI { ServerObject *serverObj = 0; if (!JavaLibrary::getObject(target, serverObj)) - return NULL; + return nullptr; LocalObjectArrayRefPtr strArray; BuildingObject *buildingObj = dynamic_cast(serverObj); @@ -96,7 +96,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetBanned(JNI if (cellObj) if (ScriptConversion::convert(cellObj->getBanned(), strArray)) return strArray->getReturnValue(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -114,7 +114,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetAllowed(JN { ServerObject *serverObj = 0; if (!JavaLibrary::getObject(target, serverObj)) - return NULL; + return nullptr; LocalObjectArrayRefPtr strArray; BuildingObject *buildingObj = dynamic_cast(serverObj); @@ -125,7 +125,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetAllowed(JN if (cellObj) if (ScriptConversion::convert(cellObj->getAllowed(), strArray)) return strArray->getReturnValue(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPilot.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPilot.cpp index 5d216dc2..96bf045b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPilot.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPilot.cpp @@ -177,7 +177,7 @@ jint JNICALL ScriptMethodsPilotNamespace::spaceUnitGetBehavior(JNIEnv * env, job if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetBehavior() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -200,7 +200,7 @@ jlong JNICALL ScriptMethodsPilotNamespace::spaceUnitGetPrimaryAttackTarget(JNIEn if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetPrimaryAttackTarget() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -223,7 +223,7 @@ jlongArray JNICALL ScriptMethodsPilotNamespace::spaceUnitGetAttackTargetList(JNI if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetAttackTargetList() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -311,7 +311,7 @@ jboolean JNICALL ScriptMethodsPilotNamespace::spaceUnitIsAttacking(JNIEnv * env, if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitIsAttacking() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -334,7 +334,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitIdle(JNIEnv * env, jobject /* if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitIdle() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -357,14 +357,14 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitTrack(JNIEnv * env, jobject / if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitTrack() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); return; } - Object * target = NULL; + Object * target = nullptr; if (!JavaLibrary::getObject(jobject_target, target)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitTrack() The target did not resolve to an Object")); @@ -387,7 +387,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitMoveTo(JNIEnv * env, jobject if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitMoveTo() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -410,7 +410,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitMoveTo(JNIEnv * env, jobject return; } - SpacePath * const path = SpacePathManager::fetch(NULL, aiShipController->getOwner(), aiShipController->getShipRadius()); + SpacePath * const path = SpacePathManager::fetch(nullptr, aiShipController->getOwner(), aiShipController->getShipRadius()); AiShipController::TransformList::const_iterator iterTransformList = convertedPath.begin(); for (; iterTransformList != convertedPath.end(); ++iterTransformList) @@ -435,7 +435,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitAddPatrolPath(JNIEnv * env, j if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitAddPatrolPath() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -483,7 +483,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitClearPatrolPath(JNIEnv * env, if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitClearPatrolPath() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -506,14 +506,14 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitFollow(JNIEnv * env, jobject if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitFollow() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); return; } - Object * followedUnit = NULL; + Object * followedUnit = nullptr; if (!JavaLibrary::getObject(jobject_followedUnit, followedUnit)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitFollow() followedUnit did not resolve to an Object")); @@ -592,10 +592,10 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitAddDamageTaken(JNIEnv * env, } ShipController * const shipController = shipObject->getController()->asShipController(); - AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipController != nullptr) ? shipController->asAiShipController() : nullptr; bool const verifyAttacker = true; - if (aiShipController != NULL) + if (aiShipController != nullptr) { // This adds damage to an AI unit @@ -607,7 +607,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitAddDamageTaken(JNIEnv * env, LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("ScriptMethodsPilot::spaceUnitAddDamageTaken() targetUnit(%s) is not attackable", targetShipObject->getNetworkId().getValueString().c_str())); } } - else if (shipController != NULL) + else if (shipController != nullptr) { // This adds damage to a player unit @@ -635,7 +635,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitSetAttackOrders(JNIEnv * env, if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitSetAttackOrder() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -665,7 +665,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitSetPilotType(JNIEnv * env, jo if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitSetPilotType() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -697,13 +697,13 @@ jstring JNICALL ScriptMethodsPilotNamespace::spaceUnitGetPilotType(JNIEnv * env, LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("ScriptMethodsPilot::spaceUnitGetPilotType()")); if (!verifyShipsEnabled()) - return NULL; + return nullptr; ShipObject * const shipObject = JavaLibrary::getShipThrow(env, jobject_unit, "ScriptMethodsPilot::spaceUnitGetPilotType() unit did not resolve to a ShipObject"); if (!shipObject) - return NULL; + return nullptr; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetPilotType() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -726,7 +726,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitRemoveAttackTarget(JNIEnv * e if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitRemoveAttackTarget() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -765,7 +765,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitSetLeashDistance(JNIEnv * env if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitSetLeashDistance() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -805,7 +805,7 @@ jint JNICALL ScriptMethodsPilotNamespace::spaceUnitGetSquadId(JNIEnv * env, jobj if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetSquadId() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -849,7 +849,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceSquadMoveTo(JNIEnv * /*env*/, job } float const largestShipRadius = squad->getLargestShipRadius(); - SpacePath * const path = SpacePathManager::fetch(NULL, squad, largestShipRadius); + SpacePath * const path = SpacePathManager::fetch(nullptr, squad, largestShipRadius); AiShipController::TransformList::const_iterator iterTransformList = convertedPath.begin(); for (; iterTransformList != convertedPath.end(); ++iterTransformList) @@ -936,7 +936,7 @@ jint JNICALL ScriptMethodsPilotNamespace::spaceSquadRemoveUnit(JNIEnv * env, job if (!shipObject) return JNI_FALSE; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceSquadRemoveUnit() called on unit(%s) without AiShipController", shipObject->getNetworkId().getValueString().c_str())); @@ -1148,7 +1148,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceSquadTrack(JNIEnv * /*env*/, jobj return; } - Object * target = NULL; + Object * target = nullptr; if (!JavaLibrary::getObject(jobject_target, target)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceSquadTrack() The target did not resolve to an Object")); @@ -1171,7 +1171,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceSquadSetLeader(JNIEnv * env, jobj if (!leaderShipObject) return; - AiShipController * const aiShipController = (leaderShipObject->getController()->asShipController() != NULL) ? leaderShipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (leaderShipObject->getController()->asShipController() != nullptr) ? leaderShipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceSquadSetLeader() called on unit(%s) without AiShipController", leaderShipObject->getNetworkId().getValueString().c_str())); @@ -1251,7 +1251,7 @@ void JNICALL ScriptMethodsPilotNamespace::spaceSquadFollow(JNIEnv * /*env*/, job return; } - Object * followedUnit = NULL; + Object * followedUnit = nullptr; if (!JavaLibrary::getObject(jobject_followedUnit, followedUnit)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceSquadFollow() followedUnit did not resolve to an Object")); @@ -1418,7 +1418,7 @@ jint JNICALL ScriptMethodsPilotNamespace::spaceSquadGetGuardTarget(JNIEnv * /*en return JNI_FALSE; } - if (squad->getGuardTarget() == NULL) + if (squad->getGuardTarget() == nullptr) { return 0; } @@ -1463,7 +1463,7 @@ void JNICALL ScriptMethodsPilotNamespace::setShipAggroDistance(JNIEnv * env, job if (!shipObject) return; - AiShipController * const aiShipController = (shipObject->getController()->asShipController() != NULL) ? shipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const aiShipController = (shipObject->getController()->asShipController() != nullptr) ? shipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!aiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::setShipAggroDistance(): unit(%s) does not have an AiShipController",shipObject->getNetworkId().getValueString().c_str())); @@ -1557,14 +1557,14 @@ jobject JNICALL ScriptMethodsPilotNamespace::spaceUnitGetDockTransform(JNIEnv * if (!verifyShipsEnabled()) return 0; - Object * dockTarget = NULL; + Object * dockTarget = nullptr; if (!JavaLibrary::getObject(jobject_dockTarget, dockTarget)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetDockTransform() dockTarget did not resolve to an Object")); return 0; } - Object * dockingUnit = NULL; + Object * dockingUnit = nullptr; if (!JavaLibrary::getObject(jobject_dockingUnit, dockingUnit)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitGetDockTransform() dockingUnit did not resolve to an Object")); @@ -1600,14 +1600,14 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitAddExclusiveAggro(JNIEnv * en return; } - AiShipController * const unitAiShipController = (unitShipObject->getController()->asShipController() != NULL) ? unitShipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const unitAiShipController = (unitShipObject->getController()->asShipController() != nullptr) ? unitShipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!unitAiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitAddExclusiveAggro() called on unit(%s) without AiShipController", unitShipObject->getDebugInformation().c_str())); return; } - Object * pilotObject = NULL; + Object * pilotObject = nullptr; if (!JavaLibrary::getObject(jobject_pilot, pilotObject)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitAddExclusiveAggro() pilot did not resolve to an Object")); @@ -1642,14 +1642,14 @@ void JNICALL ScriptMethodsPilotNamespace::spaceUnitRemoveExclusiveAggro(JNIEnv * return; } - AiShipController * const unitAiShipController = (unitShipObject->getController()->asShipController() != NULL) ? unitShipObject->getController()->asShipController()->asAiShipController() : NULL; + AiShipController * const unitAiShipController = (unitShipObject->getController()->asShipController() != nullptr) ? unitShipObject->getController()->asShipController()->asAiShipController() : nullptr; if (!unitAiShipController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitRemoveExclusiveAggro() called on unit(%s) without AiShipController", unitShipObject->getDebugInformation().c_str())); return; } - Object * pilotObject = NULL; + Object * pilotObject = nullptr; if (!JavaLibrary::getObject(jobject_pilot, pilotObject)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("ScriptMethodsPilot::spaceUnitRemoveExclusiveAggro() pilot did not resolve to an Object")); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp index 00aa9c9d..0234a47c 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp @@ -127,7 +127,7 @@ jlong JNICALL ScriptMethodsPlayerAccountNamespace::getPlayerObject(JNIEnv *env, jlong objId = 0; - ServerObject * creatureServerObject = NULL; + ServerObject * creatureServerObject = nullptr; if (JavaLibrary::getObject(creature,creatureServerObject)) { SlotId slot = SlotIdManager::findSlotId(ConstCharCrcLowerString("ghost")); @@ -258,11 +258,11 @@ jobject JNICALL ScriptMethodsPlayerAccountNamespace::getAccountTimeData(JNIEnv * const PlayerObject * player = PlayerCreatureController::getPlayerObject( creature); - if (player == NULL) + if (player == nullptr) return 0; const Client * client = creature->getClient(); - if (client == NULL) + if (client == nullptr) return 0; // get the values that came from Platform @@ -463,7 +463,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse * @returns a dictionary that contains the following data in paralled arrays * with the oldest CTS transaction first and the newest CTS transaction last * -* @returns null if the character doesn't have any CTS history +* @returns nullptr if the character doesn't have any CTS history * * string[] character_name full name of the source character * string[] cluster_name name of the source cluster @@ -471,7 +471,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse */ jobject JNICALL ScriptMethodsPlayerAccountNamespace::getCharacterCtsHistory(JNIEnv * env, jobject self, jlong player) { - CreatureObject const * playerObject = NULL; + CreatureObject const * playerObject = nullptr; if (!JavaLibrary::getObject(player, playerObject)) { DEBUG_WARNING(true, ("JavaLibrary::getCharacterCtsHistory: bad player object")); @@ -491,7 +491,7 @@ jobject JNICALL ScriptMethodsPlayerAccountNamespace::getCharacterCtsHistory(JNIE if (i.getValue(ctsTransactionDetail)) { Unicode::UnicodeStringVector tokens; - if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4)) + if (Unicode::tokenize(ctsTransactionDetail, tokens, nullptr, nullptr) && (tokens.size() >= 4)) { Unicode::String * characterName = new Unicode::String(); for (size_t i = 3, j = tokens.size(); i < j; ++i) @@ -538,13 +538,13 @@ jobject JNICALL ScriptMethodsPlayerAccountNamespace::getCharacterCtsHistory(JNIE * for the particular CTS source character that this character at one time transferred from * with the oldest CTS transaction first and the newest CTS transaction last * -* @returns null if the character doesn't have any retroactive CTS objvars history +* @returns nullptr if the character doesn't have any retroactive CTS objvars history */ jobjectArray JNICALL ScriptMethodsPlayerAccountNamespace::getCharacterRetroactiveCtsObjvars(JNIEnv * env, jobject self, jlong player) { std::vector > const *> const & characterRetroactiveCtsObjvars = GameServer::getRetroactiveCtsHistoryObjvars(NetworkId(static_cast(player))); if (characterRetroactiveCtsObjvars.empty()) - return NULL; + return nullptr; LocalObjectArrayRefPtr results = createNewObjectArray(characterRetroactiveCtsObjvars.size(), JavaLibrary::getClsDictionary()); for (size_t i = 0, size = characterRetroactiveCtsObjvars.size(); i < size; ++i) @@ -603,7 +603,7 @@ jobjectArray JNICALL ScriptMethodsPlayerAccountNamespace::qualifyForFreeCts(JNIE // see if we can/should bypass the free CTS time restriction if (!freeCtsInfo && ConfigServerGame::getAllowIgnoreFreeCtsTimeRestriction()) { - CreatureObject const * playerObject = NULL; + CreatureObject const * playerObject = nullptr; if (JavaLibrary::getObject(player, playerObject) && playerObject && playerObject->getClient() && playerObject->getClient()->isGod()) { freeCtsInfo = FreeCtsDataTable::getFreeCtsInfoForCharacter(characterCreateTime, GameServer::getInstance().getClusterName(), true); @@ -615,7 +615,7 @@ jobjectArray JNICALL ScriptMethodsPlayerAccountNamespace::qualifyForFreeCts(JNIE } if (!freeCtsInfo || freeCtsInfo->targetCluster.empty()) - return NULL; + return nullptr; LocalObjectArrayRefPtr valueArray = createNewObjectArray(freeCtsInfo->targetCluster.size(), JavaLibrary::getClsString()); @@ -634,7 +634,7 @@ jobjectArray JNICALL ScriptMethodsPlayerAccountNamespace::qualifyForFreeCts(JNIE */ void JNICALL ScriptMethodsPlayerAccountNamespace::validateFreeCts(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring destinationGalaxy, jstring destinationCharacterName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::validateFreeCts: bad CreatureObject")); @@ -674,7 +674,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateFreeCts(JNIEnv * /*env */ void JNICALL ScriptMethodsPlayerAccountNamespace::performFreeCts(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring destinationGalaxy, jstring destinationCharacterName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::performFreeCts: bad CreatureObject")); @@ -713,7 +713,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::performFreeCts(JNIEnv * /*env* */ void JNICALL ScriptMethodsPlayerAccountNamespace::validateCts(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring destinationGalaxy, jstring destinationCharacterName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::validateCts: bad CreatureObject")); @@ -753,7 +753,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateCts(JNIEnv * /*env*/, */ void JNICALL ScriptMethodsPlayerAccountNamespace::performCts(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring destinationGalaxy, jstring destinationCharacterName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::performCts: bad CreatureObject")); @@ -792,7 +792,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::performCts(JNIEnv * /*env*/, j */ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv *env, jobject self, jlong player, jstring newName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::validateRenameCharacter: bad CreatureObject")); @@ -819,7 +819,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv bool lastNameChangeOnly = false; static Unicode::String const delimiters(Unicode::narrowToWide(" ")); Unicode::UnicodeStringVector newNameTokens; - if (!Unicode::tokenize(newNameString, newNameTokens, &delimiters, NULL)) + if (!Unicode::tokenize(newNameString, newNameTokens, &delimiters, nullptr)) newNameTokens.clear(); size_t const newNameTokensCount = newNameTokens.size(); @@ -846,7 +846,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv { Unicode::String const uniqueRandomName = NameManager::getInstance().generateUniqueRandomName(ConfigServerGame::getCharacterNameGeneratorDirectory(), creatureTemplate->getNameGeneratorType()); Unicode::UnicodeStringVector uniqueRandomNameTokens; - if (!Unicode::tokenize(uniqueRandomName, uniqueRandomNameTokens, &delimiters, NULL)) + if (!Unicode::tokenize(uniqueRandomName, uniqueRandomNameTokens, &delimiters, nullptr)) uniqueRandomNameTokens.clear(); newNameString = ((uniqueRandomNameTokens.size() >= 1) ? uniqueRandomNameTokens[0] : delimiters) + delimiters + newNameTokens[1]; @@ -861,7 +861,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv params.addParam("@ui:name_declined_racially_inappropriate", "reason"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(creatureObject->getNetworkId(), "renameCharacterNameValidationFail", dictionary->getSerializedData(), 0, false); @@ -879,7 +879,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv params.addParam(errorText.c_str(), "reason"); ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); MessageToQueue::getInstance().sendMessageToJava(creatureObject->getNetworkId(), "renameCharacterNameValidationFail", dictionary->getSerializedData(), 0, false); @@ -906,7 +906,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::validateRenameCharacter(JNIEnv */ void JNICALL ScriptMethodsPlayerAccountNamespace::renameCharacterReleaseNameReservation(JNIEnv *env, jobject self, jlong player) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::renameCharacterReleaseNameReservation: bad CreatureObject")); @@ -929,7 +929,7 @@ void JNICALL ScriptMethodsPlayerAccountNamespace::renameCharacterReleaseNameRese */ void JNICALL ScriptMethodsPlayerAccountNamespace::renameCharacter(JNIEnv *env, jobject self, jlong player, jstring newName) { - CreatureObject const * creatureObject = NULL; + CreatureObject const * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) { DEBUG_WARNING(true, ("JavaLibrary::renameCharacter: bad CreatureObject")); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp index 2e523419..e72745fe 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerQuest.cpp @@ -159,7 +159,7 @@ jboolean ScriptMethodsPlayerQuestNamespace::addPlayerQuestTask(JNIEnv * env, job std::string sceneId; if (!ScriptConversion::convertWorld(waypointLocation, waypointVec, sceneId)) { - // NULL or Invalid Location passed in. That's fine, just means no waypoint. + // nullptr or Invalid Location passed in. That's fine, just means no waypoint. if(questObject) { std::string titleString; @@ -456,7 +456,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestWaypoint(JNIEnv * env, if(!JavaLibrary::getObject(quest, questObject)) { WARNING(true, ("getPlayerQuestWaypoint: Could not get valid Player Quest Object from OID: %d", quest)); - return NULL; + return nullptr; } if(questObject) @@ -465,7 +465,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestWaypoint(JNIEnv * env, return jString.getReturnValue(); } - return NULL; + return nullptr; } @@ -520,7 +520,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTitle(JNIEnv * env, job if(!JavaLibrary::getObject(quest, questObject)) { WARNING(true, ("getPlayerQuestTitle: Could not get valid Player Quest Object from OID: %d", quest)); - return NULL; + return nullptr; } if(questObject) @@ -529,7 +529,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTitle(JNIEnv * env, job return returnVal.getReturnValue(); } - return NULL; + return nullptr; } jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestDescription(JNIEnv * env, jobject self, jlong quest) @@ -541,7 +541,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestDescription(JNIEnv * en if(!JavaLibrary::getObject(quest, questObject)) { WARNING(true, ("getPlayerQuestDescription: Could not get valid Player Quest Object from OID: %d", quest)); - return NULL; + return nullptr; } if(questObject) @@ -550,7 +550,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestDescription(JNIEnv * en return returnVal.getReturnValue(); } - return NULL; + return nullptr; } jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskTitle(JNIEnv * env, jobject self, jlong quest, jint index) @@ -562,7 +562,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskTitle(JNIEnv * env, if(!JavaLibrary::getObject(quest, questObject)) { WARNING(true, ("getPlayerQuestTaskTitle: Could not get valid Player Quest Object from OID: %d", quest)); - return NULL; + return nullptr; } if(questObject) @@ -571,7 +571,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskTitle(JNIEnv * env, return returnVal.getReturnValue(); } - return NULL; + return nullptr; } jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskDescription(JNIEnv * env, jobject self, jlong quest, jint index) @@ -583,7 +583,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskDescription(JNIEnv if(!JavaLibrary::getObject(quest, questObject)) { WARNING(true, ("getPlayerQuestTaskDescription: Could not get valid Player Quest Object from OID: %d", quest)); - return NULL; + return nullptr; } if(questObject) @@ -592,7 +592,7 @@ jobject ScriptMethodsPlayerQuestNamespace::getPlayerQuestTaskDescription(JNIEnv return returnVal.getReturnValue(); } - return NULL; + return nullptr; } void ScriptMethodsPlayerQuestNamespace::setPlayerQuestRecipe(JNIEnv * env, jobject self, jlong quest, jboolean recipe) @@ -768,21 +768,21 @@ void ScriptMethodsPlayerQuestNamespace::openPlayerQuestRecipe(JNIEnv * env, jobj UNREF(env); UNREF(self); - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature)) { DEBUG_WARNING(true, ("openPlayerQuestRecipe: Failed to get valid creature object with OID %d", player)); return; } - ServerObject * recipeObj = NULL; + ServerObject * recipeObj = nullptr; if (!JavaLibrary::getObject(recipe, recipeObj)) { DEBUG_WARNING(true, ("openPlayerQuestRecipe: Failed to get valid recipe object with OID %d", player)); return; } - if (playerCreature->isPlayerControlled() && playerCreature->getController() != NULL) + if (playerCreature->isPlayerControlled() && playerCreature->getController() != nullptr) { playerCreature->getController()->appendMessage( static_cast(CM_openRecipe), @@ -801,7 +801,7 @@ void ScriptMethodsPlayerQuestNamespace::resetAllPlayerQuestData(JNIEnv * env, jo UNREF(env); UNREF(self); - PlayerQuestObject * playerQuest = NULL; + PlayerQuestObject * playerQuest = nullptr; if (!JavaLibrary::getObject(quest, playerQuest)) { DEBUG_WARNING(true, ("resetAllPlayerQuestData: Failed to get valid recipe object with OID %d", quest)); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPvp.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPvp.cpp index b27444e7..75b7f1ec 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPvp.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPvp.cpp @@ -43,7 +43,7 @@ namespace ScriptMethodsPvpNamespace const char * makeCopyOfString(const char * rhs) { - char * lhs = NULL; + char * lhs = nullptr; if (rhs) { lhs = new char[strlen(rhs) + 1]; @@ -668,7 +668,7 @@ jobjectArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemyFlags(JNIEnv *env, jo if (ScriptConversion::convert(enemyStrings, strArray)) return strArray->getReturnValue(); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -749,7 +749,7 @@ jboolean JNICALL ScriptMethodsPvpNamespace::pvpHasBattlefieldEnemyFlag(JNIEnv *e * @param actor The actor for the enemy check * @param from The center of the range * @param range The distance to query. - * @return null if there is an error, or an array of enemy objects which are in range. + * @return nullptr if there is an error, or an array of enemy objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInRange(JNIEnv *env, jobject self, jlong actor, jlong location, jfloat range) { @@ -799,7 +799,7 @@ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInRange(JNIEnv *env, * @param angle The cone angle, in degrees, that the cone sweeps out. The * total cone angle is twice this angle; therefore, this angle * represents the angle swept out to each side of the cone axis. - * @return null if there is an error, or an array of enemy objects which are in range. + * @return nullptr if there is an error, or an array of enemy objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInCone(JNIEnv *env, jobject self, jlong actor, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -853,7 +853,7 @@ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInCone(JNIEnv *env, j * @param angle The cone angle, in degrees, that the cone sweeps out. The * total cone angle is twice this angle; therefore, this angle * represents the angle swept out to each side of the cone axis. - * @return null if there is an error, or an array of enemy objects which are in range. + * @return nullptr if there is an error, or an array of enemy objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInConeLocation(JNIEnv *env, jobject self, jlong actor, jlong coneCenterObjectId, jobject coneDirectionLocation, jfloat range, jfloat angle) { @@ -900,7 +900,7 @@ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetEnemiesInConeLocation(JNIEnv * @param actor The actor for the canAttack check * @param from The center of the range * @param range The distance to query. - * @return null if there is an error, or an array of attackable objects which are in range. + * @return nullptr if there is an error, or an array of attackable objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetTargetsInRange(JNIEnv *env, jobject self, jlong actor, jlong location, jfloat range) { @@ -951,7 +951,7 @@ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetTargetsInRange(JNIEnv *env, * @param angle The cone angle, in degrees, that the cone sweeps out. The * total cone angle is twice this angle; therefore, this angle * represents the angle swept out to each side of the cone axis. - * @return null if there is an error, or an array of attackable objects which are in range. + * @return nullptr if there is an error, or an array of attackable objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetTargetsInCone(JNIEnv *env, jobject self, jlong actor, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -1005,7 +1005,7 @@ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetTargetsInCone(JNIEnv *env, j * @param angle The cone angle, in degrees, that the cone sweeps out. The * total cone angle is twice this angle; therefore, this angle * represents the angle swept out to each side of the cone axis. - * @return null if there is an error, or an array of attackable objects which are in range. + * @return nullptr if there is an error, or an array of attackable objects which are in range. */ jlongArray JNICALL ScriptMethodsPvpNamespace::pvpGetTargetsInConeLocation(JNIEnv *env, jobject self, jlong actor, jlong coneCenterObjectId, jobject coneDirectionLocation, jfloat range, jfloat angle) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsQuest.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsQuest.cpp index 43d65ff7..ea237c93 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsQuest.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsQuest.cpp @@ -35,7 +35,7 @@ namespace ScriptMethodsQuestNamespace { PlayerObject * getPlayerForCharacter(jlong playerCreatureId) { - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerCreatureId, playerCreature)) { return PlayerCreatureController::getPlayerObject(playerCreature); @@ -44,7 +44,7 @@ namespace ScriptMethodsQuestNamespace { NetworkId id(playerCreatureId); JAVA_THROW_SCRIPT_EXCEPTION(true, ("Requested player %s, who could not be found.", id.getValueString().c_str())); - return NULL; + return nullptr; } } @@ -397,8 +397,8 @@ void JNICALL ScriptMethodsQuestNamespace::questSetQuestTaskCounter(JNIEnv *env, } PlayerObject * const playerObject = getPlayerForCharacter(playerId); - CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : NULL; - Controller * const controller = creatureObject ? creatureObject->getController() : NULL; + CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : nullptr; + Controller * const controller = creatureObject ? creatureObject->getController() : nullptr; if(!controller) return; @@ -427,8 +427,8 @@ void JNICALL ScriptMethodsQuestNamespace::questSetQuestTaskLocation(JNIEnv *env, } PlayerObject * const playerObject = getPlayerForCharacter(playerId); - CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : NULL; - Controller * const controller = creatureObject ? creatureObject->getController() : NULL; + CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : nullptr; + Controller * const controller = creatureObject ? creatureObject->getController() : nullptr; if(!controller) return; @@ -456,8 +456,8 @@ void JNICALL ScriptMethodsQuestNamespace::questSetQuestTaskTimer(JNIEnv *env, jo } PlayerObject * const playerObject = getPlayerForCharacter(playerId); - CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : NULL; - Controller * const controller = creatureObject ? creatureObject->getController() : NULL; + CreatureObject * const creatureObject = playerObject ? playerObject->getCreatureObject() : nullptr; + Controller * const controller = creatureObject ? creatureObject->getController() : nullptr; if(!controller) return; @@ -487,7 +487,7 @@ void JNICALL ScriptMethodsQuestNamespace::requestActivateQuest(JNIEnv * env, job return; } - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerId, playerCreature) && playerCreature) { Quest const * const q = QuestManager::getQuest(questCrc); @@ -557,7 +557,7 @@ void JNICALL ScriptMethodsQuestNamespace::requestCompleteQuest(JNIEnv * env, job return; } - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerId, playerCreature) && playerCreature) { Quest const * const q = QuestManager::getQuest(questCrc); @@ -576,14 +576,14 @@ void JNICALL ScriptMethodsQuestNamespace::showCyberneticsPage(JNIEnv *env, jobje { MessageQueueCyberneticsOpen::OpenType const type = static_cast(openType); - CreatureObject * npc = NULL; + CreatureObject * npc = nullptr; if (!JavaLibrary::getObject(npcId, npc)) return; if(!npc) return; - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerId, playerCreature)) { Controller * const playerController = playerCreature->getController(); @@ -659,7 +659,7 @@ void JNICALL ScriptMethodsQuestNamespace::sendStaticItemDataToPlayer(JNIEnv *env } //send to player - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerId, playerCreature)) { Controller * const playerController = playerCreature->getController(); @@ -683,7 +683,7 @@ void JNICALL ScriptMethodsQuestNamespace::showLootBox(JNIEnv *env, jobject self, return; //send to player - CreatureObject * playerCreature = NULL; + CreatureObject * playerCreature = nullptr; if (JavaLibrary::getObject(playerId, playerCreature)) { Controller * const playerController = playerCreature->getController(); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp index 9a393578..d028ee48 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsRegion.cpp @@ -115,7 +115,7 @@ LocalObjectArrayRefPtr ScriptMethodsRegionNamespace::_getRegionsAtPoint(jobject std::vector result; RegionMaster::getRegionsAtPoint(sceneId, locationVec.x, locationVec.z, result); - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) return LocalObjectArrayRef::cms_nullPtr; @@ -127,7 +127,7 @@ LocalObjectArrayRefPtr ScriptMethodsRegionNamespace::_getRegionsAtPoint(jobject { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if (!ScriptConversion::convert(*r, javaRegion)) return LocalObjectArrayRef::cms_nullPtr; @@ -195,7 +195,7 @@ void JNICALL ScriptMethodsRegionNamespace::createCircleRegion(JNIEnv *env, jobje UNREF(self); // validate scripter's input - if (center == NULL || radius <= 0 || name == 0) + if (center == nullptr || radius <= 0 || name == 0) return; JavaStringParam jname(name); @@ -239,7 +239,7 @@ jobject JNICALL ScriptMethodsRegionNamespace::getRegion(JNIEnv *env, jobject sel return 0; const Region * r = RegionMaster::getRegionByName(planetName, regionName); - if (r == NULL) + if (r == nullptr) return 0; LocalRefPtr jr; @@ -255,7 +255,7 @@ jobject JNICALL ScriptMethodsRegionNamespace::getRegion(JNIEnv *env, jobject sel jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsAtPoint(JNIEnv *env, jobject self, jobject location) { LocalObjectArrayRefPtr regions = _getRegionsAtPoint(location); - if (regions.get() == NULL) + if (regions.get() == nullptr) return 0; return regions->getReturnValue(); } @@ -279,9 +279,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegions(JNIEnv *env, jobje std::vector result; RegionMaster::getRegionsForPlanet(sceneId, result); - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -291,11 +291,11 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegions(JNIEnv *env, jobje { LocalRefPtr javaRegion; const Region * r = *i; - if (r != NULL) + if (r != nullptr) { if (!ScriptConversion::convert(*r, javaRegion)) { - return NULL; + return nullptr; } } setObjectArrayElement(*regions, index, *javaRegion); @@ -329,7 +329,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithPvP(JNIEnv *env goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -342,7 +342,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithPvP(JNIEnv *env LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -375,7 +375,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithBuildable(JNIEn goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -388,7 +388,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithBuildable(JNIEn LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -421,7 +421,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMunicipal(JNIEn goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -434,7 +434,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMunicipal(JNIEn LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -467,7 +467,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithGeographical(JN goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -480,7 +480,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithGeographical(JN LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -513,7 +513,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithDifficulty(JNIE goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -526,7 +526,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithDifficulty(JNIE LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -559,7 +559,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithSpawnable(JNIEn goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -572,7 +572,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithSpawnable(JNIEn LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -605,7 +605,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMission(JNIEnv goodRegions.push_back(*i); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (goodRegions.empty()) return 0; @@ -618,7 +618,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMission(JNIEnv LocalRefPtr javaRegion; if (!ScriptConversion::convert(**it, javaRegion)) { - return NULL; + return nullptr; } setObjectArrayElement(*result, index, *javaRegion); } @@ -657,7 +657,7 @@ jboolean JNICALL ScriptMethodsRegionNamespace::deleteRegion(JNIEnv *env, jobject return JNI_FALSE; UniverseObject * regionObject = dynamic_cast(r->getDynamicRegionId().getObject()); - if (regionObject == NULL) + if (regionObject == nullptr) return JNI_FALSE; regionObject->permanentlyDestroy(DeleteReasons::Script); return JNI_TRUE; @@ -711,7 +711,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionExtent(JNIEnv *env, //----------------------------------------------------------------------- /** Find a random point in the given region - * @return a script.location inside the region, or a null reference if any problems occur + * @return a script.location inside the region, or a nullptr reference if any problems occur */ jobject JNICALL ScriptMethodsRegionNamespace::findPointInRegion(JNIEnv *env, jobject self, jobject region) { @@ -732,7 +732,7 @@ jobject JNICALL ScriptMethodsRegionNamespace::findPointInRegion(JNIEnv *env, job Vector loc3d(x, 0, z); LocalRefPtr location; if (!ScriptConversion::convert(loc3d, r->getPlanet(), NetworkId::cms_invalid, location)) - return NULL; + return nullptr; return location->getReturnValue(); } @@ -744,7 +744,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithPvPAtPoint(JNIE { //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -760,9 +760,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithPvPAtPoint(JNIE result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -772,10 +772,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithPvPAtPoint(JNIE { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if (!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -790,7 +790,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithBuildableAtPoin { //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -806,9 +806,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithBuildableAtPoin result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -818,10 +818,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithBuildableAtPoin { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -837,7 +837,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMunicipalAtPoin PROFILER_AUTO_BLOCK_DEFINE("JNI::getRegionsWithMunicipalAtPoint"); //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -853,9 +853,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMunicipalAtPoin result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -865,10 +865,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMunicipalAtPoin { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -884,7 +884,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithGeographicalAtP PROFILER_AUTO_BLOCK_DEFINE("JNI::getRegionsWithGeographicalAtPoint"); //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -900,9 +900,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithGeographicalAtP result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -912,10 +912,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithGeographicalAtP { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -930,7 +930,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithDifficultyAtPoi { //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -946,9 +946,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithDifficultyAtPoi result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -958,10 +958,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithDifficultyAtPoi { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -976,7 +976,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithSpawnableAtPoin { //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -992,9 +992,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithSpawnableAtPoin result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -1004,10 +1004,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithSpawnableAtPoin { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -1022,7 +1022,7 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMissionAtPoint( { //get all the regions at the given point LocalObjectArrayRefPtr regionsAtPoint = _getRegionsAtPoint(location); - if (regionsAtPoint.get() == NULL || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) + if (regionsAtPoint.get() == nullptr || regionsAtPoint == LocalObjectArrayRef::cms_nullPtr) return 0; //parse out the ones with the right property @@ -1038,9 +1038,9 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMissionAtPoint( result.push_back(r); } - //-- return null instead of a zero-length array + //-- return nullptr instead of a zero-length array if (result.empty ()) - return NULL; + return nullptr; //put them into the jobjectarray LocalObjectArrayRefPtr regions = createNewObjectArray(result.size(), JavaLibrary::getClsRegion()); @@ -1050,10 +1050,10 @@ jobjectArray JNICALL ScriptMethodsRegionNamespace::getRegionsWithMissionAtPoint( { LocalRefPtr javaRegion; const Region * r = *it; - if (r != NULL) + if (r != nullptr) { if(!ScriptConversion::convert(*r, javaRegion)) - return NULL; + return nullptr; } setObjectArrayElement(*regions, index, *javaRegion); } @@ -1072,16 +1072,16 @@ jobject JNICALL ScriptMethodsRegionNamespace::getSmallestRegionAtPoint(JNIEnv *e Vector locationVec; std::string sceneId; if(!ScriptConversion::convertWorld(location, locationVec, sceneId)) - return NULL; + return nullptr; const Region * r = RegionMaster::getSmallestRegionAtPoint(sceneId, locationVec.x, locationVec.z); - if (r == NULL) - return NULL; + if (r == nullptr) + return nullptr; LocalRefPtr region; if (!ScriptConversion::convert(*r, region)) - return NULL; + return nullptr; return region->getReturnValue(); } @@ -1095,16 +1095,16 @@ jobject JNICALL ScriptMethodsRegionNamespace::getSmallestVisibleRegionAtPoint(JN Vector locationVec; std::string sceneId; if(!ScriptConversion::convertWorld(location, locationVec, sceneId)) - return NULL; + return nullptr; const Region * r = RegionMaster::getSmallestVisibleRegionAtPoint(sceneId, locationVec.x, locationVec.z); - if (r == NULL) - return NULL; + if (r == nullptr) + return nullptr; LocalRefPtr region; if (!ScriptConversion::convert(*r, region)) - return NULL; + return nullptr; return region->getReturnValue(); } @@ -1140,7 +1140,7 @@ jlong JNICALL ScriptMethodsRegionNamespace::createCircleRegionWithSpawn(JNIEnv * UNREF(self); // validate scripter's input - if (center == NULL || radius <= 0 || name == 0) + if (center == nullptr || radius <= 0 || name == 0) return 0; JavaStringParam jname(name); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsRegion3d.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsRegion3d.cpp index 37c9f942..6e209336 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsRegion3d.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsRegion3d.cpp @@ -87,7 +87,7 @@ struct Region3dPtrVolumeComparator ScriptParams *ScriptMethodsRegion3dNamespace::convertRegionDictionaryToScriptParams(jobject regionDictionary) { - // If we're passed a null dictionary, we just don't have any extra data but + // If we're passed a nullptr dictionary, we just don't have any extra data but // we still want to return a ScriptParams to fill in the standard values. if (!regionDictionary) return new ScriptParams; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsResource.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsResource.cpp index e908612c..04404908 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsResource.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsResource.cpp @@ -459,7 +459,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceContainerForType(JNIE { ResourceTypeObject const * const typeObj = ServerUniverse::getInstance().getResourceTypeById(NetworkId(resourceType)); if (!typeObj) - return NULL; + return nullptr; std::string templateName; typeObj->getCrateTemplate(templateName); @@ -473,7 +473,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceName(JNIEnv * /*env*/ { if (resourceType == 0) { - WARNING(true, ("JavaLibrary::getResourceName passed null resource type")); + WARNING(true, ("JavaLibrary::getResourceName passed nullptr resource type")); return 0; } @@ -494,7 +494,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getResourceNames(JNIEnv *en { if (resourceTypes == 0) { - WARNING(true, ("JavaLibrary::getResourceNames passed null resource types")); + WARNING(true, ("JavaLibrary::getResourceNames passed nullptr resource types")); return 0; } @@ -517,7 +517,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceClassName(JNIEnv *env { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getResourceClassName passed null resource class")); + WARNING(true, ("JavaLibrary::getResourceClassName passed nullptr resource class")); return 0; } @@ -531,7 +531,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceClassName(JNIEnv *env const ServerResourceClassObject * resClass = safe_cast( ServerUniverse::getInstance().getResourceClassByName(resourceClassName)); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getResourceClassName cannot find resource class for %s", resourceClassName.c_str())); return 0; @@ -547,7 +547,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getResourceClassNames(JNIEn { if (resourceClasses == 0) { - WARNING(true, ("JavaLibrary::getResourceClassNames passed null resource classes")); + WARNING(true, ("JavaLibrary::getResourceClassNames passed nullptr resource classes")); return 0; } @@ -569,7 +569,7 @@ jlongArray JNICALL ScriptMethodsResourceNamespace::getResourceTypes(JNIEnv * env { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getResourceTypes passed null resource class")); + WARNING(true, ("JavaLibrary::getResourceTypes passed nullptr resource class")); return 0; } @@ -583,7 +583,7 @@ jlongArray JNICALL ScriptMethodsResourceNamespace::getResourceTypes(JNIEnv * env const ServerResourceClassObject * resClass = safe_cast( ServerUniverse::getInstance().getResourceClassByName(resourceClassName)); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getResourceTypes cannot find resource class for %s", resourceClassName.c_str())); return 0; @@ -604,7 +604,7 @@ jlongArray JNICALL ScriptMethodsResourceNamespace::getResourceTypes(JNIEnv * env jlong jlongTmp; for (size_t i = 0; i < count; ++i) { - if (types[i] != NULL) + if (types[i] != nullptr) { jlongTmp = (types[i]->getNetworkId()).getValue(); setLongArrayRegion(*jtypes, i, 1, &jlongTmp); @@ -619,7 +619,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceClass(JNIEnv * /*env* { if (resourceType == 0) { - WARNING(true, ("JavaLibrary::getResourceClass passed null resource type")); + WARNING(true, ("JavaLibrary::getResourceClass passed nullptr resource type")); return 0; } @@ -642,7 +642,7 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceParentClass(JNIEnv * { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getResourceParentClass passed null resource class")); + WARNING(true, ("JavaLibrary::getResourceParentClass passed nullptr resource class")); return 0; } @@ -655,14 +655,14 @@ jstring JNICALL ScriptMethodsResourceNamespace::getResourceParentClass(JNIEnv * } const ResourceClassObject * resClass = ServerUniverse::getInstance().getResourceClassByName(resourceClassName); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getResourceParentClass cannot find resource class for %s", resourceClassName.c_str())); return 0; } const ResourceClassObject * parentClass = resClass->getParent(); - if (parentClass == NULL) + if (parentClass == nullptr) return 0; JavaString parentClassName(parentClass->getResourceClassName()); @@ -675,7 +675,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getResourceChildClasses(JNI { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getResourceChildClasses passed null resource class")); + WARNING(true, ("JavaLibrary::getResourceChildClasses passed nullptr resource class")); return 0; } @@ -688,7 +688,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getResourceChildClasses(JNI } const ResourceClassObject * resClass = ServerUniverse::getInstance().getResourceClassByName(resourceClassName); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getResourceChildClasses cannot find resource class for %s", resourceClassName.c_str())); return 0; @@ -701,7 +701,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getResourceChildClasses(JNI LocalObjectArrayRefPtr childrenArray = createNewObjectArray(static_cast(count), JavaLibrary::getClsString()); for (size_t i = 0; i < count; ++i) { - if (children[i] != NULL) + if (children[i] != nullptr) { JavaString name(children[i]->getResourceClassName()); setObjectArrayElement(*childrenArray, static_cast(i), name); @@ -716,7 +716,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getImmediateResourceChildCl { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getImmediateResourceChildClasses passed null resource class")); + WARNING(true, ("JavaLibrary::getImmediateResourceChildClasses passed nullptr resource class")); return 0; } @@ -729,7 +729,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getImmediateResourceChildCl } const ResourceClassObject * resClass = ServerUniverse::getInstance().getResourceClassByName(resourceClassName); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getImmediateResourceChildClasses cannot find resource class for %s", resourceClassName.c_str())); return 0; @@ -742,7 +742,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getImmediateResourceChildCl LocalObjectArrayRefPtr childrenArray = createNewObjectArray(count, JavaLibrary::getClsString()); for (int i = 0; i < count; ++i) { - if (children[i] != NULL) + if (children[i] != nullptr) { JavaString name(children[i]->getResourceClassName()); setObjectArrayElement(*childrenArray, i, name); @@ -757,7 +757,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getLeafResourceChildClasses { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::getLeafResourceChildClasses passed null resource class")); + WARNING(true, ("JavaLibrary::getLeafResourceChildClasses passed nullptr resource class")); return 0; } @@ -770,7 +770,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getLeafResourceChildClasses } const ResourceClassObject * resClass = ServerUniverse::getInstance().getResourceClassByName(resourceClassName); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getLeafResourceChildClasses cannot find resource class for %s", resourceClassName.c_str())); return 0; @@ -783,7 +783,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getLeafResourceChildClasses LocalObjectArrayRefPtr childrenArray = createNewObjectArray(count, JavaLibrary::getClsString()); for (int i = 0; i < count; ++i) { - if (children[i] != NULL) + if (children[i] != nullptr) { JavaString name(children[i]->getResourceClassName()); setObjectArrayElement(*childrenArray, i, name); @@ -798,7 +798,7 @@ jboolean JNICALL ScriptMethodsResourceNamespace::hasResourceType(JNIEnv *env, jo { if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::hasResourceType passed null resource class")); + WARNING(true, ("JavaLibrary::hasResourceType passed nullptr resource class")); return JNI_FALSE; } @@ -811,7 +811,7 @@ jboolean JNICALL ScriptMethodsResourceNamespace::hasResourceType(JNIEnv *env, jo } ServerResourceClassObject const * const resClass = safe_cast(ServerUniverse::getInstance().getResourceClassByName(resourceClassName)); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::hasResourceType cannot find resource class for %s", resourceClassName.c_str())); return JNI_FALSE; @@ -826,13 +826,13 @@ jlong JNICALL ScriptMethodsResourceNamespace::createResourceCrate(JNIEnv * /*env { if (resourceType == 0) { - WARNING(true, ("JavaLibrary::createResourceCrate passed null resource type")); + WARNING(true, ("JavaLibrary::createResourceCrate passed nullptr resource type")); return 0; } if (destination == 0) { - WARNING(true, ("JavaLibrary::createResourceCrate passed null destination")); + WARNING(true, ("JavaLibrary::createResourceCrate passed nullptr destination")); return 0; } @@ -849,7 +849,7 @@ jlong JNICALL ScriptMethodsResourceNamespace::createResourceCrate(JNIEnv * /*env return 0; } - ServerObject * container = NULL; + ServerObject * container = nullptr; if (!JavaLibrary::getObject(destination, container)) { WARNING(true, ("JavaLibrary::createResourceCrate cannot find destination object")); @@ -860,14 +860,14 @@ jlong JNICALL ScriptMethodsResourceNamespace::createResourceCrate(JNIEnv * /*env rt->getCrateTemplate(crateTemplateName); ServerObject * object = ServerWorld::createNewObject(crateTemplateName, *container, true); - if (object == NULL) + if (object == nullptr) { WARNING(true, ("JavaLibrary::createResourceCrate cannot create crate from template %s", crateTemplateName.c_str())); return 0; } ResourceContainerObject * crate = dynamic_cast(object); - if (crate == NULL) + if (crate == nullptr) { IGNORE_RETURN(object->permanentlyDestroy(DeleteReasons::SetupFailed)); WARNING(true, ("JavaLibrary::createResourceCrate crate %s is not a resource container", crateTemplateName.c_str())); @@ -888,13 +888,13 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::requestResourceList(JNIEnv { if (loc == 0) { - WARNING(true, ("JavaLibrary::requestResourceList passed null location")); + WARNING(true, ("JavaLibrary::requestResourceList passed nullptr location")); return 0; } if (resourceClass == 0) { - WARNING(true, ("JavaLibrary::requestResourceList passed null resource class")); + WARNING(true, ("JavaLibrary::requestResourceList passed nullptr resource class")); return 0; } @@ -921,7 +921,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::requestResourceList(JNIEnv const Vector & locationPos = location.getCoordinates(); const PlanetObject * planet = ServerUniverse::getInstance().getPlanetByName(location.getSceneId()); - if (planet == NULL) + if (planet == nullptr) { WARNING(true, ("JavaLibrary::requestResourceList cannot find planet %s", location.getSceneId())); return 0; @@ -929,7 +929,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::requestResourceList(JNIEnv // get the resource class and all its children ServerResourceClassObject const * const resClass = safe_cast(ServerUniverse::getInstance().getResourceClassByName(resourceClassName)); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::requestResourceList cannot find resource class %s", resourceClassName.c_str())); return 0; @@ -951,7 +951,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::requestResourceList(JNIEnv if (!(*i)->isDepleted()) { ResourcePoolObject const * const pool = (*i)->getPoolForPlanet(*planet); - if (pool != NULL) + if (pool != nullptr) { float density = pool->getEfficiencyAtLocation(locationPos.x, locationPos.z); if (density >= minDensity && density <= maxDensity) @@ -1049,7 +1049,7 @@ jobjectArray JNICALL ScriptMethodsResourceNamespace::getScaledResourceAttributes return 0; } ServerResourceClassObject const * const resClass = safe_cast(ServerUniverse::getInstance().getResourceClassByName(resourceClassName)); - if (resClass == NULL) + if (resClass == nullptr) { WARNING(true, ("JavaLibrary::getScaledResourceAttributes cannot find resource class %s", resourceClassName.c_str())); return 0; @@ -1152,7 +1152,7 @@ jint JNICALL ScriptMethodsResourceNamespace::getResourceAttribute(JNIEnv * /*env if (resourceType == 0) { - WARNING(true, ("JavaLibrary::getResourceAttribute passed null resource type")); + WARNING(true, ("JavaLibrary::getResourceAttribute passed nullptr resource type")); return -1; } @@ -1171,7 +1171,7 @@ jint JNICALL ScriptMethodsResourceNamespace::getResourceAttribute(JNIEnv * /*env jlong JNICALL ScriptMethodsResourceNamespace::getRecycledVersionOfResourceType(JNIEnv * /*env*/, jobject /*self*/, jlong resourceType) { ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(NetworkId(resourceType)); - ResourceTypeObject const * const recycledTypeObject = resourceTypeObject ? resourceTypeObject->getRecycledVersion() : NULL; + ResourceTypeObject const * const recycledTypeObject = resourceTypeObject ? resourceTypeObject->getRecycledVersion() : nullptr; if (recycledTypeObject) return (recycledTypeObject->getNetworkId()).getValue(); else diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsScript.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsScript.cpp index 7d600707..a7e06d57 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsScript.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsScript.cpp @@ -121,7 +121,7 @@ jint JNICALL ScriptMethodsScriptNamespace::attachScript(JNIEnv *env, jobject sel return SCRIPT_OVERRIDE; GameScriptObject* scripts = object->getScriptObject(); - if (scripts == NULL) + if (scripts == nullptr) return SCRIPT_OVERRIDE; char buffer[MAX_SCRIPT_NAME_LEN]; @@ -162,7 +162,7 @@ jboolean JNICALL ScriptMethodsScriptNamespace::detachScript(JNIEnv *env, jobject return JNI_FALSE; GameScriptObject* scripts = object->getScriptObject(); - if (scripts == NULL) + if (scripts == nullptr) return JNI_FALSE; char buffer[MAX_SCRIPT_NAME_LEN]; @@ -192,7 +192,7 @@ jboolean JNICALL ScriptMethodsScriptNamespace::detachAllScripts(JNIEnv *env, job return JNI_FALSE; GameScriptObject* scriptObject = object->getScriptObject(); - if (scriptObject == NULL) + if (scriptObject == nullptr) return JNI_FALSE; std::vector scriptNames; @@ -230,7 +230,7 @@ jboolean JNICALL ScriptMethodsScriptNamespace::hasScript(JNIEnv *env, jobject se return JNI_FALSE; GameScriptObject* scripts = object->getScriptObject(); - if (scripts == NULL) + if (scripts == nullptr) return JNI_FALSE; char buffer[MAX_SCRIPT_NAME_LEN]; @@ -325,7 +325,7 @@ jboolean JNICALL ScriptMethodsScriptNamespace::localMessageTo(JNIEnv *env, jobje else { GameScriptObject* scripts = object->getScriptObject(); - if (scripts == NULL) + if (scripts == nullptr) return JNI_FALSE; ScriptDictionaryPtr dictionary(new JavaDictionary(params)); @@ -400,7 +400,7 @@ jboolean JNICALL ScriptMethodsScriptNamespace::remoteMessageTo(JNIEnv *env, jobj * "messageTo" for players on the current planet * * If you want everyone on the planet to receive the message, -* specify null for loc and -1.0f for radius; otherwise, specify +* specify nullptr for loc and -1.0f for radius; otherwise, specify * a loc and a radius and only players on the planet within the * specified area will receive the message */ @@ -447,7 +447,7 @@ jint JNICALL ScriptMethodsScriptNamespace::remoteMessageToCalendarTimeDayOfWeek( return -1; // calculate the absolute time when the messageTo should go off - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); time_t const timeTarget = CalendarTime::getNextGMTTimeOcurrence(timeNow, dayOfWeek, hour, minute, second); if ((timeTarget <= 0) || (timeTarget <= timeNow)) @@ -487,7 +487,7 @@ jint JNICALL ScriptMethodsScriptNamespace::remoteMessageToCalendarTimeDayOfMonth return -1; // calculate the absolute time when the messageTo should go off - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); time_t const timeTarget = CalendarTime::getNextGMTTimeOcurrence(timeNow, month, dayOfMonth, hour, minute, second); if ((timeTarget <= 0) || (timeTarget <= timeNow)) @@ -562,7 +562,7 @@ void JNICALL ScriptMethodsScriptNamespace::cancelRecurringMessageTo(JNIEnv *env, // returns -1 if object doesn't have the messageTo jint JNICALL ScriptMethodsScriptNamespace::timeUntilMessageTo(JNIEnv *env, jobject self, jlong object, jstring methodName) { - ServerObject const * so = NULL; + ServerObject const * so = nullptr; if (!JavaLibrary::getObject(object, so)) return -1; @@ -606,7 +606,7 @@ jint JNICALL ScriptMethodsScriptNamespace::getCalendarTimeSeconds(JNIEnv * env, if(env == 0) return 0; - return ::time(NULL); + return ::time(nullptr); } //----------------------------------------------------------------------- @@ -616,7 +616,7 @@ jint JNICALL ScriptMethodsScriptNamespace::getCalendarTimeSeconds2(JNIEnv * env, if(env == 0) return -1; - time_t const rawtime = ::time(NULL); + time_t const rawtime = ::time(nullptr); struct tm * timeinfo = ::localtime(&rawtime); if (!timeinfo) return -1; @@ -678,7 +678,7 @@ jint JNICALL ScriptMethodsScriptNamespace::secondsUntilCalendarTimeDayOfWeek(JNI UNREF(self); // calculate the time between now and the specified time - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); time_t const timeTarget = CalendarTime::getNextGMTTimeOcurrence(timeNow, dayOfWeek, hour, minute, second); if ((timeTarget <= 0) || (timeTarget <= timeNow)) @@ -694,7 +694,7 @@ jint JNICALL ScriptMethodsScriptNamespace::secondsUntilCalendarTimeDayOfMonth(JN UNREF(self); // calculate the time between now and the specified time - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); time_t const timeTarget = CalendarTime::getNextGMTTimeOcurrence(timeNow, month, dayOfMonth, hour, minute, second); if ((timeTarget <= 0) || (timeTarget <= timeNow)) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsServerUI.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsServerUI.cpp index db36bd13..c925aae3 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsServerUI.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsServerUI.cpp @@ -83,14 +83,14 @@ jint JNICALL ScriptMethodsServerUINamespace::createSuiPage(JNIEnv *env, jobject JavaStringParam localPageName(pageName); jint failureCode = -1; - ServerObject* owner = NULL; + ServerObject* owner = nullptr; if(!JavaLibrary::getObject(ownerobject, owner)) { WARNING(true, ("SUI: couldn't get owner ServerObject*, can't create a page")); return failureCode; } - ServerObject* so = NULL; + ServerObject* so = nullptr; if(!JavaLibrary::getObject(client, so)) return failureCode; @@ -296,7 +296,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::subscribeToSuiEvent(JNIEnv } std::string ewn; - if (eventWidgetName != NULL) + if (eventWidgetName != nullptr) { JavaStringParam localEventWidgetName(eventWidgetName); JavaLibrary::convert(localEventWidgetName, ewn); @@ -323,7 +323,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::subscribeToSuiPropertyForEv } std::string ewn; - if (eventWidgetName != NULL) + if (eventWidgetName != nullptr) { JavaStringParam localEventWidgetName(eventWidgetName); JavaLibrary::convert(localEventWidgetName, ewn); @@ -411,7 +411,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::setSuiAssociatedLocation(JN return JNI_FALSE; } - ServerObject* associatedObject = NULL; + ServerObject* associatedObject = nullptr; if(!JavaLibrary::getObject(j_associatedObjectId, associatedObject)) { DEBUG_WARNING(true, ("could not find object for associatedObjectid")); @@ -441,12 +441,12 @@ jboolean JNICALL ScriptMethodsServerUINamespace::setSuiMaxRangeToObject(JNIE jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameOpen(JNIEnv *env, jobject self, jlong player, jobject data) { - ServerObject* playerServerObject = NULL; + ServerObject* playerServerObject = nullptr; if(!JavaLibrary::getObject(player, playerServerObject)) return JNI_FALSE; CreatureObject * creatureObject = playerServerObject->asCreatureObject(); - if(creatureObject != NULL) + if(creatureObject != nullptr) { ValueDictionary gameData; JavaLibrary::convert(data, gameData); @@ -462,12 +462,12 @@ jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameOpen(JNIEnv *env, jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameClose(JNIEnv *env, jobject self, jlong player, jobject data) { - ServerObject* playerServerObject = NULL; + ServerObject* playerServerObject = nullptr; if(!JavaLibrary::getObject(player, playerServerObject)) return JNI_FALSE; CreatureObject * creatureObject = playerServerObject->asCreatureObject(); - if(creatureObject != NULL) + if(creatureObject != nullptr) { ValueDictionary gameData; JavaLibrary::convert(data, gameData); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp index 8c40cd6c..4db4502b 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp @@ -83,13 +83,13 @@ namespace ScriptMethodsShipNamespace { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; char buf[256]; snprintf(buf, sizeof(buf), "JavaLibrary::%s: ship obj_id did not resolve to a ShipObject", functionName); ShipObject * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, buf, throwIfNotOnServer); if (!shipObject) - return NULL; + return nullptr; if (chassisSlot != ShipChassisSlotType::SCST_num_types && !shipObject->isSlotInstalled(chassisSlot)) JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::%s chassisSlot [%d] not installed", functionName, chassisSlot)); @@ -1115,17 +1115,17 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipChassisType(JNIEnv * env, job { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipChassisType(): shipId obj_id did not resolve to a ShipObject", false); if (!shipObject) - return NULL; + return nullptr; ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (shipObject->getChassisType()); if (shipChassis) return JavaString(shipChassis->getName ().getString ()).getReturnValue(); - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -1339,7 +1339,7 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentName(JNIEnv * env, j { ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipComponentName() invalid ship", false); if (!shipObject) - return NULL; + return nullptr; Unicode::String const & name = shipObject->getComponentName(chassisSlot); if (!name.empty()) @@ -1918,9 +1918,9 @@ void JNICALL ScriptMethodsShipNamespace::setShipComponentName(JNIEnv * env, jobj if (!shipObject) return; - if (componentName == NULL) + if (componentName == nullptr) { - JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::setShipComponentName (): null name")); + JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::setShipComponentName (): nullptr name")); return; } @@ -2442,7 +2442,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::shipCanInstallComponent(JNIEnv * en return false; TangibleObject * tangibleComponent = 0; - if (JavaLibrary::getObject (component, tangibleComponent) && tangibleComponent != NULL) + if (JavaLibrary::getObject (component, tangibleComponent) && tangibleComponent != nullptr) return shipObject->canInstallComponent(chassisSlot, *tangibleComponent); else { @@ -2481,7 +2481,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::shipInstallComponent(JNIEnv * env, NetworkId installerId(jobject_installerId); TangibleObject * tangibleComponent = 0; - if (JavaLibrary::getObject (component, tangibleComponent) && tangibleComponent != NULL) + if (JavaLibrary::getObject (component, tangibleComponent) && tangibleComponent != nullptr) return shipObject->installComponent(installerId, chassisSlot, *tangibleComponent); else { @@ -2546,11 +2546,11 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipChassisSlots(JNIEnv * env, { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipChassisSlots(): shipId obj_id did not resolve to a ShipObject", false); if (!shipObject) - return NULL; + return nullptr; ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (shipObject->getChassisType()); if (shipChassis) @@ -2571,7 +2571,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipChassisSlots(JNIEnv * env, } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -2585,7 +2585,7 @@ jint JNICALL ScriptMethodsShipNamespace::getShipComponentDescriptorType(JNIEnv * TangibleObject * tangibleComponent = 0; if (JavaLibrary::getObject (jobject_component, tangibleComponent)) { - if (tangibleComponent != NULL && tangibleComponent->getObjectTemplate () != NULL) + if (tangibleComponent != nullptr && tangibleComponent->getObjectTemplate () != nullptr) { ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (tangibleComponent->getObjectTemplate ()->getCrcName ().getCrc ()); @@ -2623,7 +2623,7 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentDescriptorTypeNam { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; std::string const & typeName = ShipComponentType::getNameFromType(static_cast(componentType)); @@ -2641,7 +2641,7 @@ jint JNICALL ScriptMethodsShipNamespace::getShipComponentDescriptorCrc(JNI TangibleObject * tangibleComponent = 0; if (JavaLibrary::getObject (jobject_component, tangibleComponent)) { - if (tangibleComponent != NULL && tangibleComponent->getObjectTemplate () != NULL) + if (tangibleComponent != nullptr && tangibleComponent->getObjectTemplate () != nullptr) { ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (tangibleComponent->getObjectTemplate ()->getCrcName ().getCrc ()); @@ -2659,11 +2659,11 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentDescriptorCrcName { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc(static_cast(componentCrc)); - if (shipComponentDescriptor == NULL) - return NULL; + if (shipComponentDescriptor == nullptr) + return nullptr; return JavaString(shipComponentDescriptor->getName().getString()).getReturnValue(); } @@ -2674,11 +2674,11 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentDescriptorCompati { //-- Make sure ships are enabled if (!verifyShipsEnabled()) - return NULL; + return nullptr; ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc(static_cast(componentCrc)); - if (shipComponentDescriptor == NULL) - return NULL; + if (shipComponentDescriptor == nullptr) + return nullptr; return JavaString(shipComponentDescriptor->getCompatibility().getString()).getReturnValue(); } @@ -2776,15 +2776,15 @@ void JNICALL ScriptMethodsShipNamespace::notifyShipDamage(JNIEnv * env, jobject if (victimShipObject->isPlayerShip()) { //-- Get the attacker object. It can be any tangible object. - TangibleObject const * attackerTangibleObject = NULL; + TangibleObject const * attackerTangibleObject = nullptr; if (jobject_attacker) IGNORE_RETURN(JavaLibrary::getObject(jobject_attacker, attackerTangibleObject)); Controller * const victimShipController = victimShipObject->getController(); if (victimShipController) { - ShipDamageMessage shipDamage(attackerTangibleObject != NULL ? attackerTangibleObject->getNetworkId() : NetworkId::cms_invalid, - attackerTangibleObject != NULL ? attackerTangibleObject->getPosition_w() : victimShipObject->getPosition_w(), + ShipDamageMessage shipDamage(attackerTangibleObject != nullptr ? attackerTangibleObject->getNetworkId() : NetworkId::cms_invalid, + attackerTangibleObject != nullptr ? attackerTangibleObject->getPosition_w() : victimShipObject->getPosition_w(), totalDamage ); //lint -esym(429, damageMessage) @@ -3008,7 +3008,7 @@ jlong JNICALL ScriptMethodsShipNamespace::getDroidControlDeviceForShip(JNIEnv * NetworkId const & droidControlDeviceId = shipObject->getInstalledDroidControlDevice(); Object const * const droidControlDevice = NetworkIdManager::getObjectById(droidControlDeviceId); - ServerObject const * const serverDroidControlDevice = droidControlDevice ? droidControlDevice->asServerObject() : NULL; + ServerObject const * const serverDroidControlDevice = droidControlDevice ? droidControlDevice->asServerObject() : nullptr; if(!serverDroidControlDevice) return 0; else @@ -3050,7 +3050,7 @@ void JNICALL ScriptMethodsShipNamespace::commPlayers(JNIEnv *env, jobject /*self uint32 appearanceOverloadSharedTemplateCrc = 0; ObjectTemplate const * const ot = ObjectTemplateList::fetch(Unicode::wideToNarrow(appearanceOverloadServerTemplateWide)); - ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : NULL; + ServerObjectTemplate const * const sot = ot ? ot->asServerObjectTemplate() : nullptr; if(sot) { std::string const & sharedTemplateName = sot->getSharedTemplate(); @@ -3197,7 +3197,7 @@ jlong JNICALL ScriptMethodsShipNamespace::launchShipFromHangar(JNIEnv *env, jobj Transform const & finalCreateTransform = launchingShip->getTransform_o2p().rotateTranslate_l2p(finalHangarDelta_o); ServerObject * const newShip = ServerWorld::createNewObject(crcName.getCrc(), finalCreateTransform, cell, false); - if (newShip == NULL) + if (newShip == nullptr) return 0; // create an objId to return @@ -3223,7 +3223,7 @@ void JNICALL ScriptMethodsShipNamespace::handleShipDestruction(JNIEnv * en //convert ship ShipObject * const ship = JavaLibrary::getShipThrow(env, jship, "handleShipDestruction(): shipId obj_id did not resolve to a ShipObject", false); - if (ship == NULL) + if (ship == nullptr) return; DestroyShipMessage const msg(ship->getNetworkId(), severity); @@ -3401,7 +3401,7 @@ jfloat JNICALL ScriptMethodsShipNamespace::getShipInternalDamageOverTimeDamageRa return 0.0f; static ShipInternalDamageOverTime const * const idot = ShipInternalDamageOverTimeManager::findEntry(*ship, chassisSlot); - if (idot == NULL) + if (idot == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipInternalDamageOverTimeDamageThreshold idot for [%s] slot [%d] not found", ship->getNetworkId().getValueString().c_str(), chassisSlot)); return 0.0f; @@ -3419,7 +3419,7 @@ jfloat JNICALL ScriptMethodsShipNamespace::getShipInternalDamageOverTimeDamageTh return 0.0f; static ShipInternalDamageOverTime const * const idot = ShipInternalDamageOverTimeManager::findEntry(*ship, chassisSlot); - if (idot == NULL) + if (idot == nullptr) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipInternalDamageOverTimeDamageThreshold idot for [%s] slot [%d] not found", ship->getNetworkId().getValueString().c_str(), chassisSlot)); return 0.0f; @@ -3437,11 +3437,11 @@ jboolean JNICALL ScriptMethodsShipNamespace::hasShipInternalDamageOverTime(JNIEn //convert ship ShipObject * const ship = JavaLibrary::getShipThrow(env, jship, "hasShipInternalDamageOverTime(): shipId obj_id did not resolve to a ShipObject", false); - if (ship == NULL) + if (ship == nullptr) return false; static ShipInternalDamageOverTime const * const idot = ShipInternalDamageOverTimeManager::findEntry(*ship, chassisSlot); - return idot != NULL; + return idot != nullptr; } // ---------------------------------------------------------------------- @@ -3576,7 +3576,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::shipIsInNebula(JNIEnv *env, jobject std::string nebulaName; - if (NULL != j_nebulaName) + if (nullptr != j_nebulaName) { JavaStringParam const jsp(j_nebulaName); if (!JavaLibrary::convert(jsp, nebulaName)) @@ -3593,7 +3593,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::shipIsInNebula(JNIEnv *env, jobject { int const id = *it; Nebula const * const nebula = NebulaManager::getNebulaById(id); - if (NULL != nebula) + if (nullptr != nebula) { if (nebula->getName() == nebulaName) return JNI_TRUE; @@ -3637,7 +3637,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::setShipWingName(JNIEnv * /*env*/, j jstring JNICALL ScriptMethodsShipNamespace::getShipWingName(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - ServerObject const * object = NULL; + ServerObject const * object = nullptr; if (!JavaLibrary::getObject(target, object)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipWingName (): could not convert the target")); @@ -3686,7 +3686,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::setShipTypeName(JNIEnv * /*env*/, j jstring JNICALL ScriptMethodsShipNamespace::getShipTypeName(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - ServerObject const * object = NULL; + ServerObject const * object = nullptr; if (!JavaLibrary::getObject(target, object)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipTypeName (): could not convert the target")); @@ -3735,7 +3735,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::setShipDifficulty(JNIEnv * /*env*/, jstring JNICALL ScriptMethodsShipNamespace::getShipDifficulty(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - ServerObject const * object = NULL; + ServerObject const * object = nullptr; if (!JavaLibrary::getObject(target, object)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipDifficulty (): could not convert the target")); @@ -3783,7 +3783,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::setShipFaction(JNIEnv * /*env*/, jo jstring JNICALL ScriptMethodsShipNamespace::getShipFaction(JNIEnv * /*env*/, jobject /*self*/, jlong target) { - ServerObject const * object = NULL; + ServerObject const * object = nullptr; if (!JavaLibrary::getObject(target, object)) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::getShipFaction (): could not convert the target")); @@ -3871,7 +3871,7 @@ jboolean JNICALL ScriptMethodsShipNamespace::isMissionCriticalObject(JNIEnv * en if (!ship) { - JAVA_THROW_SCRIPT_EXCEPTION(true, ("isMissionCriticalObject(): playerId ship is null")); + JAVA_THROW_SCRIPT_EXCEPTION(true, ("isMissionCriticalObject(): playerId ship is nullptr")); return JNI_FALSE; } @@ -3973,7 +3973,7 @@ void JNICALL ScriptMethodsShipNamespace::setDynamicMiningAsteroidVelocity(JNIEnv } MiningAsteroidController * const miningAsteroidController = dynamic_cast(shipObject->getController()); - if (NULL == miningAsteroidController) + if (nullptr == miningAsteroidController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("setDynamicMiningAsteroidVelocity(): called on a ship which is not a dynamic mining asteroid")); return; @@ -3988,12 +3988,12 @@ jobject JNICALL ScriptMethodsShipNamespace::getDynamicMiningAsteroidVelocity(JNI { ShipObject * const shipObject = JavaLibrary::getShipThrow(env, jobject_asteroidId, "getDynamicMiningAsteroidVelocity(): shipId did not resolve to a ShipObject", false); if (!shipObject) - return NULL; + return nullptr; MiningAsteroidController * const miningAsteroidController = dynamic_cast(shipObject->getController()); - if (NULL == miningAsteroidController) + if (nullptr == miningAsteroidController) { JAVA_THROW_SCRIPT_EXCEPTION(true, ("setDynamicMiningAsteroidVelocity(): called on a ship which is not a dynamic mining asteroid")); - return NULL; + return nullptr; } Vector const & velocity_w = miningAsteroidController->getVelocity_w(); @@ -4073,7 +4073,7 @@ jlongArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsResourceT { ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast(ShipChassisSlotType::SCST_cargo_hold)); if (!shipObject) - return NULL; + return nullptr; ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents(); @@ -4090,7 +4090,7 @@ jlongArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsResourceT return jids->getReturnValue(); } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -4099,7 +4099,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsAmounts(JN { ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast(ShipChassisSlotType::SCST_cargo_hold)); if (!shipObject) - return NULL; + return nullptr; ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents(); @@ -4115,7 +4115,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsAmounts(JN return jamounts->getReturnValue(); } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -4125,9 +4125,9 @@ void JNICALL ScriptMethodsShipNamespace::openSpaceMiningUi(JNIEnv * env, jobject NetworkId const & playerId = NetworkId(jobject_player); NetworkId const & spaceStationId = NetworkId(jobject_spaceStation); - if (jstring_spaceStationName == NULL) + if (jstring_spaceStationName == nullptr) { - JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::setShipComponentName (): null name")); + JAVA_THROW_SCRIPT_EXCEPTION(true, ("JavaLibrary::setShipComponentName (): nullptr name")); return; } @@ -4140,7 +4140,7 @@ void JNICALL ScriptMethodsShipNamespace::openSpaceMiningUi(JNIEnv * env, jobject } Object * const player = NetworkIdManager::getObjectById(playerId); - Controller * const controller = player ? player->getController(): NULL; + Controller * const controller = player ? player->getController(): nullptr; if (!controller) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp index ae184f4b..07533c45 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp @@ -276,7 +276,7 @@ jobjectArray JNICALL ScriptMethodsSkillNamespace::getSkillCommandsProvided(JNIEn const SkillObject * skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; LocalObjectArrayRefPtr strArray; if(! ScriptConversion::convert(skill->getCommandsProvided(), strArray)) @@ -293,7 +293,7 @@ jobject JNICALL ScriptMethodsSkillNamespace::getSkillPrerequisiteExperience(JNIE const SkillObject * skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; JavaDictionaryPtr dict; if (!JavaLibrary::convert(skill->getPrerequisiteExperienceVector(), dict)) @@ -334,7 +334,7 @@ jobjectArray JNICALL ScriptMethodsSkillNamespace::getSkillPrerequisiteSkills(JNI const SkillObject * skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; std::vector skillNames; std::vector::const_iterator i; @@ -358,7 +358,7 @@ jobject JNICALL ScriptMethodsSkillNamespace::getSkillPrerequisiteSpecies(JNIEnv const SkillObject * skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; JavaDictionaryPtr dict; if (!JavaLibrary::convert(skill->getPrerequisiteSpecies(), dict)) @@ -374,14 +374,14 @@ jstring JNICALL ScriptMethodsSkillNamespace::getSkillProfession(JNIEnv *env, job const SkillObject * const skill = getSkill(localSkillName); if(!skill) - return NULL; + return nullptr; const SkillObject * const prof = skill->findProfessionForSkill (); if(prof) { JavaString str(prof->getSkillName().c_str()); return str.getReturnValue(); } - return NULL; + return nullptr; } //----------------------------------------------------------------------- @@ -423,7 +423,7 @@ jobject JNICALL ScriptMethodsSkillNamespace::getSkillStatisticModifiers(JNIEnv * const SkillObject * skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; JavaDictionaryPtr dict; if (!JavaLibrary::convert(skill->getStatisticModifiers(), dict)) @@ -450,7 +450,7 @@ jint JNICALL ScriptMethodsSkillNamespace::getCreatureSkillStatisticModifier(JNIE JavaStringParam jskillStatName(skillStatName); - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(creature, object)) return 0; @@ -472,7 +472,7 @@ jint JNICALL ScriptMethodsSkillNamespace::getCreatureSkillStatisticModifier(JNIE * @param creature the creature whose stat mod we want * @param skillStatNames array of names of the skill stat mods we want * - * @return the skill stat mod values, or null on error + * @return the skill stat mod values, or nullptr on error */ jintArray JNICALL ScriptMethodsSkillNamespace::getCreatureSkillStatisticModifiers(JNIEnv *env, jobject self, jlong creature, jobjectArray skillStatNames) { @@ -481,7 +481,7 @@ jintArray JNICALL ScriptMethodsSkillNamespace::getCreatureSkillStatisticModifier if (skillStatNames == 0) return 0; - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(creature, object)) return 0; @@ -555,7 +555,7 @@ jint JNICALL ScriptMethodsSkillNamespace::internalGetCreatureEnhancedSkillStatis JavaStringParam jskillStatName(skillStatName); - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(creature, object)) return 0; @@ -577,7 +577,7 @@ jint JNICALL ScriptMethodsSkillNamespace::internalGetCreatureEnhancedSkillStatis * @param creature the creature whose stat mod we want * @param skillStatNames array of names of the skill stat mods we want * - * @return the skill stat mod values, or null on error + * @return the skill stat mod values, or nullptr on error */ jintArray JNICALL ScriptMethodsSkillNamespace::internalGetCreatureEnhancedSkillStatisticModifiers(JNIEnv *env, jobject self, jlong creature, jobjectArray skillStatNames, jboolean useBonusCap) { @@ -586,7 +586,7 @@ jintArray JNICALL ScriptMethodsSkillNamespace::internalGetCreatureEnhancedSkillS if (skillStatNames == 0) return 0; - const CreatureObject * object = NULL; + const CreatureObject * object = nullptr; if (!JavaLibrary::getObject(creature, object)) return 0; @@ -621,7 +621,7 @@ jstring JNICALL ScriptMethodsSkillNamespace::getSkillTitleGranted(JNIEnv *env, j const SkillObject * const skill = getSkill(localSkillName); if(! skill) - return NULL; + return nullptr; if (skill->isTitle ()) return JavaString(skill->getSkillName ().c_str()).getReturnValue(); @@ -665,7 +665,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByString(JNIEnv * if(name.empty()) { // throw java exception - JavaLibrary::throwInternalScriptError("JavaLibrary::grantExperiencePoints() was passed an EMPTY or NULL experience name. This is probably not what the script intends to do, and the database cannot save unnamed XP. Change your script to ensure that it is calling grantExperiencePoints with the intended parameters."); + JavaLibrary::throwInternalScriptError("JavaLibrary::grantExperiencePoints() was passed an EMPTY or nullptr experience name. This is probably not what the script intends to do, and the database cannot save unnamed XP. Change your script to ensure that it is calling grantExperiencePoints with the intended parameters."); } else { @@ -675,7 +675,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByString(JNIEnv * WARNING(true, ("JavaLibrary::grantExperiencePointsByString called " "with target id = 0")); } - else if (targetId.getObject() == NULL) + else if (targetId.getObject() == nullptr) { if (NameManager::getInstance().getPlayerName(targetId).empty()) { @@ -683,7 +683,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByString(JNIEnv * "with target id = %s, who is not in the player name map", targetId.getValueString().c_str())); } -// else if (ServerUniverse::getInstance().getXpManager() != NULL) +// else if (ServerUniverse::getInstance().getXpManager() != nullptr) // { // ServerUniverse::getInstance().getXpManager()->grantXp(targetId, // name, amount); @@ -701,7 +701,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByString(JNIEnv * else { CreatureObject * creature = dynamic_cast(targetId.getObject()); - if (creature != NULL) + if (creature != nullptr) { result = creature->grantExperiencePoints(name, static_cast(amount)); } @@ -741,7 +741,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByInt(JNIEnv *env jint result = INT_MIN; CachedNetworkId targetId(target); - if (targetId.getObject() == NULL) + if (targetId.getObject() == nullptr) { if (targetId == CachedNetworkId::cms_cachedInvalid) { @@ -754,7 +754,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByInt(JNIEnv *env "with target id = %s, who is not in the player name map", targetId.getValueString().c_str())); } -// else if (ServerUniverse::getInstance().getXpManager() != NULL) +// else if (ServerUniverse::getInstance().getXpManager() != nullptr) // { // ServerUniverse::getInstance().getXpManager()->grantXp(targetId, // experienceTypeString, amount); @@ -772,7 +772,7 @@ jint JNICALL ScriptMethodsSkillNamespace::grantExperiencePointsByInt(JNIEnv *env else { CreatureObject * creature = dynamic_cast(targetId.getObject()); - if (creature != NULL) + if (creature != nullptr) { result = creature->grantExperiencePoints(experienceTypeString, static_cast(amount)); } @@ -977,7 +977,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::grantSchematicGroup(JNIEnv *env, j JavaStringParam groupNameParam(groupName); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1010,7 +1010,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::revokeSchematicGroup(JNIEnv *env, JavaStringParam groupNameParam(groupName); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1067,7 +1067,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::grantSchematicCrc(JNIEnv *env, job { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1120,7 +1120,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::revokeSchematicCrc(JNIEnv *env, jo { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1173,7 +1173,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::hasSchematicCrc(JNIEnv *env, jobje { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1191,11 +1191,11 @@ jboolean JNICALL ScriptMethodsSkillNamespace::hasSchematicCrc(JNIEnv *env, jobje * @param self class calling this function * @param player the player * - * @return the skill mod names the player has, or null on error + * @return the skill mod names the player has, or nullptr on error */ jobjectArray JNICALL ScriptMethodsSkillNamespace::getSkillStatModListingForPlayer(JNIEnv *env, jobject self, jlong player) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(player, creature)) return 0; @@ -1221,11 +1221,11 @@ jobjectArray JNICALL ScriptMethodsSkillNamespace::getSkillStatModListingForPlaye * @param self class calling this function * @param player the player * - * @return the commands the player has, or null on error + * @return the commands the player has, or nullptr on error */ jobjectArray JNICALL ScriptMethodsSkillNamespace::getCommandListingForPlayer(JNIEnv *env, jobject self, jlong player) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(player, creature)) return 0; @@ -1261,7 +1261,7 @@ jintArray JNICALL ScriptMethodsSkillNamespace::getSkillSchematicsGranted(JNIEnv return 0; const SkillObject * skill = SkillManager::getInstance().getSkill(name); - if (skill == NULL) + if (skill == nullptr) return 0; // get all the granted schematics from the skill groups for the skill @@ -1304,11 +1304,11 @@ jintArray JNICALL ScriptMethodsSkillNamespace::getSkillSchematicsGranted(JNIEnv * @param self class calling this function * @param player the player * - * @return the schematics' crc, or null on error + * @return the schematics' crc, or nullptr on error */ jintArray JNICALL ScriptMethodsSkillNamespace::getSchematicListingForPlayer(JNIEnv *env, jobject self, jlong player) { - const CreatureObject * creature = NULL; + const CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(player, creature)) return 0; @@ -1335,7 +1335,7 @@ jintArray JNICALL ScriptMethodsSkillNamespace::getSchematicListingForPlayer(JNIE jboolean JNICALL ScriptMethodsSkillNamespace::hasCertificationsForItem(JNIEnv *env, jobject self, jlong player, jlong item) { - const CreatureObject * creatureObject = NULL; + const CreatureObject * creatureObject = nullptr; if (!JavaLibrary::getObject(player, creatureObject) || !creatureObject) return JNI_FALSE; @@ -1349,7 +1349,7 @@ jboolean JNICALL ScriptMethodsSkillNamespace::hasCertificationsForItem(JNIEnv *e } } - const TangibleObject * itemObject = NULL; + const TangibleObject * itemObject = nullptr; if (!JavaLibrary::getObject(item, itemObject) || !itemObject) return JNI_FALSE; @@ -1360,11 +1360,11 @@ jboolean JNICALL ScriptMethodsSkillNamespace::hasCertificationsForItem(JNIEnv *e jobjectArray JNICALL ScriptMethodsSkillNamespace::getRequiredCertifications(JNIEnv *env, jobject self, jlong item) { - const TangibleObject * itemAsTangible = NULL; + const TangibleObject * itemAsTangible = nullptr; if (!JavaLibrary::getObject(item, itemAsTangible) || !itemAsTangible) { JAVA_THROW_SCRIPT_EXCEPTION(true,("getRequiredCertifications called with an object that does not exist")); - return NULL; + return nullptr; } std::vector certs; @@ -1372,7 +1372,7 @@ jobjectArray JNICALL ScriptMethodsSkillNamespace::getRequiredCertifications(JNIE LocalObjectArrayRefPtr results; if (!ScriptConversion::convert(certs, results)) - return NULL; + return nullptr; return results->getReturnValue(); } @@ -1381,7 +1381,7 @@ jobjectArray JNICALL ScriptMethodsSkillNamespace::getRequiredCertifications(JNIE jstring JNICALL ScriptMethodsSkillNamespace::getSkillTemplate(JNIEnv *env, jobject self, jlong player) { - CreatureObject const * creature = NULL; + CreatureObject const * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { @@ -1393,14 +1393,14 @@ jstring JNICALL ScriptMethodsSkillNamespace::getSkillTemplate(JNIEnv *env, jobje } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- void JNICALL ScriptMethodsSkillNamespace::setSkillTemplate(JNIEnv *env, jobject self, jlong player, jstring skillTemplateName) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { @@ -1422,7 +1422,7 @@ void JNICALL ScriptMethodsSkillNamespace::setSkillTemplate(JNIEnv *env, jobject jstring JNICALL ScriptMethodsSkillNamespace::getWorkingSkill(JNIEnv *env, jobject self, jlong player) { - CreatureObject const * creature = NULL; + CreatureObject const * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { @@ -1435,14 +1435,14 @@ jstring JNICALL ScriptMethodsSkillNamespace::getWorkingSkill(JNIEnv *env, jobjec } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- void JNICALL ScriptMethodsSkillNamespace::setWorkingSkill(JNIEnv *env, jobject self, jlong player, jstring workingSkillName) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { @@ -1464,7 +1464,7 @@ void JNICALL ScriptMethodsSkillNamespace::setWorkingSkill(JNIEnv *env, jobject s void JNICALL ScriptMethodsSkillNamespace::recomputeCommandSeries(JNIEnv *env, jobject self, jlong player) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { @@ -1476,7 +1476,7 @@ void JNICALL ScriptMethodsSkillNamespace::recomputeCommandSeries(JNIEnv *env, jo void JNICALL ScriptMethodsSkillNamespace::resetExpertises(JNIEnv *env, jobject self, jlong player) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (JavaLibrary::getObject(player, creature)) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp index 344f0207..cb7135e7 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp @@ -56,7 +56,7 @@ const JNINativeMethod NATIVES[] = { * @param self class calling this function * @param id the stringId to find * - * @return the string, or null on error + * @return the string, or nullptr on error */ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject self, jobject id) { @@ -64,7 +64,7 @@ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject sel if (id == 0) { - WARNING(true, ("JavaLibrary::log getString is NULL.")); + WARNING(true, ("JavaLibrary::log getString is nullptr.")); return 0; } @@ -116,7 +116,7 @@ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject sel * @param self class calling this function * @param ids array of stringIds to find * - * @return an array of strings, or null on error + * @return an array of strings, or nullptr on error */ jobjectArray JNICALL ScriptMethodsStringNamespace::getStrings(JNIEnv *env, jobject self, jobjectArray ids) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsSystem.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsSystem.cpp index 90861085..7dda71ba 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsSystem.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsSystem.cpp @@ -61,7 +61,7 @@ jboolean JNICALL ScriptMethodsSystemNamespace::sendConsoleCommand(JNIEnv * env, { JavaStringParam localCommand(command); - ServerObject* object = NULL; + ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; @@ -86,7 +86,7 @@ jboolean JNICALL ScriptMethodsSystemNamespace::sendConsoleCommand(JNIEnv * env, * @param section the config file section * @param key the config file key * - * @return the key value, or null if the key doesn't exist + * @return the key value, or nullptr if the key doesn't exist */ jstring JNICALL ScriptMethodsSystemNamespace::getConfigSetting(JNIEnv * env, jobject self, jstring section, jstring key) @@ -108,12 +108,12 @@ jstring JNICALL ScriptMethodsSystemNamespace::getConfigSetting(JNIEnv * env, job return 0; const ConfigFile::Section * sec = ConfigFile::getSection(sectionName.c_str()); - if (sec == NULL) + if (sec == nullptr) return 0; const ConfigFile::Key * ky = sec->findKey(keyName.c_str()); - if (ky == NULL) - return NULL; + if (ky == nullptr) + return nullptr; JavaString jvalue(ky->getAsString(ky->getCount()-1, "")); return jvalue.getReturnValue(); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsTerrain.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsTerrain.cpp index c56803c1..fabb32f6 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsTerrain.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsTerrain.cpp @@ -165,16 +165,16 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocation(JNIEnv * /*env*/, PROFILER_AUTO_BLOCK_DEFINE("JNI::getGoodLocation"); //validate scripter's input - if (searchRectLowerLeftLocation == NULL) + if (searchRectLowerLeftLocation == nullptr) { - DEBUG_WARNING (true, ("getGoodLocation (): DB lower left is NULL")); - return NULL; + DEBUG_WARNING (true, ("getGoodLocation (): DB lower left is nullptr")); + return nullptr; } - if (searchRectUpperRightLocation == NULL) + if (searchRectUpperRightLocation == nullptr) { - DEBUG_WARNING (true, ("getGoodLocation (): DB upper right is NULL")); - return NULL; + DEBUG_WARNING (true, ("getGoodLocation (): DB upper right is nullptr")); + return nullptr; } //pull the data from the java Location objects. sceneid and cell are not checked or used, but sent back in the good location, if one exists @@ -184,14 +184,14 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocation(JNIEnv * /*env*/, if (!ScriptConversion::convertWorld(searchRectLowerLeftLocation, srLLLocationVec, sceneId)) { DEBUG_WARNING (true, ("getGoodLocation (): DB could not convert lower left coordinates")); - return NULL; + return nullptr; } Vector srURLocationVec; if (!ScriptConversion::convertWorld(searchRectUpperRightLocation, srURLocationVec, sceneId)) { DEBUG_WARNING (true, ("getGoodLocation (): DB could not convert upper right coordinates")); - return NULL; + return nullptr; } // get the good location from ServerWorld @@ -199,7 +199,7 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocation(JNIEnv * /*env*/, if (successLoc3d.x == 0 && successLoc3d.y == 0 && successLoc3d.z == 0) { // no good location available - return NULL; + return nullptr; } //convert it back into scripter lingo (a "location"), using the default scene and cell ids @@ -207,7 +207,7 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocation(JNIEnv * /*env*/, if (!ScriptConversion::convert(successLoc3d, sceneId, NetworkId(), goodLocation)) { DEBUG_WARNING (true, ("getGoodLocation (): PB could not convert result back to a location")); - return NULL; + return nullptr; } return goodLocation->getReturnValue(); @@ -218,16 +218,16 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocationAvoidCollidables(J PROFILER_AUTO_BLOCK_DEFINE("JNI::getGoodLocationAvoidCollidables"); //validate scripter's input - if (searchRectLowerLeftLocation == NULL) + if (searchRectLowerLeftLocation == nullptr) { - DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB lower left is NULL")); - return NULL; + DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB lower left is nullptr")); + return nullptr; } - if (searchRectUpperRightLocation == NULL) + if (searchRectUpperRightLocation == nullptr) { - DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB upper right is NULL")); - return NULL; + DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB upper right is nullptr")); + return nullptr; } //pull the data from the java Location objects. sceneid and cell are not checked or used, but sent back in the good location, if one exists @@ -237,14 +237,14 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocationAvoidCollidables(J if (!ScriptConversion::convertWorld(searchRectLowerLeftLocation, srLLLocationVec, sceneId)) { DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB could not convert lower left coordinates")); - return NULL; + return nullptr; } Vector srURLocationVec; if (!ScriptConversion::convertWorld(searchRectUpperRightLocation, srURLocationVec, sceneId)) { DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): DB could not convert upper right coordinates")); - return NULL; + return nullptr; } // get the good location from ServerWorld @@ -252,7 +252,7 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocationAvoidCollidables(J if (successLoc3d.x == 0 && successLoc3d.y == 0 && successLoc3d.z == 0) { // no good location available - return NULL; + return nullptr; } //convert it back into scripter lingo (a "location"), using the default scene and cell ids @@ -260,7 +260,7 @@ jobject JNICALL ScriptMethodsTerrainNamespace::getGoodLocationAvoidCollidables(J if (!ScriptConversion::convert(successLoc3d, sceneId, NetworkId(), goodLocation)) { DEBUG_WARNING (true, ("getGoodLocationAvoidCollidables (): PB could not convert result back to a location")); - return NULL; + return nullptr; } return goodLocation->getReturnValue(); @@ -587,7 +587,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::setWeatherData (JNIEnv* env, job UNREF(self); PlanetObject * planet = ServerUniverse::getInstance().getCurrentPlanet(); - if (planet != NULL) + if (planet != nullptr) { planet->setWeather(index, windVelocityX, 0.f, windVelocityZ); return JNI_TRUE; @@ -603,9 +603,9 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::setWeatherData (JNIEnv* env, job jboolean JNICALL ScriptMethodsTerrainNamespace::isBelowWater (JNIEnv* /*env*/, jobject /*self*/, jobject location) { - if (location == NULL) + if (location == nullptr) { - DEBUG_WARNING(true, ("[designer bug] isBelowWater script hook was passed a NULL location reference")); + DEBUG_WARNING(true, ("[designer bug] isBelowWater script hook was passed a nullptr location reference")); return JNI_FALSE; } @@ -621,7 +621,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::isBelowWater (JNIEnv* /*env*/, j const CellProperty* worldCell = CellProperty::getWorldCellProperty(); if(!worldCell) { - DEBUG_WARNING(true, ("isBelowWater got a NULL worldCell back from CellProperty::getWorldCellProperty()")); + DEBUG_WARNING(true, ("isBelowWater got a nullptr worldCell back from CellProperty::getWorldCellProperty()")); return JNI_FALSE; } const NetworkId& worldCellId = worldCell->getOwner().getNetworkId(); @@ -758,9 +758,9 @@ jfloat JNICALL ScriptMethodsTerrainNamespace::getWaterTableHeight (JNIEnv* /*env { float zero = 0.0f; - if (location == NULL) + if (location == nullptr) { - DEBUG_WARNING(true, ("[designer bug] getWaterTableHeight script hook was passed a NULL location reference")); + DEBUG_WARNING(true, ("[designer bug] getWaterTableHeight script hook was passed a nullptr location reference")); return zero; } @@ -776,7 +776,7 @@ jfloat JNICALL ScriptMethodsTerrainNamespace::getWaterTableHeight (JNIEnv* /*env const CellProperty* worldCell = CellProperty::getWorldCellProperty(); if(!worldCell) { - DEBUG_WARNING(true, ("getWaterTableHeight got a NULL worldCell back from CellProperty::getWorldCellProperty()")); + DEBUG_WARNING(true, ("getWaterTableHeight got a nullptr worldCell back from CellProperty::getWorldCellProperty()")); return zero; } const NetworkId& worldCellId = worldCell->getOwner().getNetworkId(); @@ -862,7 +862,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::requestLocation (JNIEnv * /*env* jboolean JNICALL ScriptMethodsTerrainNamespace::isOnAFloor (JNIEnv * env, jobject self, jlong scriptObject) { //-- make sure we have a valid object - ServerObject * theObject = NULL; + ServerObject * theObject = nullptr; if (!JavaLibrary::getObject (scriptObject, theObject)) { DEBUG_WARNING (true, ("isOnAFloor (): could not find scriptObject")); @@ -876,7 +876,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::isOnAFloor (JNIEnv * env, jobjec return JNI_FALSE; } - if(objectCollisionProp->getStandingOn() != NULL) + if(objectCollisionProp->getStandingOn() != nullptr) return JNI_TRUE; else return JNI_FALSE; @@ -890,7 +890,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::isRelativePointOnSameFloorAsObje return JNI_FALSE; //-- make sure we have a valid object - ServerObject * theObject = NULL; + ServerObject * theObject = nullptr; if (!JavaLibrary::getObject (scriptObject, theObject)) { DEBUG_WARNING (true, ("isRelativePointOnSameFloorAsObject (): could not find scriptObject")); @@ -938,7 +938,7 @@ jfloat JNICALL ScriptMethodsTerrainNamespace::getFloorHeightAtRelativePointOnS return JNI_FALSE; //-- make sure we have a valid object - ServerObject * theObject = NULL; + ServerObject * theObject = nullptr; if (!JavaLibrary::getObject (scriptObject, theObject)) { DEBUG_WARNING (true, ("getFloorHeightAtRelativePointOnSameFloorAsObject (): could not find scriptObject")); @@ -1106,7 +1106,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::createClientPathAdvanced(JNIEnv */ jboolean JNICALL ScriptMethodsTerrainNamespace::setCreatureCoverDefault(JNIEnv *env, jobject self, jlong target) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1137,7 +1137,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::setCreatureCover(JNIEnv *env, jo { UNREF(self); - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if (!JavaLibrary::getObject(target, creature)) return JNI_FALSE; @@ -1149,7 +1149,7 @@ jboolean JNICALL ScriptMethodsTerrainNamespace::setCreatureCover(JNIEnv *env, jo void JNICALL ScriptMethodsTerrainNamespace::setCreatureCoverVisibility(JNIEnv * env, jobject self, jlong target, jboolean isVisible) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if(!JavaLibrary::getObject(target, creature)) return; @@ -1160,7 +1160,7 @@ void JNICALL ScriptMethodsTerrainNamespace::setCreatureCoverVisibility(JNIEnv * jboolean JNICALL ScriptMethodsTerrainNamespace::getCreatureCoverVisibility(JNIEnv * env, jobject self, jlong target) { - CreatureObject * creature = NULL; + CreatureObject * creature = nullptr; if(!JavaLibrary::getObject(target, creature)) return JNI_FALSE; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsVeteran.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsVeteran.cpp index d751acee..ed5f2322 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsVeteran.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsVeteran.cpp @@ -81,7 +81,7 @@ const JNINativeMethod NATIVES[] = { jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetTriggeredEvents(JNIEnv * /*env*/, jobject /*self*/, jlong player) { ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject const * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) { @@ -89,7 +89,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetTriggeredEvents(JN VeteranRewardManager::getTriggeredEventsIds(*playerCreature, eventsIds); if (eventsIds.empty()) - return NULL; + return nullptr; int i = 0; LocalObjectArrayRefPtr valueArray = createNewObjectArray(eventsIds.size(), JavaLibrary::getClsString()); @@ -102,7 +102,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetTriggeredEvents(JN return valueArray->getReturnValue(); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -110,7 +110,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetTriggeredEvents(JN jboolean JNICALL ScriptMethodsVeteranNamespace::veteranAccountFeatureIdRequest(JNIEnv * /*env*/, jobject /*self*/, jlong player) { ServerObject * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) { @@ -131,7 +131,7 @@ jboolean JNICALL ScriptMethodsVeteranNamespace::veteranAccountFeatureIdRequest(J jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesDescriptions(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring event) { ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject const * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) { @@ -152,7 +152,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesDescr } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -160,7 +160,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesDescr jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesTags(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring event) { ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject const * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) { @@ -181,7 +181,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesTags( } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -189,7 +189,7 @@ jobjectArray JNICALL ScriptMethodsVeteranNamespace::veteranGetRewardChoicesTags( jboolean JNICALL ScriptMethodsVeteranNamespace::veteranClaimReward(JNIEnv * /*env*/, jobject /*self*/, jlong player, jstring event, jstring rewardTag) { ServerObject const * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject const * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) { @@ -227,7 +227,7 @@ jstring JNICALL ScriptMethodsVeteranNamespace::veteranGetEventAnnouncement(JNIEn return eventAnnouncement.getReturnValue(); } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -245,7 +245,7 @@ jstring JNICALL ScriptMethodsVeteranNamespace::veteranGetEventDescription(JNIEnv return eventDescription.getReturnValue(); } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -263,7 +263,7 @@ jstring JNICALL ScriptMethodsVeteranNamespace::veteranGetEventUrl(JNIEnv * /*env return temp2.getReturnValue(); } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -313,7 +313,7 @@ jboolean JNICALL ScriptMethodsVeteranNamespace::veteranIsItemAccountUniqueFeatur void JNICALL ScriptMethodsVeteranNamespace::veteranWriteAccountDataToObjvars(JNIEnv * /*env*/, jobject /*self*/, jlong player) { ServerObject * const so = safe_cast(NetworkIdManager::getObjectById(NetworkId(player))); - CreatureObject * const playerCreature = so ? so->asCreatureObject() : NULL; + CreatureObject * const playerCreature = so ? so->asCreatureObject() : nullptr; if (playerCreature) VeteranRewardManager::writeAccountDataToObjvars(*playerCreature); @@ -323,11 +323,11 @@ void JNICALL ScriptMethodsVeteranNamespace::veteranWriteAccountDataToObjvars(JNI jboolean JNICALL ScriptMethodsVeteranNamespace::veteranCanTradeInReward(JNIEnv *env, jobject self, jlong player, jlong item) { - CreatureObject const * playerCreature = NULL; + CreatureObject const * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature) || !playerCreature) return JNI_FALSE; - ServerObject * itemObject = NULL; + ServerObject * itemObject = nullptr; if (!JavaLibrary::getObject(item, itemObject) || !itemObject) return JNI_FALSE; @@ -339,11 +339,11 @@ jboolean JNICALL ScriptMethodsVeteranNamespace::veteranCanTradeInReward(JNIEnv * void JNICALL ScriptMethodsVeteranNamespace::veteranTradeInReward(JNIEnv *env, jobject self, jlong player, jlong item) { - CreatureObject const * playerCreature = NULL; + CreatureObject const * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature) || !playerCreature) return; - ServerObject * itemObject = NULL; + ServerObject * itemObject = nullptr; if (!JavaLibrary::getObject(item, itemObject) || !itemObject) return; @@ -355,11 +355,11 @@ void JNICALL ScriptMethodsVeteranNamespace::veteranTradeInReward(JNIEnv *env, jo void JNICALL ScriptMethodsVeteranNamespace::adjustSwgTcgAccountFeatureId(JNIEnv *env, jobject self, jlong player, jlong item, jint featureId, jint adjustment) { - CreatureObject const * playerCreature = NULL; + CreatureObject const * playerCreature = nullptr; if (!JavaLibrary::getObject(player, playerCreature) || !playerCreature) return; - ServerObject * itemObject = NULL; + ServerObject * itemObject = nullptr; if (!JavaLibrary::getObject(item, itemObject) || !itemObject) return; diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsWaypoint.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsWaypoint.cpp index e9b3c546..18241735 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsWaypoint.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsWaypoint.cpp @@ -306,7 +306,7 @@ jobject JNICALL ScriptMethodsWaypointNamespace::getWaypointRegion(JNIEnv * env, if(w.isValid()) { const Region * region = RegionMaster::getSmallestVisibleRegionAtPoint(w.getLocation().getSceneId(), w.getLocation().getCoordinates().x, w.getLocation().getCoordinates().z); - if (region != NULL) + if (region != nullptr) { LocalRefPtr result; if (ScriptConversion::convert(*region, result)) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp index 3cc7c024..ca3d5b8d 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsWorldInfo.cpp @@ -182,7 +182,7 @@ const JNINativeMethod NATIVES[] = { * @param location location that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range) { @@ -212,7 +212,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInRangeLocation(JN * @param location object that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range) { @@ -242,7 +242,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInRangeObject(JNIE * @param location location that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range) { @@ -271,7 +271,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInRangeLocation( * @param location object that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range) { @@ -302,7 +302,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInRangeObject(JN * @param type * @param mask * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range, jint type, jint mask) { @@ -333,7 +333,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInRangeLo * @param type * @param mask * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range, jint type, jint mask) { @@ -363,7 +363,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInRangeOb * @param range radius of search area * @param species * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range, jint species) { @@ -393,7 +393,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInRange * @param range radius of search area * @param species * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range, jint species) { @@ -424,7 +424,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInRange * @param species * @param race * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range, jint species, jint race) { @@ -455,7 +455,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInRangeLoc * @param species * @param race * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range, jint species, jint race) { @@ -484,7 +484,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInRangeObj * @param location location that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range) { @@ -513,7 +513,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInRangeLocati * @param location object that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range) { @@ -542,7 +542,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInRangeObject * @param location location that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range) { @@ -571,7 +571,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInRangeLocation(JNIEn * @param location object that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range) { @@ -600,7 +600,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInRangeObject(JNIEnv * @param location location that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPlayerCreaturesInRangeLocation(JNIEnv *env, jobject self, jobject location, jfloat range) { @@ -629,7 +629,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPlayerCreaturesInRangeLoc * @param location object that is the center of the search area * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPlayerCreaturesInRangeObject(JNIEnv *env, jobject self, jlong object, jfloat range) { @@ -658,7 +658,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPlayerCreaturesInRangeObj * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -698,7 +698,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInCone(JNIEnv *env * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInConeLocation(JNIEnv *env, jobject self, jlong coneCenterObjectId, jobject coneDirectionLocation, jfloat range, jfloat angle) { @@ -738,7 +738,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getObjectsInConeLocation(JNI * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -779,7 +779,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInCone(JNIEnv *e * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInConeLocation(JNIEnv *env, jobject self, jlong coneCenterObjectId, jobject coneDirectionLocation, jfloat range, jfloat angle) { @@ -820,7 +820,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesInConeLocation(J * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle, jint niche, jint mask) { @@ -860,7 +860,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfNicheInCone(JN * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle, jint species) { @@ -900,7 +900,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfSpeciesInCone( * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle, jint species, jint race) { @@ -940,7 +940,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getCreaturesOfRaceInCone(JNI * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -980,7 +980,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNonCreaturesInCone(JNIEnv * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -1020,7 +1020,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getNPCsInCone(JNIEnv *env, j * @param env Java environment * @param self class calling this function * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPlayerCreaturesInCone(JNIEnv *env, jobject self, jlong coneCenterObjectId, jlong coneDirectionObjectId, jfloat range, jfloat angle) { @@ -1169,7 +1169,7 @@ jlong JNICALL ScriptMethodsWorldInfoNamespace::getClosestMobile(JNIEnv *env, job return 0; ServerObject * npc = ServerWorld::findClosestNPC(target, radius); - if (npc == NULL) + if (npc == nullptr) return 0; return (npc->getNetworkId()).getValue(); } @@ -1184,7 +1184,7 @@ jlong JNICALL ScriptMethodsWorldInfoNamespace::getClosestPlayer(JNIEnv *env, job return 0; ServerObject * player = ServerWorld::findClosestPlayer(target, radius); - if (player == NULL) + if (player == nullptr) return 0; return (player->getNetworkId()).getValue(); } @@ -1209,7 +1209,7 @@ jlong JNICALL ScriptMethodsWorldInfoNamespace::getFirstObjectWithScript(JNIEnv * for (ResultsType::iterator i=results.begin(); i!=results.end(); ++i) { - if (*i != NULL && (*i)->getScriptObject()->hasScript(scriptName)) + if (*i != nullptr && (*i)->getScriptObject()->hasScript(scriptName)) return ((*i)->getNetworkId()).getValue(); } @@ -1237,7 +1237,7 @@ jlong JNICALL ScriptMethodsWorldInfoNamespace::getFirstObjectWithObjVar(JNIEnv * for (ResultsType::iterator i=results.begin(); i!=results.end(); ++i) { - if (*i != NULL && (*i)->getObjVars().hasItem(objvarName)) + if (*i != nullptr && (*i)->getObjVars().hasItem(objvarName)) return ((*i)->getNetworkId()).getValue(); } @@ -1265,7 +1265,7 @@ jlong JNICALL ScriptMethodsWorldInfoNamespace::getFirstObjectWithTemplate(JNIEnv for (ResultsType::iterator i=results.begin(); i!=results.end(); ++i) { - if (*i != NULL && templateStr == (*i)->getTemplateName()) + if (*i != nullptr && templateStr == (*i)->getTemplateName()) return ((*i)->getNetworkId()).getValue(); } @@ -1434,7 +1434,7 @@ jstring JNICALL ScriptMethodsWorldInfoNamespace::getNameForPlanetObject(JNIEnv * } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1499,7 +1499,7 @@ jobject JNICALL ScriptMethodsWorldInfoNamespace::getValidLocation(JNIEnv *env, j // Determine if it's a valid point, and if not search for another one. - bool isValid = !CollisionWorld::query( Sphere(corralPoint,objectRadius),NULL); + bool isValid = !CollisionWorld::query( Sphere(corralPoint,objectRadius),nullptr); // ---------- @@ -1517,14 +1517,14 @@ jobject JNICALL ScriptMethodsWorldInfoNamespace::getValidLocation(JNIEnv *env, j // We failed to find a valid location - return NULL; + return nullptr; } // ---------------------------------------------------------------------- jboolean JNICALL ScriptMethodsWorldInfoNamespace::getCollidesWithObject(JNIEnv * env, jobject self, jobject jlocation, jfloat jradius) { - if (jlocation == NULL) + if (jlocation == nullptr) return JNI_FALSE; float const radius = jradius; @@ -1532,7 +1532,7 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::getCollidesWithObject(JNIEnv * if (!ScriptConversion::convertWorld(jlocation, location)) return JNI_FALSE; - bool const result = CollisionWorld::query(Sphere(location, radius), NULL); + bool const result = CollisionWorld::query(Sphere(location, radius), nullptr); if(result) return JNI_TRUE; @@ -1556,7 +1556,7 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::canSee(JNIEnv *env, jobject se { UNREF(self); - const ServerObject * sourceObject = NULL; + const ServerObject * sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) { NetworkId id(source); @@ -1572,7 +1572,7 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::canSee(JNIEnv *env, jobject se return JNI_TRUE; } - const ServerObject * targetObject = NULL; + const ServerObject * targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) { NetworkId id(target); @@ -1608,7 +1608,7 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::canSeeLocation(JNIEnv *env, jo { UNREF(self); - const ServerObject * sourceObject = NULL; + const ServerObject * sourceObject = nullptr; if (!JavaLibrary::getObject(source, sourceObject)) { NetworkId id(source); @@ -1640,11 +1640,11 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::canManipulate(JNIEnv *env, job { UNREF(self); - const CreatureObject * sourceObject = NULL; + const CreatureObject * sourceObject = nullptr; if (!JavaLibrary::getObject(player, sourceObject)) return JNI_FALSE; - const ServerObject * targetObject = NULL; + const ServerObject * targetObject = nullptr; if (!JavaLibrary::getObject(target, targetObject)) return JNI_FALSE; @@ -1663,7 +1663,7 @@ jboolean JNICALL ScriptMethodsWorldInfoNamespace::canManipulate(JNIEnv *env, job * @param performer performer we are looking for listeners of * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPerformanceListenersInRange(JNIEnv *env, jobject self, jlong performer, jfloat range) { @@ -1697,7 +1697,7 @@ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPerformanceListenersInRan * @param performer performer we are looking for watchers of * @param range radius of search area * - * @return array of obj_ids of the objects in range, or null on error + * @return array of obj_ids of the objects in range, or nullptr on error */ jlongArray JNICALL ScriptMethodsWorldInfoNamespace::getPerformanceWatchersInRange(JNIEnv *env, jobject self, jlong performer, jfloat range) { diff --git a/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp b/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp index 967939fb..46799842 100755 --- a/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptParamArchive.cpp @@ -56,7 +56,7 @@ void put(ByteStream & target, const std::vector *> { const std::vector * inner = source[i]; signed int innerLength = 0; - if (inner != NULL) + if (inner != nullptr) innerLength = inner->size(); put(target, innerLength); for (int j = 0; j < innerLength; ++j) diff --git a/engine/server/library/serverScript/src/shared/ScriptParameters.cpp b/engine/server/library/serverScript/src/shared/ScriptParameters.cpp index 78c5fde4..3ea2df78 100755 --- a/engine/server/library/serverScript/src/shared/ScriptParameters.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptParameters.cpp @@ -207,7 +207,7 @@ void ScriptParams::addParam(bool param, const std::string & paramName, bool owne * This call occurs because of a conversion of a datatype passing through this function from std::string to Unicode::String. * Basically, most times it is called with std::string the c_str() function is called. Since this is still valid when the * type is changed to Unicode::String and the const Unicode::unicode_char_t * is successfully auto-converted to const char * - * you wind up having a NULL string when it get explicitly converted to const char * on the other side. So, this should never + * you wind up having a nullptr string when it get explicitly converted to const char * on the other side. So, this should never * be called except in error. * void ScriptParams::addParam(const Unicode::unicode_char_t * param, const std::string & paramName, bool owned) @@ -659,7 +659,7 @@ bool ScriptParams::changeParam(int index, const StringId & param, bool owned) if (p.m_type != Param::STRING_ID) return false; - if (p.m_param.sidParam == NULL) + if (p.m_param.sidParam == nullptr) return false; if (p.m_owned) diff --git a/engine/server/library/serverScript/src/shared/ScriptParameters.h b/engine/server/library/serverScript/src/shared/ScriptParameters.h index 98aa0870..ab7468f2 100755 --- a/engine/server/library/serverScript/src/shared/ScriptParameters.h +++ b/engine/server/library/serverScript/src/shared/ScriptParameters.h @@ -311,7 +311,7 @@ inline const stdvector::fwd & ScriptParams::getLocationArrayPara inline const NetworkId & ScriptParams::getObjIdParam(int index) const { - if (m_params[index].m_param.oidParam != NULL) + if (m_params[index].m_param.oidParam != nullptr) return *m_params[index].m_param.oidParam; return NetworkId::cms_invalid; } // ScriptParams::getObjIdParam diff --git a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp index 85656cb2..e4075721 100755 --- a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp +++ b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp @@ -16,7 +16,7 @@ DataTable * AdminAccountManager::ms_adminTable = 0; bool AdminAccountManager::ms_installed = false; -std::string *AdminAccountManager::ms_dataTableName = NULL; +std::string *AdminAccountManager::ms_dataTableName = nullptr; //----------------------------------------------------------------------- @@ -42,7 +42,7 @@ void AdminAccountManager::remove() DataTableManager::close(*ms_dataTableName); ms_installed = false; delete ms_dataTableName; - ms_dataTableName = NULL; + ms_dataTableName = nullptr; } //----------------------------------------------------------------------- diff --git a/engine/server/library/serverUtility/src/shared/ChatLogManager.cpp b/engine/server/library/serverUtility/src/shared/ChatLogManager.cpp index 5f3cd77c..e5283c05 100755 --- a/engine/server/library/serverUtility/src/shared/ChatLogManager.cpp +++ b/engine/server/library/serverUtility/src/shared/ChatLogManager.cpp @@ -135,7 +135,7 @@ void ChatLogManagerNamespace::addChatLogEntry(Unicode::String const &fromPlayer, } else { - Unicode::String const *finalMessage = NULL; + Unicode::String const *finalMessage = nullptr; // Add the new string to the master message list, or if it already exists, just increase the reference count diff --git a/engine/server/library/serverUtility/src/shared/ClusterWideDataManagerList.cpp b/engine/server/library/serverUtility/src/shared/ClusterWideDataManagerList.cpp index 659f1c61..cfda04ff 100755 --- a/engine/server/library/serverUtility/src/shared/ClusterWideDataManagerList.cpp +++ b/engine/server/library/serverUtility/src/shared/ClusterWideDataManagerList.cpp @@ -36,7 +36,7 @@ namespace ClusterWideDataManagerListNamespace struct QueuedRequestInfo { - QueuedRequestInfo() : processId(0), requestTime(0.0), request(NULL), server(NULL) {}; + QueuedRequestInfo() : processId(0), requestTime(0.0), request(nullptr), server(nullptr) {}; unsigned long processId; float requestTime; @@ -272,7 +272,7 @@ void ClusterWideDataManagerList::onGameServerDisconnect(unsigned long const proc ClusterWideDataManagerListNamespace::ServerLockListConstRange range = ClusterWideDataManagerListNamespace::s_serverLockList.equal_range(processId); - ClusterWideDataManager * manager = NULL; + ClusterWideDataManager * manager = nullptr; for (ClusterWideDataManagerListNamespace::ServerLockList::const_iterator iter2 = range.first; iter2 != range.second; ++iter2) { manager = ClusterWideDataManagerListNamespace::getClusterWideDataManager((iter2->second).managerName, false); @@ -327,7 +327,7 @@ ClusterWideDataManager * ClusterWideDataManagerListNamespace::getClusterWideData return manager; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.cpp b/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.cpp index 3be9fe88..9f802549 100755 --- a/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.cpp +++ b/engine/server/library/serverUtility/src/shared/FreeCtsDataTable.cpp @@ -205,7 +205,7 @@ void FreeCtsDataTableNamespace::loadData() tokensSourceClusterList.clear(); tokensTargetClusterList.clear(); - if (Unicode::tokenize(Unicode::narrowToWide(sourceClusterList), tokensSourceClusterList, &clusterListDelimiters, NULL) && (tokensSourceClusterList.size() > 0) && Unicode::tokenize(Unicode::narrowToWide(targetClusterList), tokensTargetClusterList, &clusterListDelimiters, NULL) && (tokensTargetClusterList.size() > 0)) + if (Unicode::tokenize(Unicode::narrowToWide(sourceClusterList), tokensSourceClusterList, &clusterListDelimiters, nullptr) && (tokensSourceClusterList.size() > 0) && Unicode::tokenize(Unicode::narrowToWide(targetClusterList), tokensTargetClusterList, &clusterListDelimiters, nullptr) && (tokensTargetClusterList.size() > 0)) { for (tokensIter = tokensTargetClusterList.begin(); tokensIter != tokensTargetClusterList.end(); ++tokensIter) freeCtsInfo.targetCluster[Unicode::wideToNarrow(Unicode::toLower(*tokensIter))] = Unicode::wideToNarrow(*tokensIter); @@ -258,9 +258,9 @@ void FreeCtsDataTableNamespace::loadData() time_t FreeCtsDataTableNamespace::convertToEpoch(int const year, int const month, int const day, int const hour, int const minute, int const second) { - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); struct tm * timeinfo = ::localtime(&timeNow); - FATAL(!timeinfo, ("::localtime() returns NULL")); + FATAL(!timeinfo, ("::localtime() returns nullptr")); // greater than zero if Daylight Saving Time is in effect, // zero if Daylight Saving Time is not in effect, @@ -288,7 +288,7 @@ time_t FreeCtsDataTableNamespace::convertToEpoch(int const year, int const month // "opposite" standard/daylight period than the current time, // and it should be OK timeinfo = ::localtime(&convertedTime); - FATAL(!timeinfo, ("::localtime() returns NULL")); + FATAL(!timeinfo, ("::localtime() returns nullptr")); if ((timeinfo->tm_year != (year - 1900)) || (timeinfo->tm_mon != (month - 1)) || @@ -342,9 +342,9 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::isFreeCtsSourceCluster(s loadData(); if (s_freeCtsList.empty()) - return NULL; + return nullptr; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); std::pair::const_iterator, std::multimap::const_iterator> range = s_freeCtsList.equal_range(Unicode::toLower(sourceCluster)); for (std::multimap::const_iterator iter = range.first; iter != range.second; ++iter) { @@ -355,7 +355,7 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::isFreeCtsSourceCluster(s return &(iter->second); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -366,15 +366,15 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::wouldCharacterTransferBe loadData(); if (s_freeCtsList.empty()) - return NULL; + return nullptr; if ((sourceCharacterCreateTime <= 0) && !ignoreTimeRestriction) - return NULL; + return nullptr; if (sourceStationId != targetStationId) - return NULL; + return nullptr; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); std::string const lowerTargetCluster(Unicode::toLower(targetCluster)); std::pair::const_iterator, std::multimap::const_iterator> range = s_freeCtsList.equal_range(Unicode::toLower(sourceCluster)); @@ -396,7 +396,7 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::wouldCharacterTransferBe } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -407,12 +407,12 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::getFreeCtsInfoForCharact loadData(); if (s_freeCtsList.empty()) - return NULL; + return nullptr; if ((sourceCharacterCreateTime <= 0) && !ignoreTimeRestriction) - return NULL; + return nullptr; - time_t const timeNow = ::time(NULL); + time_t const timeNow = ::time(nullptr); std::pair::const_iterator, std::multimap::const_iterator> range = s_freeCtsList.equal_range(Unicode::toLower(sourceCluster)); for (std::multimap::const_iterator iter = range.first; iter != range.second; ++iter) { @@ -429,5 +429,5 @@ FreeCtsDataTable::FreeCtsInfo const * FreeCtsDataTable::getFreeCtsInfoForCharact return &(iter->second); } - return NULL; + return nullptr; } diff --git a/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp b/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp index 29d396da..c3dcaf32 100755 --- a/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp +++ b/engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp @@ -245,7 +245,7 @@ void DataTableTool::createOutputDirectoryForFile(const std::string & fileName) std::string directoryName(fileName, 0, slashPos); #if defined(PLATFORM_WIN32) - int result = CreateDirectory(directoryName.c_str(), NULL); + int result = CreateDirectory(directoryName.c_str(), nullptr); #elif defined(PLATFORM_LINUX) // make sure slashes are forward { diff --git a/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp b/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp index 8611bb0b..2a3658bb 100755 --- a/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp +++ b/engine/shared/application/TemplateCompiler/src/shared/TemplateCompiler.cpp @@ -46,7 +46,7 @@ static const int SUBMIT_NO_FILE_ERR = 17; // need to add file before submitting // virtual ~MyPerforceUser() {} // virtual void HandleError( Error *err ) // { -// if (err != NULL && err->Test()) +// if (err != nullptr && err->Test()) // { // m_errorOccurred = true; // m_lastError = err->GetGeneric(); @@ -154,7 +154,7 @@ int generateTemplate(File &definitionFp, File &templateFp) // we now need to move down the template definition heiarchy and write the // parameters of the base class - Filename basename(NULL, definitionFp.getFilename().getPath().c_str(), + Filename basename(nullptr, definitionFp.getFilename().getPath().c_str(), TemplateDefinitionFile.getBaseFilename().c_str(), TEMPLATE_DEFINITION_EXTENSION); if (basename.getName().size() == 0) return 0; @@ -185,8 +185,8 @@ int generateTemplate(File &definitionFp, File &templateFp) int generateTemplate(const char *definitionFile, const char *templateFile) { // check filename extensions - Filename defFile(NULL, NULL, definitionFile, TEMPLATE_DEFINITION_EXTENSION); - Filename temFile(NULL, NULL, templateFile, TEMPLATE_EXTENSION); + Filename defFile(nullptr, nullptr, definitionFile, TEMPLATE_DEFINITION_EXTENSION); + Filename temFile(nullptr, nullptr, templateFile, TEMPLATE_EXTENSION); File definitionFp; int i = 0; @@ -231,8 +231,8 @@ int generateTemplate(const char *definitionFile, const char *templateFile) int deriveTemplate(const char *baseFile, const char *templateFile) { // check filename extensions - Filename basFile(NULL, NULL, baseFile, TEMPLATE_EXTENSION); - Filename temFile(NULL, NULL, templateFile, TEMPLATE_EXTENSION); + Filename basFile(nullptr, nullptr, baseFile, TEMPLATE_EXTENSION); + Filename temFile(nullptr, nullptr, templateFile, TEMPLATE_EXTENSION); File basFp; if (!basFp.open(basFile, "rt")) @@ -263,7 +263,7 @@ int compileTemplate(const char *filename) { TpfFile templateFile; - Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); + Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_EXTENSION); return templateFile.makeIffFiles(templateFileName); } // compileTemplate @@ -279,7 +279,7 @@ int verifyTemplate(const char *filename) TpfFile templateFile; printf("Verifying %s: ", filename); - Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); + Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_EXTENSION); int result = templateFile.loadTemplate(templateFileName); if (result == 0) printf("file ok"); @@ -299,7 +299,7 @@ int updateTemplate(const char *filename) { TpfFile templateFile; - Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); + Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_EXTENSION); return templateFile.updateTemplate(templateFileName); } // updateTemplate */ @@ -317,7 +317,7 @@ TpfFile templateFile; //Error e; // // // check filename extensions -// Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); +// Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_EXTENSION); // Filename iffFileName = templateFileName; // iffFileName.setExtension(IFF_EXTENSION); // @@ -345,7 +345,7 @@ TpfFile templateFile; // IGNORE_RETURN(templateFile.loadTemplate(templateFileName)); // // // check out the client template iff file -// Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, IFF_EXTENSION); +// Filename iffName(nullptr, templateFile.getIffPath().c_str(), iffFileName, IFF_EXTENSION); // commands[1] = iffName; // client.SetArgv( 1, const_cast(&commands[1]) ); // client.Run( commands[0], &ui ); @@ -370,7 +370,7 @@ TpfFile templateFile; //Error e; // // // check filename extensions -// Filename templateFileName(NULL, NULL, filename, TEMPLATE_EXTENSION); +// Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_EXTENSION); // Filename iffFileName = templateFileName; // iffFileName.setExtension(IFF_EXTENSION); // @@ -424,7 +424,7 @@ TpfFile templateFile; // return -1; // // // add the client iff file -// Filename iffName(NULL, templateFile.getIffPath().c_str(), iffFileName, NULL); +// Filename iffName(nullptr, templateFile.getIffPath().c_str(), iffFileName, nullptr); // commands[1] = iffName; // client.SetArgv( 1, const_cast(&commands[1]) ); // client.Run( commands[0], &ui ); @@ -591,7 +591,7 @@ int main(int argc, char *argv[ ]) SetupSharedFoundation::Data data(SetupSharedFoundation::Data::D_console); #ifdef WIN32 char buffer[1024]; - GetModuleFileName(GetModuleHandle(NULL), buffer, 1024); + GetModuleFileName(GetModuleHandle(nullptr), buffer, 1024); Filename configName; configName.setName(buffer); configName.setName("templateCompiler.cfg"); @@ -607,7 +607,7 @@ int main(int argc, char *argv[ ]) // setup the random number generator // @todo need a better seed - SetupSharedRandom::install(static_cast(time(NULL))); + SetupSharedRandom::install(static_cast(time(nullptr))); // install templates SetupSharedTemplate::install(); diff --git a/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp b/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp index f95e5c6c..a9af01dd 100755 --- a/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp +++ b/engine/shared/application/TemplateDefinitionCompiler/src/shared/core/TemplateDefinitionCompiler.cpp @@ -30,7 +30,7 @@ //============================================================================== // file variables -const TemplateData *currentTemplateData = NULL; +const TemplateData *currentTemplateData = nullptr; //============================================================================== @@ -118,7 +118,7 @@ File fp; return; File temp_fp; - if (!temp_fp.open(tmpnam(NULL), "wt")) + if (!temp_fp.open(tmpnam(nullptr), "wt")) { fprintf(stderr, "error opening temp file for template header " "replacement [%s]\n", temp_fp.getFilename().getFullFilename().c_str()); @@ -244,7 +244,7 @@ int result; } File temp_fp; - if (!temp_fp.open(tmpnam(NULL), "wt")) + if (!temp_fp.open(tmpnam(nullptr), "wt")) { fprintf(stderr, "error opening temp file for template source " "replacement [%s]\n", temp_fp.getFilename().getFullFilename().c_str()); @@ -337,8 +337,8 @@ int result; // std::string oldTemplateName = tdfFile.getTemplateName(); // std::string oldBaseName = tdfFile.getBaseName(); - Filename fullName(NULL, path.getPath().c_str(), tdfFile.getTemplateName().c_str(), - NULL); + Filename fullName(nullptr, path.getPath().c_str(), tdfFile.getTemplateName().c_str(), + nullptr); writeTemplateHeader(tdfFile, fullName); result = writeTemplateSource(tdfFile, fullName); @@ -397,7 +397,7 @@ TemplateDefinitionFile tdfFile; //Error e; // // // check filename extensions -// Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); +// Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_DEFINITION_EXTENSION); // // // Connect to Perforce server // client.Init( &e ); @@ -433,7 +433,7 @@ TemplateDefinitionFile tdfFile; // if (tdfFile.getPath().getFullFilename().size() != 0) // { // // check out the source files -// Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), +// Filename sourceName(nullptr, tdfFile.getPath().getPath().c_str(), // tdfFile.getTemplateName().c_str(), "cpp"); // commands[1] = sourceName; // client.SetArgv( 1, const_cast(&commands[1]) ); @@ -453,7 +453,7 @@ TemplateDefinitionFile tdfFile; // std::string compilerFilename; // compilerFilename = EnumLocationTypes[tdfFile.getTemplateLocation()] + // filenameLowerToUpper(templateFileName.getName()); -// Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), +// Filename compilerName(nullptr, tdfFile.getCompilerPath().getPath().c_str(), // tdfFile.getTemplateName().c_str(), "cpp"); // commands[1] = compilerName; // client.SetArgv( 1, const_cast(&commands[1]) ); @@ -485,7 +485,7 @@ TemplateDefinitionFile tdfFile; //Error e; // // // check filename extensions -// Filename templateFileName(NULL, NULL, filename, TEMPLATE_DEFINITION_EXTENSION); +// Filename templateFileName(nullptr, nullptr, filename, TEMPLATE_DEFINITION_EXTENSION); // // // find the client and server paths // File fp(templateFileName, "rt"); @@ -546,7 +546,7 @@ TemplateDefinitionFile tdfFile; // if (tdfFile.getPath().getFullFilename().size() != 0) // { // // check in the source files -// Filename sourceName(NULL, tdfFile.getPath().getPath().c_str(), +// Filename sourceName(nullptr, tdfFile.getPath().getPath().c_str(), // tdfFile.getTemplateName().c_str(), "cpp"); // commands[1] = sourceName; // client.SetArgv( 1, const_cast(&commands[1]) ); @@ -563,7 +563,7 @@ TemplateDefinitionFile tdfFile; // if (tdfFile.getCompilerPath().getFullFilename().size() != 0) // { // // check in the compiler source files -// Filename compilerName(NULL, tdfFile.getCompilerPath().getPath().c_str(), +// Filename compilerName(nullptr, tdfFile.getCompilerPath().getPath().c_str(), // tdfFile.getTemplateName().c_str(), "cpp"); // commands[1] = compilerName; // client.SetArgv( 1, const_cast(&commands[1]) ); @@ -669,7 +669,7 @@ int main(int argc, char *argv[ ]) SetupSharedFoundation::Data data(SetupSharedFoundation::Data::D_console); #ifdef WIN32 char buffer[1024]; - GetModuleFileName(GetModuleHandle(NULL), buffer, 1024); + GetModuleFileName(GetModuleHandle(nullptr), buffer, 1024); Filename configName; configName.setName(buffer); configName.setName("templateCompiler.cfg"); @@ -685,7 +685,7 @@ int main(int argc, char *argv[ ]) // setup the random number generator // @todo need a better seed - SetupSharedRandom::install(static_cast(time(NULL))); + SetupSharedRandom::install(static_cast(time(nullptr))); int result = processArgs(argc, argv); diff --git a/engine/shared/library/sharedCollision/src/shared/core/BarrierObject.cpp b/engine/shared/library/sharedCollision/src/shared/core/BarrierObject.cpp index 204984ad..1c853c1b 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/BarrierObject.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/BarrierObject.cpp @@ -38,14 +38,14 @@ public: virtual bool canCollideWith ( CollisionProperty const * otherCollision ) const { - if(otherCollision == NULL) + if(otherCollision == nullptr) { return false; } BarrierObject const * barrier = safe_cast(&getOwner()); - if(barrier == NULL) + if(barrier == nullptr) { return false; } @@ -180,7 +180,7 @@ void BarrierObject::createAppearance ( void ) Appearance * appearance = CellProperty::createPortalBarrier(verts,gs_barrierColor); - if(appearance != NULL) + if(appearance != nullptr) { setAppearance( appearance ); diff --git a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.cpp b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.cpp index 1f046513..7e2c011b 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.cpp @@ -156,8 +156,8 @@ BoxTreeNode::BoxTreeNode() : m_box(), m_index(-1), m_userId(-1), - m_childA(NULL), - m_childB(NULL) + m_childA(nullptr), + m_childB(nullptr) { } @@ -165,8 +165,8 @@ BoxTreeNode::BoxTreeNode ( AxialBox const & box, int userId ) : m_box(box), m_index(-1), m_userId(userId), - m_childA(NULL), - m_childB(NULL) + m_childA(nullptr), + m_childB(nullptr) { } @@ -195,10 +195,10 @@ void BoxTreeNode::drawDebugShapes ( DebugShapeRenderer * renderer, VectorArgb co #ifdef _DEBUG - if(m_childA == NULL) return; - if(m_childB == NULL) return; + if(m_childA == nullptr) return; + if(m_childB == nullptr) return; - if(renderer == NULL) return; + if(renderer == nullptr) return; VectorArgb newColor( color.a, color.r * 0.9f, color.g * 0.9f, color.b * 0.9f ); @@ -227,7 +227,7 @@ int BoxTreeNode::getNodeCount ( void ) const float BoxTreeNode::calcWeight ( void ) const { - if((m_childA == NULL) && (m_childB == NULL)) return 1.0f; + if((m_childA == nullptr) && (m_childB == nullptr)) return 1.0f; float accum = 0.0f; @@ -241,9 +241,9 @@ float BoxTreeNode::calcWeight ( void ) const float BoxTreeNode::calcBalance ( void ) const { - if((m_childA == NULL) && (m_childB == NULL)) return 1.0f; + if((m_childA == nullptr) && (m_childB == nullptr)) return 1.0f; - if((m_childA != NULL) && (m_childB != NULL)) + if((m_childA != nullptr) && (m_childB != nullptr)) { return m_childA->calcWeight() / m_childB->calcWeight(); } @@ -288,8 +288,8 @@ void BoxTreeNode::packInto ( BoxTreeNode * node, BoxTreeNode * base ) const node->m_box = m_box; node->m_index = m_index; - node->m_childA = m_childA ? (base + m_childA->m_index) : NULL; - node->m_childB = m_childB ? (base + m_childB->m_index) : NULL; + node->m_childA = m_childA ? (base + m_childA->m_index) : nullptr; + node->m_childB = m_childB ? (base + m_childB->m_index) : nullptr; node->m_userId = m_userId; } @@ -302,10 +302,10 @@ void BoxTreeNode::deleteChildren ( void ) if(m_childB) m_childB->deleteChildren(); delete m_childA; - m_childA = NULL; + m_childA = nullptr; delete m_childB; - m_childB = NULL; + m_childB = nullptr; } // ---------------------------------------------------------------------- @@ -341,8 +341,8 @@ void BoxTreeNode::read ( Iff & iff, BoxTreeNode * base ) int indexA = iff.read_int32(); int indexB = iff.read_int32(); - m_childA = ( indexA != -1 ? base + indexA : NULL ); - m_childB = ( indexB != -1 ? base + indexB : NULL ); + m_childA = ( indexA != -1 ? base + indexA : nullptr ); + m_childB = ( indexB != -1 ? base + indexB : nullptr ); } // ---------------------------------------------------------------------- @@ -361,7 +361,7 @@ bool BoxTreeNode::findClosest ( Vector const & V, float maxDistance, float & out // ---------- // Leaf node case - this leaf node is closer - if((m_childA == NULL) && (m_childB == NULL)) + if((m_childA == nullptr) && (m_childB == nullptr)) { outDistance = dist; outIndex = m_userId; @@ -417,8 +417,8 @@ void BoxTree::install() // ---------------------------------------------------------------------- BoxTree::BoxTree() -: m_flatNodes(NULL), - m_root(NULL), +: m_flatNodes(nullptr), + m_root(nullptr), m_testCounter(0) { } @@ -443,7 +443,7 @@ void BoxTree::build ( BoxVec const & boxes ) // ---------- - BoxTreeNodePVec nodes(boxes.size(),NULL); + BoxTreeNodePVec nodes(boxes.size(),nullptr); int boxcount = boxes.size(); @@ -488,7 +488,7 @@ void BoxTree::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if(m_root) m_root->drawDebugShapes( renderer, VectorArgb::solidWhite, 0 ); @@ -546,7 +546,7 @@ static inline void templateTestOverlapRecurse( BoxTreeNode const * node, TestSha template< class TestShape > static inline bool templateTestOverlap( BoxTree const & tree, TestShape const & testShape, IdVec & outIds ) { - if(tree.getRoot() == NULL) return false; + if(tree.getRoot() == nullptr) return false; int oldSize = outIds.size(); @@ -580,7 +580,7 @@ static inline void templateTestOverlapRecurse2( BoxTreeNode const * node, TestSh template< class TestShape > static inline bool templateTestOverlap2( BoxTree const & tree, TestShape const & testShape, IdVec & outIds ) { - if(tree.getRoot() == NULL) return false; + if(tree.getRoot() == nullptr) return false; int oldSize = outIds.size(); @@ -701,11 +701,11 @@ void BoxTree::clear ( void ) m_root->deleteChildren(); delete m_root; - m_root = NULL; + m_root = nullptr; } delete m_flatNodes; - m_flatNodes = NULL; + m_flatNodes = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h index 9a2d6545..d32e2fea 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h +++ b/engine/shared/library/sharedCollision/src/shared/core/BoxTree.h @@ -108,7 +108,7 @@ inline int BoxTree::getTestCounter ( void ) const inline bool BoxTree::isFlat ( void ) const { - return m_flatNodes != NULL; + return m_flatNodes != nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionBuckets.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionBuckets.cpp index af528e5f..c3c6c5c0 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionBuckets.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionBuckets.cpp @@ -162,7 +162,7 @@ void CollisionBuckets::build(Vector const & minimumBounds, Vector const & maximu (*m_nodeMatrix)[xx].resize(m_bucketsAlongY); for (unsigned int yy = 0; yy < m_bucketsAlongY; ++yy) { - // note that nodes are initialized to NULL + // note that nodes are initialized to nullptr (*m_nodeMatrix)[xx][yy].resize(m_bucketsAlongZ, 0); } } diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.cpp index 80a0e930..cca52f64 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionMesh.cpp @@ -106,8 +106,8 @@ CollisionMesh::CollisionMesh() : CollisionSurface(), m_id(0), m_version(1), - m_boxTree(NULL), - m_extent(NULL), + m_boxTree(nullptr), + m_extent(nullptr), m_boundsDirty(true) { m_extent = new SimpleExtent( MultiShape(AxialBox()) ); @@ -116,10 +116,10 @@ CollisionMesh::CollisionMesh() CollisionMesh::~CollisionMesh() { delete m_boxTree; - m_boxTree = NULL; + m_boxTree = nullptr; delete m_extent; - m_extent = NULL; + m_extent = nullptr; } // ---------------------------------------------------------------------- @@ -154,7 +154,7 @@ BaseExtent const * CollisionMesh::getExtent_p ( void ) const void CollisionMesh::clear ( void ) { delete m_boxTree; - m_boxTree = NULL; + m_boxTree = nullptr; } // ---------------------------------------------------------------------- @@ -1010,7 +1010,7 @@ void CollisionMesh::transform( CollisionMesh const * sourceMesh, Transform const bool CollisionMesh::hasBoxTree ( void ) const { - return m_boxTree != NULL; + return m_boxTree != nullptr; } // ---------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionNotification.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionNotification.cpp index 6fba343e..2c5d349d 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionNotification.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionNotification.cpp @@ -75,7 +75,7 @@ void CollisionNotification::purgeQueue ( void ) Object * object = entry.m_object; - if(object == NULL) continue; + if(object == nullptr) continue; if(entry.m_added) { diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.cpp index 5e22c064..b8cc9332 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionProperty.cpp @@ -44,7 +44,7 @@ namespace CollisionPropertyNamespace { - CollisionProperty * ms_activeListHead = NULL; + CollisionProperty * ms_activeListHead = nullptr; }; using namespace CollisionPropertyNamespace; @@ -64,8 +64,8 @@ void CollisionProperty::detachList ( void ) ms_activeListHead = m_next; } - m_prev = NULL; - m_next = NULL; + m_prev = nullptr; + m_next = nullptr; } // ---------- @@ -76,7 +76,7 @@ void CollisionProperty::attachList ( CollisionProperty * & head ) if(head) head->m_prev = this; - m_prev = NULL; + m_prev = nullptr; m_next = head; head = this; @@ -129,7 +129,7 @@ CollisionProperty * CollisionProperty::getActiveHead ( void ) Transform getTransform_o2c( Object const * object ) { - if(object == NULL) return Transform::identity; + if(object == nullptr) return Transform::identity; // If this object is a cell, its o2c transform is the identity transform @@ -164,23 +164,23 @@ CollisionProperty::CollisionProperty( Object & owner ) : Property( CollisionProperty::getClassPropertyId(), owner ), m_lastTransform_w(Transform::identity), m_lastTransform_p(Transform::identity), - m_lastCellObject(NULL), + m_lastCellObject(nullptr), m_stepHeight(0.0f), m_defaultRadius(0.0f), m_offsetX(0.0f), m_offsetZ(0.0f), m_extentsDirty(true), - m_extent_l(NULL), - m_extent_p(NULL), + m_extent_l(nullptr), + m_extent_p(nullptr), m_sphere_l(), m_sphere_w(), m_scale(owner.getScale().x), - m_spatialSubdivisionHandle(NULL), - m_floor(NULL), - m_footprint(NULL), + m_spatialSubdivisionHandle(nullptr), + m_floor(nullptr), + m_footprint(nullptr), m_idleCounter(3), - m_next(NULL), - m_prev(NULL), + m_next(nullptr), + m_prev(nullptr), m_flags(F_collidable), m_spatialDatabaseStorageType(SpatialDatabase::Q_None) { @@ -200,7 +200,7 @@ CollisionProperty::CollisionProperty( Object & owner ) { char const * const found = strstr(templateName,"lair"); - if(found != NULL) + if(found != nullptr) { setCollidable(false); } @@ -214,23 +214,23 @@ CollisionProperty::CollisionProperty( Object & owner, SharedObjectTemplate const : Property( CollisionProperty::getClassPropertyId(), owner ), m_lastTransform_w(Transform::identity), m_lastTransform_p(Transform::identity), - m_lastCellObject(NULL), + m_lastCellObject(nullptr), m_stepHeight(0.0f), m_defaultRadius(0.0f), m_offsetX(0.0f), m_offsetZ(0.0f), m_extentsDirty(true), - m_extent_l(NULL), - m_extent_p(NULL), + m_extent_l(nullptr), + m_extent_p(nullptr), m_sphere_l(), m_sphere_w(), m_scale(owner.getScale().x), - m_spatialSubdivisionHandle(NULL), - m_floor(NULL), - m_footprint(NULL), + m_spatialSubdivisionHandle(nullptr), + m_floor(nullptr), + m_footprint(nullptr), m_idleCounter(3), - m_next(NULL), - m_prev(NULL), + m_next(nullptr), + m_prev(nullptr), m_flags(F_collidable), m_spatialDatabaseStorageType(SpatialDatabase::Q_None) { @@ -248,7 +248,7 @@ CollisionProperty::CollisionProperty( Object & owner, SharedObjectTemplate const { char const * const found = strstr(templateName,"lair"); - if(found != NULL) + if(found != nullptr) { setCollidable(false); } @@ -373,7 +373,7 @@ CollisionProperty::~CollisionProperty() static_cast::NodeHandle *>(m_spatialSubdivisionHandle)->removeObject(); - m_spatialSubdivisionHandle = NULL; + m_spatialSubdivisionHandle = nullptr; } FATAL(CollisionWorld::isUpdating(),("CollisionProperty::~CollisionProperty - Trying to destroy a collision property while the collision world is updating. This is baaaad\n")); @@ -382,16 +382,16 @@ CollisionProperty::~CollisionProperty() detachList(); delete m_extent_l; - m_extent_l = NULL; + m_extent_l = nullptr; delete m_extent_p; - m_extent_p = NULL; + m_extent_p = nullptr; delete m_floor; - m_floor = NULL; + m_floor = nullptr; delete m_footprint; - m_footprint = NULL; + m_footprint = nullptr; } @@ -405,7 +405,7 @@ void CollisionProperty::attachSourceExtent ( BaseExtent * newSourceExtent ) cons m_extent_l = newSourceExtent; delete m_extent_p; - m_extent_p = NULL; + m_extent_p = nullptr; m_extentsDirty = true; } @@ -437,12 +437,12 @@ void CollisionProperty::initFloor ( void ) if (isMobile()) return; - if(m_floor != NULL) + if(m_floor != nullptr) return; // ---------- - char const *floorName = NULL; + char const *floorName = nullptr; Appearance * appearance = getOwner().getAppearance(); if(appearance) @@ -487,7 +487,7 @@ void CollisionProperty::addToCollisionWorld ( void ) if (getOwner().getNetworkId() < NetworkId::cms_invalid) { delete m_footprint; - m_footprint = NULL; + m_footprint = nullptr; } if (m_footprint) @@ -534,7 +534,7 @@ Transform CollisionProperty::getTransform_o2c ( void ) const BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { - if(!sourceExtent) return NULL; + if(!sourceExtent) return nullptr; switch(sourceExtent->getType()) { @@ -549,7 +549,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { Extent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; return new SimpleExtent( MultiShape( extent->getShape() ) ); } @@ -558,7 +558,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { CylinderExtent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; return new SimpleExtent( MultiShape( extent->getShape() ) ); } @@ -567,7 +567,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { BoxExtent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; return new SimpleExtent( MultiShape( extent->getShape() ) ); } @@ -576,7 +576,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { MeshExtent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; return extent->clone(); } @@ -585,7 +585,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { DetailExtent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; DetailExtent * newExtent = new DetailExtent(); @@ -603,7 +603,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) { ComponentExtent const * extent = safe_cast(sourceExtent); - if(!extent) return NULL; + if(!extent) return nullptr; ComponentExtent * newExtent = new ComponentExtent(); @@ -623,7 +623,7 @@ BaseExtent * convertToSimpleExtent ( BaseExtent const * sourceExtent ) case ET_Null: case ET_ExtentTypeCount: default: - return NULL; + return nullptr; } } @@ -653,10 +653,10 @@ void CollisionProperty::updateExtents ( void ) const if(m_scale != newScale) { delete m_extent_l; - m_extent_l = NULL; + m_extent_l = nullptr; delete m_extent_p; - m_extent_p = NULL; + m_extent_p = nullptr; m_scale = newScale; } @@ -960,7 +960,7 @@ void CollisionProperty::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if(ConfigSharedCollision::getDrawExtents()) { @@ -1274,9 +1274,9 @@ void CollisionProperty::setLastPos ( CellProperty * cell, Transform const & tran { NAN_CHECK(transform_p); - if(cell == NULL) + if(cell == nullptr) { - m_lastCellObject = NULL; + m_lastCellObject = nullptr; m_lastTransform_p = transform_p; m_lastTransform_w = transform_p; } @@ -1298,7 +1298,7 @@ Object const * CollisionProperty::getStandingOn ( void ) const } else { - return NULL; + return nullptr; } } diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.cpp index 0638c13c..759a5f30 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.cpp @@ -87,7 +87,7 @@ namespace CollisionResolveNamespace FloorContactList ms_floorContactList; - Floor const * ms_ignoreFloor = NULL; + Floor const * ms_ignoreFloor = nullptr; int ms_ignoreTriId = -1; int ms_ignoreEdge = -1; Vector ms_ignoreNormal = Vector::zero; @@ -312,7 +312,7 @@ ResolutionResult CollisionResolve::resolveCollisions(CollisionProperty * collide if(result == RR_Resolved) { - colliderA->hitBy(NULL); + colliderA->hitBy(nullptr); colliderA->setExtentsDirty(true); Vector resetPos = moveSeg.getBegin(moveSeg.m_cellB); @@ -339,7 +339,7 @@ ResolutionResult CollisionResolve::resolveCollisions ( CellProperty const * cell const int iterationCount = 8; - ms_ignoreFloor = NULL; + ms_ignoreFloor = nullptr; ms_ignoreTriId = -1; ms_ignoreEdge = -1; ms_ignoreTime = REAL_MAX; @@ -484,12 +484,12 @@ ResolutionResult CollisionResolve::resolveCollisions ( CellProperty const * cell // ---------- // Remove the hit obstacle from the extent list - if(obstacleList->at(minIndex).m_extent != NULL) + if(obstacleList->at(minIndex).m_extent != nullptr) { obstacleList->at(minIndex) = obstacleList->back(); obstacleList->resize(obstacleList->size()-1); - ms_ignoreFloor = NULL; + ms_ignoreFloor = nullptr; ms_ignoreTriId = -1; ms_ignoreEdge = -1; ms_ignoreTime = REAL_MAX; @@ -561,13 +561,13 @@ void CollisionResolve::explodeExtent ( CellProperty const * cell, BaseExtent con void CollisionResolve::explodeFootprint ( Footprint * foot, ObstacleList & obstacleList, FloorContactList & floorContacts ) { - if(foot == NULL) return; + if(foot == nullptr) return; for(ContactIterator it(foot->getFloorList()); it; ++it) { FloorContactShape * contact = (*it); - if(contact == NULL) + if(contact == nullptr) continue; obstacleList.push_back( ObstacleInfo(contact->m_contact.getCell(),contact) ); @@ -594,7 +594,7 @@ void CollisionResolve::explodeCollider(CollisionProperty * colliderA, ColliderLi { CollisionProperty const * const colliderB = *ii; - if(colliderB == NULL) continue; + if(colliderB == nullptr) continue; BaseExtent const * const extentB = colliderB->getExtent_p(); @@ -613,7 +613,7 @@ void CollisionResolve::explodeCollider(CollisionProperty * colliderA, ColliderLi { FloorContactShape * const contact = (*it); - if(contact == NULL) continue; + if(contact == nullptr) continue; ms_floorContactList.push_back(contact); } @@ -713,7 +713,7 @@ Contact CollisionResolve::findContactWithFloor ( FloorContactShape * floorContac Floor const * floor = loc.getFloor(); - if(floor == NULL) return Contact::noContact; + if(floor == nullptr) return Contact::noContact; CellProperty const * floorCell = loc.getCell(); @@ -740,7 +740,7 @@ Contact CollisionResolve::findContactWithFloor ( FloorContactShape * floorContac return Contact::noContact; } - if((ms_ignoreFloor == NULL) || (floor != ms_ignoreFloor)) + if((ms_ignoreFloor == nullptr) || (floor != ms_ignoreFloor)) { walkResult = floor->canMove(loc,delta,-1,-1,result); } @@ -776,7 +776,7 @@ Contact CollisionResolve::findContactWithFloor ( FloorContactShape * floorContac tempContact.m_surfaceId2 = result.getHitEdgeId(); tempContact.m_cell = floorCell; - tempContact.m_extent = NULL; + tempContact.m_extent = nullptr; tempContact.m_surface = result.getFloor(); } } diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h index 7e4b9e44..77bf73b0 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionResolve.h @@ -27,22 +27,22 @@ class Floor; struct ObstacleInfo { ObstacleInfo() - : m_cell(NULL), - m_extent(NULL), - m_floorContact(NULL) + : m_cell(nullptr), + m_extent(nullptr), + m_floorContact(nullptr) { } ObstacleInfo ( CellProperty const * cell, SimpleExtent const * extent ) : m_cell(cell), m_extent(extent), - m_floorContact(NULL) + m_floorContact(nullptr) { } ObstacleInfo ( CellProperty const * cell, FloorContactShape * contact ) : m_cell(cell), - m_extent(NULL), + m_extent(nullptr), m_floorContact(contact) { } diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp index 4c994abf..5d8192b5 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp @@ -881,7 +881,7 @@ void MergePolyPoly ( VertexList & polyA, VertexList & polyB, VertexList & outPol void BuildConvexHull ( Vector const * sortedVerts, int vertCount, VertexList & outPoly ) { - if(sortedVerts == NULL) return; + if(sortedVerts == nullptr) return; if(vertCount <= 0) return; if(vertCount == 1) { outPoly.push_back(sortedVerts[0]); return; } @@ -1104,7 +1104,7 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, BaseExtent const * extent ); RangeLoop CalcAvoidanceThetas ( Sphere const & S, SimpleExtent const * extent ) { - if(extent == NULL) return RangeLoop::empty; + if(extent == nullptr) return RangeLoop::empty; return CalcAvoidanceThetas(S,extent->getShape()); } @@ -1113,7 +1113,7 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, SimpleExtent const * extent ) RangeLoop CalcAvoidanceThetas ( Sphere const & S, ComponentExtent const * extent ) { - if(extent == NULL) return RangeLoop::empty; + if(extent == nullptr) return RangeLoop::empty; RangeLoop range = RangeLoop::empty; @@ -1123,7 +1123,7 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, ComponentExtent const * extent { BaseExtent const * child = extent->getExtent(i); - if(child == NULL) continue; + if(child == nullptr) continue; RangeLoop temp = CalcAvoidanceThetas(S,child); @@ -1137,13 +1137,13 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, ComponentExtent const * extent RangeLoop CalcAvoidanceThetas ( Sphere const & S, DetailExtent const * extent ) { - if(extent == NULL) return RangeLoop::empty; + if(extent == nullptr) return RangeLoop::empty; int count = extent->getExtentCount(); BaseExtent const * child = extent->getExtent(count - 1); - if(child == NULL) return RangeLoop::empty; + if(child == nullptr) return RangeLoop::empty; return CalcAvoidanceThetas(S,child); } @@ -1152,7 +1152,7 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, DetailExtent const * extent ) RangeLoop CalcAvoidanceThetas ( Sphere const & S, BaseExtent const * extent ) { - if(extent == NULL) return RangeLoop::empty; + if(extent == nullptr) return RangeLoop::empty; ExtentType type = extent->getType(); @@ -1176,7 +1176,7 @@ RangeLoop CalcAvoidanceThetas ( Sphere const & S, ExtentVec const & extents ) { BaseExtent const * child = extents[i]; - if(child == NULL) continue; + if(child == nullptr) continue; RangeLoop temp = CalcAvoidanceThetas(S,child); @@ -1367,7 +1367,7 @@ void explodeObstacle ( Sphere const & sphere, Vector const & delta, SimpleExtent void explodeObstacle ( Sphere const & sphere, Vector const & delta, DetailExtent const * extent, ExtentVec & outList ) { - if(extent == NULL) return; + if(extent == nullptr) return; int count = extent->getExtentCount(); @@ -1376,7 +1376,7 @@ void explodeObstacle ( Sphere const & sphere, Vector const & delta, DetailExtent void explodeObstacle ( Sphere const & sphere, Vector const & delta, ComponentExtent const * extent, ExtentVec & outList ) { - if(extent == NULL) return; + if(extent == nullptr) return; int count = extent->getExtentCount(); @@ -1388,7 +1388,7 @@ void explodeObstacle ( Sphere const & sphere, Vector const & delta, ComponentExt void explodeObstacle ( Sphere const & sphere, Vector const & delta, BaseExtent const * extent, ExtentVec & outList ) { - if(extent == NULL) return; + if(extent == nullptr) return; ExtentType type = extent->getType(); @@ -1411,7 +1411,7 @@ void explodeObstacle ( Sphere const & sphere, Vector const & delta, ExtentVec co bool CalcAvoidancePoint ( Sphere const & sphere, Transform const & sphereTransform_p2w, Vector const & delta, CollisionProperty const * obstacle, Vector & out ) { - if(obstacle == NULL) return false; + if(obstacle == nullptr) return false; static ExtentVec tempExtents; @@ -1455,12 +1455,12 @@ bool CalcAvoidancePoint ( Sphere const & sphere, Transform const & sphereTransfo bool CalcAvoidancePoint ( CollisionProperty const * mob, Vector const & delta, CollisionProperty const * obstacle, Vector & out ) { - if(mob == NULL) return false; - if(obstacle == NULL) return false; + if(mob == nullptr) return false; + if(obstacle == nullptr) return false; BaseExtent const * mobExtent = mob->getExtent_p(); - if(mobExtent == NULL) return false; + if(mobExtent == nullptr) return false; Sphere mobSphere = mobExtent->getBoundingSphere(); @@ -1471,8 +1471,8 @@ bool CalcAvoidancePoint ( CollisionProperty const * mob, Vector const & delta, C bool CalcAvoidancePoint ( Object const * mob, Vector const & delta, Object const * obstacle, Vector & out ) { - if(mob == NULL) return false; - if(obstacle == NULL) return false; + if(mob == nullptr) return false; + if(obstacle == nullptr) return false; CollisionProperty const * mobCollision = mob->getCollisionProperty(); CollisionProperty const * obstacleCollision = obstacle->getCollisionProperty(); @@ -1601,8 +1601,8 @@ Vector transformToCell ( CellProperty const * cellA, Vector const & point_A, Cel { CellProperty const * worldCell = CellProperty::getWorldCellProperty(); - if(cellA == NULL) cellA = worldCell; - if(cellB == NULL) cellB = worldCell; + if(cellA == nullptr) cellA = worldCell; + if(cellB == nullptr) cellB = worldCell; if(cellA == cellB) return point_A; @@ -1627,8 +1627,8 @@ Vector rotateToCell ( CellProperty const * cellA, Vector const & point_A, CellPr { CellProperty const * worldCell = CellProperty::getWorldCellProperty(); - if(cellA == NULL) cellA = worldCell; - if(cellB == NULL) cellB = worldCell; + if(cellA == nullptr) cellA = worldCell; + if(cellB == nullptr) cellB = worldCell; if(cellA == cellB) return point_A; @@ -1655,8 +1655,8 @@ Transform transformToCell ( CellProperty const * cellA, Transform const & transf { CellProperty const * worldCell = CellProperty::getWorldCellProperty(); - if(cellA == NULL) cellA = worldCell; - if(cellB == NULL) cellB = worldCell; + if(cellA == nullptr) cellA = worldCell; + if(cellB == nullptr) cellB = worldCell; if(cellA == cellB) return transform_A; @@ -1743,8 +1743,8 @@ MultiShape transformToCell ( CellProperty const * cellA, MultiShape const & shap bool testPortalVis ( CellProperty const * cellA, Vector const & pointA, CellProperty const * cellB, Vector const & pointB ) { - if(cellA == NULL) return false; - if(cellB == NULL) return false; + if(cellA == nullptr) return false; + if(cellB == nullptr) return false; float hitTime = 0.0f; @@ -1753,7 +1753,7 @@ bool testPortalVis ( CellProperty const * cellA, Vector const & pointA, CellProp if(cellA == cellB) { - return cellA->getDestinationCell(pointA,pointB,hitTime) == NULL; + return cellA->getDestinationCell(pointA,pointB,hitTime) == nullptr; } // ---------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.cpp b/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.cpp index 29d98133..61b199f9 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/CollisionWorld.cpp @@ -71,7 +71,7 @@ namespace CollisionWorldNamespace // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SpatialDatabase * ms_database = NULL; + SpatialDatabase * ms_database = nullptr; bool ms_updating = false; bool ms_serverSide = false; @@ -94,7 +94,7 @@ namespace CollisionWorldNamespace bool testPassableTerrain(Vector const & startPos, Vector const & delta, float & collisionTime) { TerrainObject const *const terrainObject = TerrainObject::getConstInstance(); - if (NULL != terrainObject) + if (nullptr != terrainObject) { float totalDistance = delta.magnitude(); float distanceTraversed = 0.0f; @@ -134,7 +134,7 @@ namespace CollisionWorldNamespace return; TerrainObject const *const terrainObject = TerrainObject::getConstInstance(); - if (NULL != terrainObject && terrainObject->hasPassableAffectors()) + if (nullptr != terrainObject && terrainObject->hasPassableAffectors()) { // pointA_w is *not* the previous world position, but actually the world @@ -289,7 +289,7 @@ bool CollisionWorldNamespace::testFloorCollision(FloorLocator const &startFloorL if (!floor) { // For some reason this solid floor does not have an attached floor. No collision. - WARNING(true, ("testFloorCollision(): attempted to test floor with a starting floor locator that had a NULL floor, unexpected. Check calling code's assumptions.")); + WARNING(true, ("testFloorCollision(): attempted to test floor with a starting floor locator that had a nullptr floor, unexpected. Check calling code's assumptions.")); return true; } @@ -319,7 +319,7 @@ bool CollisionWorldNamespace::testFloorCollision(FloorLocator const &startFloorL // if statement above. WARNING(true, ("testFloorCollision(): floor collision occurred while checking for floor collisions for floor of object id [%s] but collision floor location has no associated floor. Calling this a non-collision. PathWalkResult was [%d].", - floor->getOwner() ? floor->getOwner()->getNetworkId().getValueString().c_str() : "", + floor->getOwner() ? floor->getOwner()->getNetworkId().getValueString().c_str() : "", static_cast(pathWalkResult) )); return false; @@ -328,8 +328,8 @@ bool CollisionWorldNamespace::testFloorCollision(FloorLocator const &startFloorL collisionObject = destinationFloor->getOwner(); if (!collisionObject) { - // We had a collision on a floor, but the floor had a NULL owner. Consider this a non-collision. - WARNING(true, ("testFloorCollision(): floor collision occurred, destination collision floor location had a floor but floor reported a NULL owner. Calling this a non-collision.")); + // We had a collision on a floor, but the floor had a nullptr owner. Consider this a non-collision. + WARNING(true, ("testFloorCollision(): floor collision occurred, destination collision floor location had a floor but floor reported a nullptr owner. Calling this a non-collision.")); return false; } @@ -447,11 +447,11 @@ void CollisionWorld::remove ( void ) CollisionResolve::remove(); FloorMesh::remove(); - s_nearWarpWarningCallback = NULL; - s_farWarpWarningCallback = NULL; + s_nearWarpWarningCallback = nullptr; + s_farWarpWarningCallback = nullptr; delete ms_database; - ms_database = NULL; + ms_database = nullptr; } // ---------------------------------------------------------------------- @@ -595,7 +595,7 @@ bool CollisionWorld::spatialSweepAndResolve(CollisionProperty * collider) void CollisionWorld::update(CollisionProperty * collider, float time) { - FATAL(!collider, ("CollisionWorld::update(): collider is NULL.")); + FATAL(!collider, ("CollisionWorld::update(): collider is nullptr.")); PROFILER_AUTO_BLOCK_DEFINE("CollisionWorld::update"); @@ -603,9 +603,9 @@ void CollisionWorld::update(CollisionProperty * collider, float time) Footprint * foot = collider->getFootprint(); - if(foot == NULL) + if(foot == nullptr) { - PROFILER_AUTO_BLOCK_DEFINE("CollisionWorld::update: foot == NULL"); + PROFILER_AUTO_BLOCK_DEFINE("CollisionWorld::update: foot == nullptr"); IGNORE_RETURN (CollisionWorld::spatialSweepAndResolve(collider)); collider->storePosition(); @@ -1076,11 +1076,11 @@ void CollisionWorld::setFarWarpWarningCallback(WarpWarningCallback callback) void CollisionWorld::addObject ( Object * object ) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); - if((collision == NULL) || collision->getDisableCollisionWorldAddRemove()) return; + if((collision == nullptr) || collision->getDisableCollisionWorldAddRemove()) return; if(collision->isInCollisionWorld()) return; @@ -1125,7 +1125,7 @@ void CollisionWorld::addObject ( Object * object ) { char const * name = object->getObjectTemplateName(); - if(name == NULL) + if(name == nullptr) { Appearance const * appearance = object->getAppearance(); @@ -1162,11 +1162,11 @@ void CollisionWorld::addObject ( Object * object ) void CollisionWorld::removeObject ( Object * object ) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); - if((collision == NULL) || collision->getDisableCollisionWorldAddRemove()) return; + if((collision == nullptr) || collision->getDisableCollisionWorldAddRemove()) return; if(!collision->isInCollisionWorld()) return; @@ -1218,11 +1218,11 @@ void CollisionWorld::removeObject ( Object * object ) void CollisionWorld::moveObject (Object * object) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); - if(collision == NULL) return; + if(collision == nullptr) return; if(!collision->isInCollisionWorld()) return; @@ -1248,11 +1248,11 @@ void CollisionWorld::moveObject (Object * object) void CollisionWorld::cellChanged ( Object * object ) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); - if(collision == NULL) return; + if(collision == nullptr) return; if(!collision->isInCollisionWorld()) return; @@ -1266,11 +1266,11 @@ void CollisionWorld::cellChanged ( Object * object ) void CollisionWorld::appearanceChanged ( Object * object ) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); - if(collision == NULL) return; + if(collision == nullptr) return; if(!collision->isInCollisionWorld()) return; @@ -1333,12 +1333,12 @@ SpatialDatabase * CollisionWorld::getDatabase ( void ) void CollisionWorld::objectWarped ( Object * object ) { - if(object == NULL) return; + if(object == nullptr) return; CollisionProperty * collision = object->getCollisionProperty(); // object does not have a CollisionProperty - if(collision == NULL) return; + if(collision == nullptr) return; // object is not in CollisionWorld if (!collision->isInCollisionWorld()) return; @@ -1458,7 +1458,7 @@ QueryInteractionResult CollisionWorld::queryInteraction ( CellProperty const * c if(hitTime < hitPortalTime) { outHitTime = hitTime; - outHitObject = NULL; + outHitObject = nullptr; return QIR_HitTerrain; } @@ -1472,12 +1472,12 @@ QueryInteractionResult CollisionWorld::queryInteraction ( CellProperty const * c // If we did not hit a portal, the query ends in this cell. // If this cell is not the goal cell, then the query fails. - if(nextCell == NULL) + if(nextCell == nullptr) { if(cellA != cellB) { outHitTime = 1.0f; - outHitObject = NULL; + outHitObject = nullptr; return QIR_MissedTarget; } @@ -1702,7 +1702,7 @@ CanMoveResult CollisionWorld::canMove ( CellProperty const * startCell, FloorLocator dummy; - return canMove( NULL, startCell, startLoc, goalPos, checkY, checkFlora, checkFauna, dummy ); + return canMove( nullptr, startCell, startLoc, goalPos, checkY, checkFlora, checkFauna, dummy ); } // ---------- @@ -1714,7 +1714,7 @@ CanMoveResult CollisionWorld::canMove ( Object const * object, bool checkFlora, bool checkFauna ) { - if(object == NULL) + if(object == nullptr) { return CMR_Error; } @@ -1766,7 +1766,7 @@ CanMoveResult CollisionWorld::canMove ( Object const * object, bool checkFauna, FloorLocator & endLoc ) { - if(startCell == NULL) + if(startCell == nullptr) { startCell = CellProperty::getWorldCellProperty(); } @@ -1858,7 +1858,7 @@ CanMoveResult CollisionWorld::canMove ( Object const * object, } // ---------- -// A NULL goal cell means we don't care what cell we end up in as long as we make it to the goal +// A nullptr goal cell means we don't care what cell we end up in as long as we make it to the goal CanMoveResult CollisionWorld::canMove ( Object const * object, CellProperty const * startCell, @@ -1871,12 +1871,12 @@ CanMoveResult CollisionWorld::canMove ( Object const * object, { // ---------- - if(startCell == NULL) + if(startCell == nullptr) { startCell = CellProperty::getWorldCellProperty(); } - if(goalCell == NULL) + if(goalCell == nullptr) { FloorLocator dummy; @@ -2233,17 +2233,17 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature Vector delta = testPos - startPos; - if(creature == NULL) return false; + if(creature == nullptr) return false; CollisionProperty const * collision = creature->getCollisionProperty(); - if(collision == NULL) return false; + if(collision == nullptr) return false; BaseExtent const * baseExtent = collision->getExtent_p(); SimpleExtent const * simpleExtent = dynamic_cast(baseExtent); - if(simpleExtent == NULL) return false; + if(simpleExtent == nullptr) return false; MultiShape const & shape = simpleExtent->getShape(); @@ -2253,7 +2253,7 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature // Test collision extents DetectResult minResult; - Object const * minObject = NULL; + Object const * minObject = nullptr; typedef std::vector ObjectVector; static ObjectVector statics; @@ -2262,7 +2262,7 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature statics.clear(); creatures.clear(); - if(ms_database->queryObjects(creature->getParentCell(), shape, delta, (testStatics ? &statics : NULL), (testCreatures ? &creatures : NULL))) + if(ms_database->queryObjects(creature->getParentCell(), shape, delta, (testStatics ? &statics : nullptr), (testCreatures ? &creatures : nullptr))) { ObjectVector::size_type const nStatics = statics.size(); ObjectVector::size_type i; @@ -2271,7 +2271,7 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature { Object const * obstacle = statics[i]; - if(obstacle == NULL) continue; + if(obstacle == nullptr) continue; if(obstacle == creature) continue; @@ -2292,7 +2292,7 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature { Object const * obstacle = creatures[i]; - if(obstacle == NULL) continue; + if(obstacle == nullptr) continue; if(obstacle == creature) continue; @@ -2310,10 +2310,10 @@ bool CollisionWorld::findFirstObstacle ( Object const * creature, float creature //-- Check for floor collisions. Footprint const *const footprint = collision->getFootprint(); - FloorLocator const *const floorLocator = (footprint ? footprint->getAnyContact() : NULL); + FloorLocator const *const floorLocator = (footprint ? footprint->getAnyContact() : nullptr); if (floorLocator) { - Object const *floorCollisionObject = NULL; + Object const *floorCollisionObject = nullptr; Vector collisionLocation_w; // Do the floor check. @@ -2372,7 +2372,7 @@ bool CollisionWorld::findFirstObstacle ( Sphere const & sphere, Vector const & g // Test collision extents DetectResult minResult; - Object const * minObject = NULL; + Object const * minObject = nullptr; static std::vector statics; static std::vector creatures; @@ -2380,7 +2380,7 @@ bool CollisionWorld::findFirstObstacle ( Sphere const & sphere, Vector const & g statics.clear(); creatures.clear(); - if(ms_database->queryObjects(CellProperty::getWorldCellProperty(), shape, delta, (testStatics ? &statics : NULL), (testCreatures ? &creatures : NULL))) + if(ms_database->queryObjects(CellProperty::getWorldCellProperty(), shape, delta, (testStatics ? &statics : nullptr), (testCreatures ? &creatures : nullptr))) { size_t const nStatics = statics.size(); size_t i; @@ -2389,7 +2389,7 @@ bool CollisionWorld::findFirstObstacle ( Sphere const & sphere, Vector const & g { Object const * obstacle = statics[i]; - if(obstacle == NULL) continue; + if(obstacle == nullptr) continue; DetectResult result = CollisionDetect::testSphereObject(sphere,delta,obstacle); @@ -2406,7 +2406,7 @@ bool CollisionWorld::findFirstObstacle ( Sphere const & sphere, Vector const & g { Object const * obstacle = creatures[i]; - if(obstacle == NULL) continue; + if(obstacle == nullptr) continue; if(Distance2d::Distance2(obstacle->getPosition_w(),goalPos) < 0.000001) continue; @@ -2437,7 +2437,7 @@ bool CollisionWorld::findFirstObstacle ( Sphere const & sphere, Vector const & g bool CollisionWorld::calcBubble ( CellProperty const * cell, Vector const & point_p, float maxDistance, float & outRadius ) { - return calcBubble(cell,point_p,NULL,maxDistance,outRadius); + return calcBubble(cell,point_p,nullptr,maxDistance,outRadius); } bool CollisionWorld::calcBubble ( CellProperty const * cell, Vector const & point_p, Object const * ignoreObject, float maxDistance, float & outRadius ) @@ -2698,16 +2698,16 @@ void CollisionWorld::handleSceneChange(std::string const & sceneId) Floor const * CollisionWorld::getFloorStandingOn(Object const & object) { CollisionProperty const * const objectCollisionProperty = object.getCollisionProperty(); - Footprint const * const objectFootprint = (objectCollisionProperty != NULL) ? objectCollisionProperty->getFootprint() : NULL; + Footprint const * const objectFootprint = (objectCollisionProperty != nullptr) ? objectCollisionProperty->getFootprint() : nullptr; - if (objectFootprint == NULL) + if (objectFootprint == nullptr) { - return NULL; + return nullptr; } MultiListHandle const & floorList = objectFootprint->getFloorList(); float const objectHeight = object.getPosition_w().y; - Floor const * resultFloor = NULL; + Floor const * resultFloor = nullptr; float resultDistanceBelowObject = 0.0f; float dropTestHeight = std::numeric_limits::min(); @@ -2750,7 +2750,7 @@ Floor const * CollisionWorld::getFloorStandingOn(Object const & object) { TerrainObject const * const terrainObject = TerrainObject::getConstInstance(); - if (terrainObject != NULL) + if (terrainObject != nullptr) { CellProperty const * const parentCell = object.getParentCell(); @@ -2775,7 +2775,7 @@ Floor const * CollisionWorld::getFloorStandingOn(Object const & object) { if (dropTestHeight < terrainHeight) { - resultFloor = NULL; + resultFloor = nullptr; } } } diff --git a/engine/shared/library/sharedCollision/src/shared/core/ConfigSharedCollision.cpp b/engine/shared/library/sharedCollision/src/shared/core/ConfigSharedCollision.cpp index 0b3d4164..b9811896 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/ConfigSharedCollision.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/ConfigSharedCollision.cpp @@ -68,8 +68,8 @@ float ms_terrainLOSMaxDistance = 64.0f; float ms_losUprightScale = 1.5f; float ms_losProneScale = 1.0f; -PlayEffectHook ms_playEffectHook = NULL; -IsPlayerHouseHook ms_isPlayerHouseHook = NULL; +PlayEffectHook ms_playEffectHook = nullptr; +IsPlayerHouseHook ms_isPlayerHouseHook = nullptr; int ms_spatialSweepAndResolveDefaultMask = static_cast(SpatialDatabase::Q_Static); diff --git a/engine/shared/library/sharedCollision/src/shared/core/Contact3d.h b/engine/shared/library/sharedCollision/src/shared/core/Contact3d.h index 2d4d7236..551822e2 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Contact3d.h +++ b/engine/shared/library/sharedCollision/src/shared/core/Contact3d.h @@ -52,9 +52,9 @@ public: m_normal(newNormal), m_surfaceId1(-1), m_surfaceId2(-1), - m_cell(NULL), - m_extent(NULL), - m_surface(NULL) + m_cell(nullptr), + m_extent(nullptr), + m_surface(nullptr) { } diff --git a/engine/shared/library/sharedCollision/src/shared/core/ContactPoint.cpp b/engine/shared/library/sharedCollision/src/shared/core/ContactPoint.cpp index 304a14b7..be31ca04 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/ContactPoint.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/ContactPoint.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------- ContactPoint::ContactPoint() -: m_pSurface( NULL ), +: m_pSurface( nullptr ), m_position( Vector::zero ), m_offset( 0.0f ), m_hitId( -1 ) @@ -45,7 +45,7 @@ ContactPoint::ContactPoint ( ContactPoint const & locCopy ) bool ContactPoint::isAttached ( void ) const { - return (m_hitId != -1) && (m_pSurface != NULL); + return (m_hitId != -1) && (m_pSurface != nullptr); } // ---------------------------------------------------------------------- @@ -115,7 +115,7 @@ void ContactPoint::read_0000 ( Iff & iff ) { m_position = iff.read_floatVector(); m_offset = iff.read_float(); - m_pSurface = NULL; + m_pSurface = nullptr; m_hitId = iff.read_int32(); NAN_CHECK(m_position); diff --git a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp index a14c9980..68b421e8 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp @@ -99,11 +99,11 @@ DoorObject::DoorObject ( DoorInfo const & info, Portal * portal ) m_doorHelper2 ( info ), m_delta ( info.m_delta ), m_portal ( portal ), - m_neighbor ( NULL ), + m_neighbor ( nullptr ), m_spring ( info.m_spring ), m_smoothness ( info.m_smoothness ), m_draw ( true ), - m_barrier ( NULL ), + m_barrier ( nullptr ), m_oldDoorPos ( Vector::maxXYZ ), m_wasOpen(false), m_isForceField( false ), @@ -119,7 +119,7 @@ DoorObject::DoorObject ( DoorInfo const & info, Portal * portal ) setDebugName("Door object"); for (int i = 0; i < MAX_DRAWN_DOORS; ++i) - m_drawnDoor[i] = NULL; + m_drawnDoor[i] = nullptr; createAppearance(info); createTrigger(info); @@ -131,7 +131,7 @@ DoorObject::DoorObject ( DoorInfo const & info, Portal * portal ) DoorObject::~DoorObject() { m_hitByObjects.clear(); - m_portal = NULL; + m_portal = nullptr; } // ---------------------------------------------------------------------- @@ -181,7 +181,7 @@ DoorObject const * DoorObject::getNeighbor ( void ) const int DoorObject::getNumberOfDrawnDoors ( void ) { for (int i = 0; i < MAX_DRAWN_DOORS; ++i) - if (m_drawnDoor[i] == NULL) + if (m_drawnDoor[i] == nullptr) return i; return MAX_DRAWN_DOORS; @@ -210,7 +210,7 @@ void DoorObject::createAppearance ( DoorInfo const & info ) { Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_frameAppearance); - if (appearance != NULL) { + if (appearance != nullptr) { setAppearance(appearance); } else { DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, first stanza.")); @@ -233,7 +233,7 @@ void DoorObject::createAppearance ( DoorInfo const & info ) Collision3d::MovePolyOnto(verts,Vector::zero); Appearance * appearance = CellProperty::createForceField(verts,gs_forceFieldColor); - if(appearance != NULL) + if(appearance != nullptr) { m_drawnDoor[0]->setAppearance( appearance ); Extent * appearanceExtent = new Extent( Containment3d::EncloseSphere(verts) ); @@ -249,7 +249,7 @@ void DoorObject::createAppearance ( DoorInfo const & info ) { Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_doorAppearance); - if (appearance != NULL) { + if (appearance != nullptr) { m_drawnDoor[0]->setAppearance(appearance); } else { DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, third stanza.")); @@ -263,7 +263,7 @@ void DoorObject::createAppearance ( DoorInfo const & info ) Appearance * const appearance = AppearanceTemplateList::createAppearance(info.m_doorAppearance2); - if (appearance != NULL) { + if (appearance != nullptr) { m_drawnDoor[1]->setAppearance(appearance); } else { DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, fourth stanza.")); @@ -476,7 +476,7 @@ float DoorObject::tween ( float t ) const void DoorObject::hitBy( CollisionProperty const * collision ) { - if(collision == NULL) return; + if(collision == nullptr) return; CellProperty const * doorCell = getParentCell(); CellProperty const * doorNeighborCell = m_neighbor ? m_neighbor->getParentCell() : doorCell; @@ -533,7 +533,7 @@ void DoorObject::setNeighbor ( DoorObject * newNeighbor ) if (newNeighbor) m_barrier->setNeighbor( newNeighbor->m_barrier ); else - m_barrier->setNeighbor( NULL ); + m_barrier->setNeighbor( nullptr ); } } @@ -587,7 +587,7 @@ void DoorObject::trackHitByObject(Object const &hitByObject) if (static_cast(m_hitByObjects.size()) >= cs_maxHitByObjectsToTrack) return; - // NOTE: This can't be a set because the key's value can change when a watcher's value changes from non-NULL to NULL. + // NOTE: This can't be a set because the key's value can change when a watcher's value changes from non-nullptr to nullptr. // Check if the object already exists in the list. if (std::find(m_hitByObjects.begin(), m_hitByObjects.end(), ConstWatcher(&hitByObject)) != m_hitByObjects.end()) return; @@ -607,7 +607,7 @@ void DoorObject::maintainHitByObjectVector() // Remove any objects that no longer exist or no longer are within the trigger radius. for (WatcherObjectVector::iterator it = m_hitByObjects.begin(); it != m_hitByObjects.end(); ) { - if (it->getPointer() == NULL) + if (it->getPointer() == nullptr) { // This hit-by object has been deleted so clear it out of the tracking list. it = m_hitByObjects.erase(it); diff --git a/engine/shared/library/sharedCollision/src/shared/core/Floor.cpp b/engine/shared/library/sharedCollision/src/shared/core/Floor.cpp index 4d08d7df..8d23bff3 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Floor.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/Floor.cpp @@ -49,8 +49,8 @@ Floor::Floor( FloorMesh const * pMesh, Object const * owner, Appearance const * m_mesh(pMesh), m_footList(this,1), m_databaseList(this,1), - m_spatialSubdivisionHandle(NULL), - m_extent(NULL), + m_spatialSubdivisionHandle(nullptr), + m_extent(nullptr), m_extentDirty(true), m_sphere_l(), m_sphere_w() @@ -104,15 +104,15 @@ Floor::~Floor() } const_cast(m_mesh)->releaseReference(); - m_mesh = NULL; + m_mesh = nullptr; - m_owner = NULL; - m_appearance = NULL; + m_owner = nullptr; + m_appearance = nullptr; - m_spatialSubdivisionHandle = NULL; + m_spatialSubdivisionHandle = nullptr; delete m_extent; - m_extent = NULL; + m_extent = nullptr; } // ---------------------------------------------------------------------- @@ -255,7 +255,7 @@ bool Floor::segTestBounds ( Vector const & begin, Vector const & end ) const Object const * Floor::getOwner ( void ) const { - if(m_owner != NULL) + if(m_owner != nullptr) { return m_owner; } @@ -265,7 +265,7 @@ Object const * Floor::getOwner ( void ) const } else { - return NULL; + return nullptr; } } @@ -273,7 +273,7 @@ Object const * Floor::getOwner ( void ) const Appearance const * Floor::getAppearance ( void ) const { - if(m_appearance != NULL) + if(m_appearance != nullptr) { return m_appearance; } @@ -283,7 +283,7 @@ Appearance const * Floor::getAppearance ( void ) const } else { - return NULL; + return nullptr; } } @@ -301,7 +301,7 @@ CellProperty const * Floor::getCell ( void ) const } else { - return NULL; + return nullptr; } } @@ -657,7 +657,7 @@ NetworkId const & Floor::getId() const { CellProperty const * const cellProperty = getCell(); - return (cellProperty != NULL) ? cellProperty->getOwner().getNetworkId() : NetworkId::cms_invalid; + return (cellProperty != nullptr) ? cellProperty->getOwner().getNetworkId() : NetworkId::cms_invalid; } // ====================================================================== diff --git a/engine/shared/library/sharedCollision/src/shared/core/FloorLocator.cpp b/engine/shared/library/sharedCollision/src/shared/core/FloorLocator.cpp index f595384a..5b728aee 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FloorLocator.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/FloorLocator.cpp @@ -34,7 +34,7 @@ FloorTri gs_dummyFloorTri; FloorLocator::FloorLocator() : ContactPoint(), m_valid(false), - m_floor(NULL), + m_floor(nullptr), m_radius(0.0f), m_time(0.0f), m_edgeId(-1), @@ -47,7 +47,7 @@ FloorLocator::FloorLocator() // ---------- FloorLocator::FloorLocator( Floor const * floor, Vector const & localPoint, int triId, float dist, float radius ) -: ContactPoint((floor ? floor->getFloorMesh() : NULL),localPoint,triId,dist), +: ContactPoint((floor ? floor->getFloorMesh() : nullptr),localPoint,triId,dist), m_valid(true), m_floor(floor), m_radius(radius), @@ -64,7 +64,7 @@ FloorLocator::FloorLocator( Floor const * floor, Vector const & localPoint, int FloorLocator::FloorLocator( CollisionSurface const * mesh, Vector const & point, int triId, float dist, float radius ) : ContactPoint(mesh,point,triId,dist), m_valid(true), - m_floor(NULL), + m_floor(nullptr), m_radius(radius), m_time(0.0f), m_edgeId(-1), @@ -78,7 +78,7 @@ FloorLocator::FloorLocator( CollisionSurface const * mesh, Vector const & point, // ---------- FloorLocator::FloorLocator( Floor const * floor, Vector const & localPoint ) -: ContactPoint((floor ? floor->getFloorMesh() : NULL),localPoint,-1,0.0f), +: ContactPoint((floor ? floor->getFloorMesh() : nullptr),localPoint,-1,0.0f), m_valid(true), m_floor(floor), m_radius(0.0f), @@ -95,7 +95,7 @@ FloorLocator::FloorLocator( Floor const * floor, Vector const & localPoint ) FloorLocator::FloorLocator( CollisionSurface const * mesh, Vector const & point ) : ContactPoint(mesh,point,-1,0.0f), m_valid(true), - m_floor(NULL), + m_floor(nullptr), m_radius(0.0f), m_time(0.0f), m_edgeId(-1), @@ -109,9 +109,9 @@ FloorLocator::FloorLocator( CollisionSurface const * mesh, Vector const & point // ---------- FloorLocator::FloorLocator( Vector const & point, float radius ) -: ContactPoint(NULL,point,-1,0.0f), +: ContactPoint(nullptr,point,-1,0.0f), m_valid(true), - m_floor(NULL), + m_floor(nullptr), m_radius(radius), m_time(0.0f), m_edgeId(-1), @@ -226,7 +226,7 @@ void FloorLocator::setFloor ( Floor const * newFloor ) } else { - if(getFloorMesh() == NULL) + if(getFloorMesh() == nullptr) { Vector oldPos = getPosition_p(); @@ -239,7 +239,7 @@ void FloorLocator::setFloor ( Floor const * newFloor ) } else { - m_floor = NULL; + m_floor = nullptr; } } @@ -289,7 +289,7 @@ CellProperty const * FloorLocator::getCell ( void ) const { if(getFloorMesh()) { - return NULL; + return nullptr; } else { @@ -312,7 +312,7 @@ CellProperty * FloorLocator::getCell ( void ) { if(getFloorMesh()) { - return NULL; + return nullptr; } else { @@ -417,7 +417,7 @@ void FloorLocator::write ( Iff & iff ) const void FloorLocator::detach ( void ) { - setFloor(NULL); + setFloor(nullptr); setId(-1); } diff --git a/engine/shared/library/sharedCollision/src/shared/core/FloorManager.cpp b/engine/shared/library/sharedCollision/src/shared/core/FloorManager.cpp index 677849e7..1ea799b9 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FloorManager.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/FloorManager.cpp @@ -19,9 +19,9 @@ namespace FloorManagerNamespace { -ObjectFactory ms_pathGraphFactory = NULL; -ObjectWriter ms_pathGraphWriter = NULL; -ObjectRenderer ms_pathGraphRenderer = NULL; +ObjectFactory ms_pathGraphFactory = nullptr; +ObjectWriter ms_pathGraphWriter = nullptr; +ObjectRenderer ms_pathGraphRenderer = nullptr; }; @@ -72,7 +72,7 @@ Floor * FloorManager::createFloor ( const char * floorMeshFilename, Object const if(!pMesh) { WARNING(true, ("Could not find floor mesh %s", floorMeshFilename)); - return NULL; + return nullptr; } // ---------- diff --git a/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp b/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp index 370f13b7..ae508f4a 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/FloorMesh.cpp @@ -78,8 +78,8 @@ const Tag TAG_BTRE = TAG(B,T,R,E); const Tag TAG_BEDG = TAG(B,E,D,G); const Tag TAG_PGRF = TAG(P,G,R,F); -template <> FloorMeshList::CreateDataResourceMap *FloorMeshList::ms_bindings = NULL; -template <> FloorMeshList::LoadedDataResourceMap *FloorMeshList::ms_loaded = NULL; +template <> FloorMeshList::CreateDataResourceMap *FloorMeshList::ms_bindings = nullptr; +template <> FloorMeshList::LoadedDataResourceMap *FloorMeshList::ms_loaded = nullptr; // ---------------------------------------------------------------------- @@ -92,20 +92,20 @@ FloorMesh::FloorMesh(const std::string & filename) m_uncrossableEdges( new FloorEdgeIdVec() ), m_wallBaseEdges( new FloorEdgeIdVec() ), m_wallTopEdges( new FloorEdgeIdVec() ), - m_pathGraph(NULL), - m_appearance(NULL), + m_pathGraph(nullptr), + m_appearance(nullptr), m_triMarkCounter(1000), // just some random number m_objectFloor(false) { #ifdef _DEBUG - m_crossableLines = NULL; - m_uncrossableLines = NULL; - m_interiorLines = NULL; - m_portalLines = NULL; - m_rampLines = NULL; - m_fallthroughTriLines = NULL; - m_solidTriLines = NULL; + m_crossableLines = nullptr; + m_uncrossableLines = nullptr; + m_interiorLines = nullptr; + m_portalLines = nullptr; + m_rampLines = nullptr; + m_fallthroughTriLines = nullptr; + m_solidTriLines = nullptr; #endif } @@ -121,8 +121,8 @@ FloorMesh::FloorMesh( VectorVector const & vertices, IntVector const & indices ) m_uncrossableEdges( new FloorEdgeIdVec() ), m_wallBaseEdges( new FloorEdgeIdVec() ), m_wallTopEdges( new FloorEdgeIdVec() ), - m_pathGraph(NULL), - m_appearance(NULL), + m_pathGraph(nullptr), + m_appearance(nullptr), m_triMarkCounter(1000), m_objectFloor(false) { @@ -130,13 +130,13 @@ FloorMesh::FloorMesh( VectorVector const & vertices, IntVector const & indices ) #ifdef _DEBUG - m_crossableLines = NULL; - m_uncrossableLines = NULL; - m_interiorLines = NULL; - m_portalLines = NULL; - m_rampLines = NULL; - m_fallthroughTriLines = NULL; - m_solidTriLines = NULL; + m_crossableLines = nullptr; + m_uncrossableLines = nullptr; + m_interiorLines = nullptr; + m_portalLines = nullptr; + m_rampLines = nullptr; + m_fallthroughTriLines = nullptr; + m_solidTriLines = nullptr; #endif } @@ -146,50 +146,50 @@ FloorMesh::FloorMesh( VectorVector const & vertices, IntVector const & indices ) FloorMesh::~FloorMesh() { delete m_vertices; - m_vertices = NULL; + m_vertices = nullptr; delete m_floorTris; - m_floorTris = NULL; + m_floorTris = nullptr; delete m_crossableEdges; - m_crossableEdges = NULL; + m_crossableEdges = nullptr; delete m_uncrossableEdges; - m_crossableEdges = NULL; + m_crossableEdges = nullptr; delete m_wallBaseEdges; - m_wallBaseEdges = NULL; + m_wallBaseEdges = nullptr; delete m_wallTopEdges; - m_wallTopEdges = NULL; + m_wallTopEdges = nullptr; delete m_pathGraph; - m_pathGraph = NULL; + m_pathGraph = nullptr; - m_appearance = NULL; + m_appearance = nullptr; #ifdef _DEBUG delete m_crossableLines; - m_crossableLines = NULL; + m_crossableLines = nullptr; delete m_uncrossableLines; - m_uncrossableLines = NULL; + m_uncrossableLines = nullptr; delete m_interiorLines; - m_interiorLines = NULL; + m_interiorLines = nullptr; delete m_portalLines; - m_portalLines = NULL; + m_portalLines = nullptr; delete m_rampLines; - m_rampLines = NULL; + m_rampLines = nullptr; delete m_fallthroughTriLines; - m_fallthroughTriLines = NULL; + m_fallthroughTriLines = nullptr; delete m_solidTriLines; - m_solidTriLines = NULL; + m_solidTriLines = nullptr; #endif } @@ -833,7 +833,7 @@ void FloorMesh::write ( Iff & iff ) // ---------- - if(m_boxTree != NULL) + if(m_boxTree != nullptr) { m_boxTree->write(iff); } @@ -1772,7 +1772,7 @@ bool FloorMesh::canEnterEdge ( FloorLocator const & enterLoc ) const { if(enterLoc.getEdgeId() == -1) return false; if(enterLoc.getTriId() == -1) return false; - if(enterLoc.getFloorMesh() == NULL) return false; + if(enterLoc.getFloorMesh() == nullptr) return false; // Can't enter the tri if it's facing down @@ -1837,7 +1837,7 @@ bool FloorMesh::canExitEdge ( FloorLocator const & exitLoc, Vector const & delta { if(exitLoc.getTriId() == -1) return false; if(exitLoc.getEdgeId() == -1) return false; - if(exitLoc.getFloorMesh() == NULL) return false; + if(exitLoc.getFloorMesh() == nullptr) return false; FloorEdgeType edgeType = exitLoc.getFloorTri().getEdgeType(exitLoc.getEdgeId()); @@ -3808,7 +3808,7 @@ void FloorMesh::drawDebugShapes ( DebugShapeRenderer * renderer, bool drawExtent #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if(ConfigSharedCollision::getDrawFloors()) { diff --git a/engine/shared/library/sharedCollision/src/shared/core/Footprint.cpp b/engine/shared/library/sharedCollision/src/shared/core/Footprint.cpp index 00bec3b3..58471e36 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/Footprint.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/Footprint.cpp @@ -92,7 +92,7 @@ static bool epsilonEqual( float value, float target, float epsilon ) Footprint::Footprint ( Vector const & position, float radius, CollisionProperty * parent, const float swimHeight ) : BaseClass(), m_parent(parent), - m_cellObject(NULL), + m_cellObject(nullptr), m_position_p(Vector::zero), m_position_w(Vector::zero), m_radius(radius), @@ -112,9 +112,9 @@ Footprint::Footprint ( Vector const & position, float radius, CollisionProperty #ifdef _DEBUG , m_backupPosition_p(position), - m_backupCell(NULL), + m_backupCell(nullptr), m_backupObjectPosition_p(position), - m_backupObjectCell(NULL), + m_backupObjectCell(nullptr), m_lineHitTime( -1.0f ), m_lineOrigin( Vector(0.0f,1.5f,0.0f) ), m_lineDelta( Vector(0.0f,0.0f,10.0f) ), @@ -137,8 +137,8 @@ Footprint::~Footprint() { detach(); - m_parent = NULL; - m_cellObject = NULL; + m_parent = nullptr; + m_cellObject = nullptr; } // ====================================================================== @@ -334,7 +334,7 @@ Object * Footprint::getOwner ( void ) void Footprint::addContact ( FloorLocator const & loc ) { - if(loc.getFloor() == NULL) + if(loc.getFloor() == nullptr) { FLOOR_LOG("Footprint::addContact - loc isn't attached to a floor\n"); } @@ -445,7 +445,7 @@ void Footprint::setSwimHeight ( float swimHeight ) Vector const & Footprint::getPosition_p ( void ) const { - if(m_cellObject.getPointer() == NULL) + if(m_cellObject.getPointer() == nullptr) { WARNING(true,("Footprint::getPosition_p - Footprint's parent cell has disappeared")); @@ -525,7 +525,7 @@ void Footprint::setPosition ( CellProperty * pNewCell, Vector const & pos ) { NAN_CHECK(pos); - if(pNewCell == NULL) pNewCell = CellProperty::getWorldCellProperty(); + if(pNewCell == nullptr) pNewCell = CellProperty::getWorldCellProperty(); m_cellObject = &(pNewCell->getOwner()); m_position_p = pos; @@ -808,13 +808,13 @@ void Footprint::runDebugTests ( void ) IGNORE_RETURN(CollisionWorld::calcBubble(getCell(),getPosition_p(),20.0f,m_bubbleSize)); */ - Object const * hitObject = NULL; + Object const * hitObject = nullptr; QueryInteractionResult result = CollisionWorld::queryInteraction(objCell, objPos + m_lineOrigin, objCell, objPos + m_lineOrigin + delta, - NULL, + nullptr, !ConfigSharedCollision::getIgnoreTerrainLos(), ConfigSharedCollision::getGenerateTerrainLos(), ConfigSharedCollision::getTerrainLOSMinDistance(), @@ -843,14 +843,14 @@ FloorLocator const * Footprint::getAnyContact ( void ) const if(contact->m_contact.isAttached()) return &contact->m_contact; } - return NULL; + return nullptr; } // ---------- FloorLocator const * Footprint::getSolidContact ( void ) const { - FloorLocator const * temp = NULL; + FloorLocator const * temp = nullptr; float maxHeight = -REAL_MAX; @@ -883,11 +883,11 @@ Object const * Footprint::getStandingOn ( void ) const { FloorLocator const * contact = getSolidContact(); - if(contact == NULL) return NULL; + if(contact == nullptr) return nullptr; Floor const * floor = contact->getFloor(); - if(floor == NULL) return NULL; + if(floor == nullptr) return nullptr; return floor->getOwner(); } @@ -921,9 +921,9 @@ bool Footprint::snapToCellFloor ( void ) bool Footprint::isAttachedTo ( Floor const * floor ) const { - if(floor == NULL) return false; + if(floor == nullptr) return false; - return getFloorList().find( floor->getFootList() ) != NULL; + return getFloorList().find( floor->getFootList() ) != nullptr; } // ---------------------------------------------------------------------- @@ -1114,7 +1114,7 @@ void Footprint::updateOffsets ( void ) bool Footprint::attachTo ( Floor const * floor, bool fromObject ) { - if(floor == NULL) return false; + if(floor == nullptr) return false; if(isAttachedTo(floor)) return false; @@ -1240,7 +1240,7 @@ int Footprint::elevatorMove ( int nFloors, Transform & outTransform ) // ---------- // Find the contact that's on the cell's floor - FloorContactShape const * cellContact = NULL; + FloorContactShape const * cellContact = nullptr; for(ConstContactIterator it(getFloorList()); it; ++it) { @@ -1261,7 +1261,7 @@ int Footprint::elevatorMove ( int nFloors, Transform & outTransform ) } } - if(cellContact == NULL) + if(cellContact == nullptr) { return 0; } @@ -1328,7 +1328,7 @@ void Footprint::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if(ConfigSharedCollision::getDrawFootprints()) { @@ -1525,7 +1525,7 @@ void Footprint::alignToGroundNoFloat ( void ) if (owner) DEBUG_WARNING(true, ("Footprint::alignToGroundNoFloat(): called on object id=[%s],template=[%s] when no ground could be found.", owner->getNetworkId().getValueString().c_str(), owner->getObjectTemplateName())); else - DEBUG_WARNING(true, ("Footprint::alignToGroundNoFloat(): called on object id=[],template=[] when no ground could be found.")); + DEBUG_WARNING(true, ("Footprint::alignToGroundNoFloat(): called on object id=[],template=[] when no ground could be found.")); } #endif } diff --git a/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp b/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp index d0671160..680ff016 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/FootprintForceReattachManager.cpp @@ -31,7 +31,7 @@ namespace FootprintForceReattachManagerNamespace DataTable const * const dt = DataTableManager::getTable(ms_datatableName, true); - if (NULL == dt) + if (nullptr == dt) WARNING(true, ("FootprintForceReattachManager unable to find [%s]", ms_datatableName)); else { diff --git a/engine/shared/library/sharedCollision/src/shared/core/MultiList.cpp b/engine/shared/library/sharedCollision/src/shared/core/MultiList.cpp index 3917cd4d..af288bad 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/MultiList.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/MultiList.cpp @@ -14,8 +14,8 @@ MultiListHandle::MultiListHandle( BaseClass * object, int color ) : m_color(color), m_object(object), - m_head(NULL), - m_tail(NULL) + m_head(nullptr), + m_tail(nullptr) { } @@ -23,9 +23,9 @@ MultiListHandle::~MultiListHandle() { IGNORE_RETURN( detach() ); - m_object = NULL; - m_head = NULL; - m_tail = NULL; + m_object = nullptr; + m_head = nullptr; + m_tail = nullptr; } // ---------------------------------------------------------------------- @@ -55,7 +55,7 @@ MultiListNode * MultiListHandle::detachHead ( void ) } else { - return NULL; + return nullptr; } } @@ -72,7 +72,7 @@ MultiListHandle * MultiListHandle::detach ( void ) bool MultiListHandle::isConnected ( void ) const { - return m_head != NULL; + return m_head != nullptr; } // ---------- @@ -97,7 +97,7 @@ void MultiListHandle::erase ( MultiListNode * node ) bool MultiListHandle::isEmpty ( void ) const { - return m_head == NULL; + return m_head == nullptr; } // ---------- @@ -109,8 +109,8 @@ void MultiListHandle::insert( MultiListNode * node, MultiListNode * prev, MultiL DEBUG_FATAL( next == node, ("MultiListHandle::insert - Next and node are the same ")); DEBUG_FATAL( (prev || next) && (prev == next), ("MultiListHandle::insert - Prev and Next are the same")); - // verify that the node to insert is not null - DEBUG_FATAL( node == NULL, ("MultiListHandle::insert - Cannot insert null node")); + // verify that the node to insert is not nullptr + DEBUG_FATAL( node == nullptr, ("MultiListHandle::insert - Cannot insert nullptr node")); // verify that the nodes we're inserting between are adjacent DEBUG_FATAL( prev && (prev->m_next[m_color] != next), ("MultiListHandle::insert - Prev and Next are not adjacent")); @@ -155,7 +155,7 @@ void MultiListHandle::connectTo( MultiListHandle & handle, BaseClass * data ) void MultiListHandle::insert( MultiListNode * node ) { - insert( node, NULL, m_head ); + insert( node, nullptr, m_head ); } // ---------- @@ -175,9 +175,9 @@ MultiListNode * MultiListHandle::detach ( MultiListNode * node ) // ---------- - node->m_next[m_color] = NULL; - node->m_prev[m_color] = NULL; - node->m_list[m_color] = NULL; + node->m_next[m_color] = nullptr; + node->m_prev[m_color] = nullptr; + node->m_list[m_color] = nullptr; } return node; @@ -221,7 +221,7 @@ MultiListNode * MultiListHandle::find ( MultiListHandle & testHandle ) cursor = cursor->m_next[m_color]; } - return NULL; + return nullptr; } //lint !e1764 // testHandle could be made const ref MultiListNode const * MultiListHandle::find ( MultiListHandle const & testHandle ) const @@ -240,7 +240,7 @@ MultiListNode const * MultiListHandle::find ( MultiListHandle const & testHandle cursor = cursor->m_next[m_color]; } - return NULL; + return nullptr; } // ---------- @@ -288,13 +288,13 @@ void MultiListHandle::destroyNodes ( void ) // ====================================================================== MultiListNode::MultiListNode() -: m_data(NULL) +: m_data(nullptr) { for(int i = 0; i < nColors; i++) { - m_next[i] = NULL; - m_prev[i] = NULL; - m_list[i] = NULL; + m_next[i] = nullptr; + m_prev[i] = nullptr; + m_list[i] = nullptr; } } @@ -303,7 +303,7 @@ MultiListNode::~MultiListNode() IGNORE_RETURN( detach() ); BaseClass * data = m_data; - m_data = NULL; + m_data = nullptr; delete data; } @@ -346,7 +346,7 @@ BaseClass * MultiListNode::getObject ( int color ) if(m_list[color]) return m_list[color]->getObject(); else - return NULL; + return nullptr; } //lint !e1762 // function could be const @@ -355,7 +355,7 @@ BaseClass const * MultiListNode::getObject ( int color ) const if(m_list[color]) return m_list[color]->getObject(); else - return NULL; + return nullptr; } // ---------- @@ -375,7 +375,7 @@ void MultiListNode::setData( BaseClass * data ) if(m_data == data) return; BaseClass * deadData = m_data; - m_data = NULL; + m_data = nullptr; delete deadData; m_data = data; } @@ -403,7 +403,7 @@ void MultiListNode::swapNext ( int color ) /* MultiList::MultiList() -: m_free(0,NULL) +: m_free(0,nullptr) { } @@ -411,7 +411,7 @@ MultiList::MultiList() bool MultiList::connect ( MultiListHandle * red, MultiListHandle * blue ) { - return connect(red,blue,NULL); + return connect(red,blue,nullptr); } // ---------- @@ -436,7 +436,7 @@ bool MultiList::connect ( MultiListHandle & red, MultiListHandle & blue, BaseCla bool MultiList::connected( MultiListHandle & red, MultiListHandle & blue ) { - return red.find(blue) != NULL; + return red.find(blue) != nullptr; } // ---------- @@ -450,7 +450,7 @@ bool MultiList::disconnect( MultiListHandle & red, MultiListHandle & blue ) MultiListNode * MultiList::getFreeNode ( void ) { - if(m_free.m_head == NULL) + if(m_free.m_head == nullptr) { return new MultiListNode(); } @@ -502,8 +502,8 @@ void MultiList::insert( MultiListHandle * node, MultiListHandle * prev, MultiLis DEBUG_FATAL( next == node, ("MultiList::insert - Next and Node are the same")); DEBUG_FATAL( prev == next, ("MultiList::insert - Prev and Next are the same")); - // verify that the node to insert is not null - DEBUG_FATAL( node == NULL, ("MultiList::insert - Cannot insert a null node")); + // verify that the node to insert is not nullptr + DEBUG_FATAL( node == nullptr, ("MultiList::insert - Cannot insert a nullptr node")); // verify that the two nodes are adjacent DEBUG_FATAL( prev && (prev->m_next != next), ("MultiList::insert - Prev and Next are not adjacent")); @@ -539,7 +539,7 @@ void MultiList::insert( MultiListHandle * node, MultiListHandle * prev, MultiLis MultiListHandle * MultiList::detach( MultiListHandle * node ) { - DEBUG_FATAL( node == NULL, ("MultiList::detach - Cannot detach null node")); + DEBUG_FATAL( node == nullptr, ("MultiList::detach - Cannot detach nullptr node")); DEBUG_FATAL( node->m_list != this, ("MultiList::detach - Node is not part of this list")); // ---------- @@ -555,9 +555,9 @@ MultiListHandle * MultiList::detach( MultiListHandle * node ) if(m_head[color] == node) m_head[color] = node->m_next; if(m_tail[color] == node) m_tail[color] = node->m_prev; - node->m_prev = NULL; - node->m_next = NULL; - node->m_list = NULL; + node->m_prev = nullptr; + node->m_next = nullptr; + node->m_list = nullptr; return node; } @@ -566,13 +566,13 @@ MultiListHandle * MultiList::detach( MultiListHandle * node ) void MultiList::insert( MultiListHandle * node ) { - DEBUG_FATAL(node == NULL, ("MultiList::insert - Cannot insert NULL node")); + DEBUG_FATAL(node == nullptr, ("MultiList::insert - Cannot insert nullptr node")); // ---------- int color = node->m_color; - insert(node,NULL,m_head[color]); + insert(node,nullptr,m_head[color]); } */ diff --git a/engine/shared/library/sharedCollision/src/shared/core/MultiList.h b/engine/shared/library/sharedCollision/src/shared/core/MultiList.h index 48c5e92d..09d7a4ec 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/MultiList.h +++ b/engine/shared/library/sharedCollision/src/shared/core/MultiList.h @@ -168,12 +168,12 @@ public: if(m_node) return safe_cast(m_node->getObject(m_valueColor)); else - return NULL; + return nullptr; } operator bool ( void ) const { - return m_node != NULL; + return m_node != nullptr; } void operator ++ ( void ) @@ -212,12 +212,12 @@ public: if(m_node) return safe_cast(m_node->getObject(m_valueColor)); else - return NULL; + return nullptr; } operator bool ( void ) const { - return m_node != NULL; + return m_node != nullptr; } void operator ++ ( void ) @@ -246,7 +246,7 @@ public: MultiListConstDataIterator( void ) { - m_node = NULL; + m_node = nullptr; m_color = -1; } @@ -281,12 +281,12 @@ public: if(m_node) return safe_cast(m_node->getData()); else - return NULL; + return nullptr; } operator bool ( void ) const { - return m_node != NULL; + return m_node != nullptr; } void operator ++ ( void ) @@ -310,7 +310,7 @@ public: MultiListDataIterator( void ) { - m_node = NULL; + m_node = nullptr; m_color = -1; } @@ -345,12 +345,12 @@ public: if(m_node) return safe_cast(m_node->getData()); else - return NULL; + return nullptr; } operator bool ( void ) const { - return m_node != NULL; + return m_node != nullptr; } void operator ++ ( void ) diff --git a/engine/shared/library/sharedCollision/src/shared/core/NeighborObject.cpp b/engine/shared/library/sharedCollision/src/shared/core/NeighborObject.cpp index a5a0f37d..006db662 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/NeighborObject.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/NeighborObject.cpp @@ -12,7 +12,7 @@ // ---------------------------------------------------------------------- NeighborObject::NeighborObject() -: m_neighbor(NULL) +: m_neighbor(nullptr) { } diff --git a/engine/shared/library/sharedCollision/src/shared/core/SimpleCollisionMesh.cpp b/engine/shared/library/sharedCollision/src/shared/core/SimpleCollisionMesh.cpp index 3fa962f9..439f6c95 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/SimpleCollisionMesh.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/SimpleCollisionMesh.cpp @@ -48,7 +48,7 @@ SimpleCollisionMesh::SimpleCollisionMesh( IndexedTriangleList * tris ) SimpleCollisionMesh::~SimpleCollisionMesh() { delete m_tris; - m_tris = NULL; + m_tris = nullptr; delete m_bucket; } @@ -178,7 +178,7 @@ void SimpleCollisionMesh::drawDebugShapes ( DebugShapeRenderer * renderer ) cons UNREF(renderer); #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if (s_renderCollisionBuckets) { diff --git a/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.cpp b/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.cpp index 05abd3be..f2d68e94 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/SpatialDatabase.cpp @@ -115,7 +115,7 @@ public: * This functionality is used on the client to prevent a door from visually opening for * a mounted creature or a rider. The actual stop logic for movement is on the server. * - * @param callback If NULL, no check is made. If non-NULL, the callback is called + * @param callback If nullptr, no check is made. If non-nullptr, the callback is called * any time a mobile is detected to have collided with a DoorObject. * The return value of the callback dictates whether the hit() and hitBy() * logic is called on the mobile and door. If the return value of callback @@ -152,29 +152,29 @@ SpatialDatabase::SpatialDatabase() SpatialDatabase::~SpatialDatabase ( void ) { delete m_staticTree; - m_staticTree = NULL; + m_staticTree = nullptr; delete m_dynamicTree; - m_dynamicTree = NULL; + m_dynamicTree = nullptr; delete m_doorTree; - m_doorTree = NULL; + m_doorTree = nullptr; delete m_barrierTree; - m_barrierTree = NULL; + m_barrierTree = nullptr; delete m_floorTree; - m_floorTree = NULL; + m_floorTree = nullptr; delete m_ignoreStack; - m_ignoreStack = NULL; + m_ignoreStack = nullptr; } // ---------------------------------------------------------------------- bool SpatialDatabase::canCollideWithStatics ( CollisionProperty * collision ) const { - if(collision == NULL) return false; + if(collision == nullptr) return false; // On the client, remote creatures and players don't collide with statics @@ -207,10 +207,10 @@ bool SpatialDatabase::canCollideWithStatics ( CollisionProperty * collision ) co bool SpatialDatabase::canCollideWithStatic ( Object const * mobObject, Object * staticObject ) const { - // Objects can't collide with NULL + // Objects can't collide with nullptr - if(mobObject == NULL) return false; - if(staticObject == NULL) return false; + if(mobObject == nullptr) return false; + if(staticObject == nullptr) return false; // Objects can't collide with themselves @@ -223,7 +223,7 @@ bool SpatialDatabase::canCollideWithStatic ( Object const * mobObject, Object * bool SpatialDatabase::canCollideWithCreatures ( CollisionProperty const * collision ) const { - if(collision == NULL) return false; + if(collision == nullptr) return false; if(collision->isPlayerControlled() && collision->isServerSide()) { @@ -253,9 +253,9 @@ bool SpatialDatabase::canCollideWithCreature ( Object * player, Object * creatur bool SpatialDatabase::canWalkOnFloor ( CollisionProperty * collision ) const { - if(collision == NULL) return false; + if(collision == nullptr) return false; - if(collision->getFootprint() == NULL) return false; + if(collision->getFootprint() == nullptr) return false; return true; } @@ -470,12 +470,12 @@ void SpatialDatabase::updateCreatureCollision(CollisionProperty * playerCollisio bool SpatialDatabase::addObject(Query const query, Object * const object) { - if(object == NULL) + if(object == nullptr) return false; CollisionProperty * collision = object->getCollisionProperty(); - if(collision == NULL) + if(collision == nullptr) return false; if(collision->getSpatialSubdivisionHandle()) @@ -511,15 +511,15 @@ bool SpatialDatabase::addObject(Query const query, Object * const object) bool SpatialDatabase::removeObject(Query const query, Object * const object) { - if(object == NULL) + if(object == nullptr) return false; CollisionProperty * collision = object->getCollisionProperty(); - if(collision == NULL) + if(collision == nullptr) return false; - if(collision->getSpatialSubdivisionHandle() == NULL) + if(collision->getSpatialSubdivisionHandle() == nullptr) return false; switch (query) @@ -548,7 +548,7 @@ bool SpatialDatabase::removeObject(Query const query, Object * const object) break; } - collision->setSpatialSubdivisionHandle(NULL); + collision->setSpatialSubdivisionHandle(nullptr); return true; } @@ -645,7 +645,7 @@ bool SpatialDatabase::checkIgnoreObject ( Object const * object ) const bool SpatialDatabase::addFloor ( Floor * floor ) { - if(floor == NULL) return false; + if(floor == nullptr) return false; if(floor->getSpatialSubdivisionHandle()) return false; @@ -660,15 +660,15 @@ bool SpatialDatabase::addFloor ( Floor * floor ) bool SpatialDatabase::removeFloor ( Floor * floor ) { - if(floor == NULL) return false; + if(floor == nullptr) return false; - if(floor->getSpatialSubdivisionHandle() == NULL) return false; + if(floor->getSpatialSubdivisionHandle() == nullptr) return false; // ---------- m_floorTree->removeObject( floor->getSpatialSubdivisionHandle() ); - floor->setSpatialSubdivisionHandle(NULL); + floor->setSpatialSubdivisionHandle(nullptr); return true; } @@ -684,11 +684,11 @@ int SpatialDatabase::getFloorCount ( void ) const bool SpatialDatabase::moveObject ( CollisionProperty * collision ) { - if(collision == NULL) return false; + if(collision == nullptr) return false; SpatialSubdivisionHandle * handle = collision->getSpatialSubdivisionHandle(); - if(handle == NULL) return false; + if(handle == nullptr) return false; // ---------- @@ -729,7 +729,7 @@ bool SpatialDatabase::queryStatics ( AxialBox const & box, ObjectVec * outList ) bool SpatialDatabase::queryStatics ( MultiShape const & shape, ObjectVec * outList ) const { - return queryStatics( NULL, shape, outList ); + return queryStatics( nullptr, shape, outList ); } // ---------- @@ -779,21 +779,21 @@ bool SpatialDatabase::queryStatics ( Line3d const & line, ObjectVec * outList ) bool SpatialDatabase::queryStatics ( CellProperty const * cell, MultiShape const & shape, ObjectVec * outList ) const { - return queryObjects(cell,shape,outList,NULL); + return queryObjects(cell,shape,outList,nullptr); } // ---------------------------------------------------------------------- bool SpatialDatabase::queryDynamics ( Sphere const & sphere, ObjectVec * outList ) const { - return queryObjects( NULL, MultiShape(sphere), NULL, outList ); + return queryObjects( nullptr, MultiShape(sphere), nullptr, outList ); } // ---------- bool SpatialDatabase::queryDynamics ( MultiShape const & shape, ObjectVec * outList ) const { - return queryObjects( NULL, shape, NULL, outList ); + return queryObjects( nullptr, shape, nullptr, outList ); } // ---------------------------------------------------------------------- @@ -982,7 +982,7 @@ bool SpatialDatabase::queryCloseStatics ( Vector const & point_w, float maxDista float minClose; float maxClose; - CollisionProperty * dummy = NULL; + CollisionProperty * dummy = nullptr; if(m_staticTree->findClosest(point_w,maxDistance,dummy,minClose,maxClose)) { @@ -1001,7 +1001,7 @@ bool SpatialDatabase::queryCloseFloors ( Vector const & point_w, float maxDistan float minClose; float maxClose; - Floor * dummy = NULL; + Floor * dummy = nullptr; if(m_floorTree->findClosest(point_w,maxDistance,dummy,minClose,maxClose)) { @@ -1163,7 +1163,7 @@ bool SpatialDatabase::queryMaterial ( CellProperty const * cell, // TODO: why are we skipping out on the tests when the extent is a MeshExtent??? MeshExtent const * mesh = dynamic_cast(extent); - if(mesh != NULL) continue; + if(mesh != nullptr) continue; Range hitRange = extent->rangedIntersect(seg_p); @@ -1244,7 +1244,7 @@ bool SpatialDatabase::queryMaterial ( CellProperty const * cellA, CollisionProperty * collisionB = results[i]; NOT_NULL(collisionB); - if (collisionB == NULL) + if (collisionB == nullptr) continue; // ---------- diff --git a/engine/shared/library/sharedCollision/src/shared/extent/BoxExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/BoxExtent.cpp index 3adb1a61..96ce5e4c 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/BoxExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/BoxExtent.cpp @@ -394,7 +394,7 @@ void BoxExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; renderer->setColor( VectorArgb::solidBlue ); renderer->drawBox(m_box); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp b/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp index 1602025b..6f1dce72 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.cpp @@ -49,11 +49,11 @@ int CollisionDetect::getTestCounter ( void ) BaseExtent const * getCollisionExtent_p ( Object const * obj ) { - if(obj == NULL) return NULL; + if(obj == nullptr) return nullptr; CollisionProperty const * collision = obj->getCollisionProperty(); - if(!collision) return NULL; + if(!collision) return nullptr; return collision->getExtent_p(); } @@ -62,8 +62,8 @@ BaseExtent const * getCollisionExtent_p ( Object const * obj ) DetectResult CollisionDetect::testObjects ( Object const * objA, Object const * objB ) { - if(objA == NULL) return false; - if(objB == NULL) return false; + if(objA == nullptr) return false; + if(objB == nullptr) return false; // ---------- @@ -85,8 +85,8 @@ DetectResult CollisionDetect::testObjects ( Object const * objA, Object const * DetectResult CollisionDetect::testObjects ( Object const * objA, Vector const & velocity, Object const * objB ) { - if(objA == NULL) return false; - if(objB == NULL) return false; + if(objA == nullptr) return false; + if(objB == nullptr) return false; // ---------- @@ -108,8 +108,8 @@ DetectResult CollisionDetect::testObjects ( Object const * objA, Vector const & DetectResult CollisionDetect::testObjectsAsCylinders ( Object const * objA, Object const * objB ) { - if(objA == NULL) return false; - if(objB == NULL) return false; + if(objA == nullptr) return false; + if(objB == nullptr) return false; // ---------- @@ -133,7 +133,7 @@ DetectResult CollisionDetect::testObjectsAsCylinders ( Object const * objA, Obje DetectResult CollisionDetect::testObjectExtent ( Object const * objA, BaseExtent const * extentB ) { - if(objA == NULL) return false; + if(objA == nullptr) return false; CollisionProperty const * collA = objA->getCollisionProperty(); @@ -158,7 +158,7 @@ DetectResult CollisionDetect::testSphereExtent ( Sphere const & sphereA, BaseExt // don't return a DetectResult that contains a pointer to a temporary - result.extentA = NULL; + result.extentA = nullptr; return result; } @@ -175,7 +175,7 @@ DetectResult CollisionDetect::testSphereExtent ( Sphere const & sphereA, Vector // don't return a DetectResult that contains a pointer to a temporary - result.extentA = NULL; + result.extentA = nullptr; return result; } @@ -184,7 +184,7 @@ DetectResult CollisionDetect::testSphereExtent ( Sphere const & sphereA, Vector DetectResult CollisionDetect::testSphereObject ( Sphere const & sphereA, Object const * objB ) { - if(objB == NULL) return false; + if(objB == nullptr) return false; CollisionProperty const * collB = objB->getCollisionProperty(); @@ -201,7 +201,7 @@ DetectResult CollisionDetect::testSphereObject ( Sphere const & sphereA, Object DetectResult CollisionDetect::testSphereObject ( Sphere const & sphereA, Vector const & velocity, Object const * objB ) { - if(objB == NULL) return false; + if(objB == nullptr) return false; CollisionProperty const * collB = objB->getCollisionProperty(); @@ -332,8 +332,8 @@ DetectResult CollisionDetect::testCapsuleObjectAgainstAllTypes(Capsule const & c DetectResult CollisionDetect::testExtents ( BaseExtent const * extentA, BaseExtent const * extentB ) { - if(extentA == NULL) return false; - if(extentB == NULL) return false; + if(extentA == nullptr) return false; + if(extentB == nullptr) return false; ExtentType typeA = extentA->getType(); ExtentType typeB = extentB->getType(); @@ -352,8 +352,8 @@ DetectResult CollisionDetect::testExtents ( BaseExtent const * extentA, BaseExte DetectResult CollisionDetect::testExtents ( BaseExtent const * extentA, Vector const & velocity, BaseExtent const * extentB ) { - if(extentA == NULL) return false; - if(extentB == NULL) return false; + if(extentA == nullptr) return false; + if(extentB == nullptr) return false; ExtentType typeA = extentA->getType(); ExtentType typeB = extentB->getType(); @@ -372,8 +372,8 @@ DetectResult CollisionDetect::testExtents ( BaseExtent const * extentA, Vector c DetectResult CollisionDetect::testExtentsAsCylinders ( BaseExtent const * extentA, BaseExtent const * extentB ) { - if(extentA == NULL) return false; - if(extentB == NULL) return false; + if(extentA == nullptr) return false; + if(extentB == nullptr) return false; SimpleExtent const * simpleExtentA = safe_cast(extentA); SimpleExtent const * simpleExtentB = safe_cast(extentB); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.h b/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.h index 8bc78848..0974a602 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.h +++ b/engine/shared/library/sharedCollision/src/shared/extent/CollisionDetect.h @@ -25,16 +25,16 @@ public: DetectResult() : collided(false), collisionTime(Range::empty), - extentA(NULL), - extentB(NULL) + extentA(nullptr), + extentB(nullptr) { } DetectResult ( bool result ) : collided(result), collisionTime( result ? Range::inf : Range::empty ), - extentA(NULL), - extentB(NULL) + extentA(nullptr), + extentB(nullptr) { } diff --git a/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.cpp index d7a6d91a..e005e711 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/CompositeExtent.cpp @@ -31,11 +31,11 @@ CompositeExtent::~CompositeExtent() { delete m_extents->at(i); - m_extents->at(i) = NULL; + m_extents->at(i) = nullptr; } delete m_extents; - m_extents = NULL; + m_extents = nullptr; } @@ -116,7 +116,7 @@ void CompositeExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; for(int i = 0; i < getExtentCount(); i++) { diff --git a/engine/shared/library/sharedCollision/src/shared/extent/CylinderExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/CylinderExtent.cpp index 04d069c9..26cf80c5 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/CylinderExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/CylinderExtent.cpp @@ -146,7 +146,7 @@ void CylinderExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; renderer->setColor( VectorArgb::solidGreen ); renderer->drawCylinder(m_cylinder); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/DetailExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/DetailExtent.cpp index 8ceea23a..1648d2c2 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/DetailExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/DetailExtent.cpp @@ -232,11 +232,11 @@ void DetailExtent::updateBounds ( void ) int countExtents ( BaseExtent const * extent ) { - if(extent == NULL) return 0; + if(extent == nullptr) return 0; CompositeExtent const * composite = dynamic_cast(extent); - if(composite == NULL) return 1; + if(composite == nullptr) return 1; int accum = 0; diff --git a/engine/shared/library/sharedCollision/src/shared/extent/Extent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/Extent.cpp index 24768bf9..248e54f1 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/Extent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/Extent.cpp @@ -369,7 +369,7 @@ void Extent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; renderer->setColor( VectorArgb::solidYellow ); renderer->drawSphere(m_sphere); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.cpp b/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.cpp index e77715a1..954aac1a 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/ExtentList.cpp @@ -44,7 +44,7 @@ Extent * ExtentList::nullFactory ( Iff & iff ) IGNORE_RETURN( iff.goForward() ); - return NULL; + return nullptr; } // ====================================================================== @@ -110,7 +110,7 @@ void ExtentList::remove(void) void ExtentList::assignBinding(Tag tag, CreateFunction createFunction) { - DEBUG_FATAL(!createFunction, ("createFunction may not be NULL")); + DEBUG_FATAL(!createFunction, ("createFunction may not be nullptr")); (*ms_bindImpl.m_map) [tag] = createFunction; } @@ -133,7 +133,7 @@ void ExtentList::removeBinding(Tag tag) /** * Fetch an Extent. * - * This routine may be passed NULL. + * This routine may be passed nullptr. * * This routine will increase the reference count of the specified extent. * @@ -165,7 +165,7 @@ Extent * ExtentList::create(Iff & iff) // handle no extents if (iff.atEndOfForm()) - return NULL; + return nullptr; const Tag tag = iff.getCurrentName(); @@ -201,7 +201,7 @@ const Extent *ExtentList::fetch(Iff & iff) /** * Release an Extent. * - * This routine may be passed NULL. + * This routine may be passed nullptr. * * This routine will decrement the reference count of the Extent. When * the reference count becomes 0, the Extent will be deleted. diff --git a/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp index 2384b251..c32e7857 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/MeshExtent.cpp @@ -62,15 +62,15 @@ SimpleCollisionMesh * MeshExtent::createMesh( IndexedTriangleList * tris ) MeshExtent::MeshExtent() : Extent(ET_Mesh), - m_mesh(NULL), + m_mesh(nullptr), m_box() { - m_mesh = createMesh(NULL); + m_mesh = createMesh(nullptr); } MeshExtent::MeshExtent( IndexedTriangleList * tris ) : Extent(ET_Mesh), - m_mesh(NULL), + m_mesh(nullptr), m_box() { m_mesh = createMesh(tris); @@ -86,7 +86,7 @@ MeshExtent::MeshExtent( SimpleCollisionMesh * mesh ) MeshExtent::~MeshExtent() { delete m_mesh; - m_mesh = NULL; + m_mesh = nullptr; } // ---------------------------------------------------------------------- @@ -168,7 +168,7 @@ void MeshExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; renderer->setColor( VectorArgb::solidWhite ); m_mesh->drawDebugShapes(renderer); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/OrientedCylinderExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/OrientedCylinderExtent.cpp index 234db209..113784a6 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/OrientedCylinderExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/OrientedCylinderExtent.cpp @@ -106,7 +106,7 @@ void OrientedCylinderExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) c #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; renderer->setColor( VectorArgb::solidGreen ); renderer->draw(m_cylinder); diff --git a/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.cpp b/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.cpp index 5e744c37..bc8a27e6 100755 --- a/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.cpp +++ b/engine/shared/library/sharedCollision/src/shared/extent/SimpleExtent.cpp @@ -146,7 +146,7 @@ void SimpleExtent::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; switch( getShape().getShapeType() ) { diff --git a/engine/shared/library/sharedCompression/src/shared/BitStream.cpp b/engine/shared/library/sharedCompression/src/shared/BitStream.cpp index 7cc5876c..54d2a244 100755 --- a/engine/shared/library/sharedCompression/src/shared/BitStream.cpp +++ b/engine/shared/library/sharedCompression/src/shared/BitStream.cpp @@ -48,8 +48,8 @@ BitBuffer::BitBuffer(void *buffer, int size, bool inputStream) current(base), bufSize(size) { - DEBUG_FATAL(!buffer, ("buffer null")); - DEBUG_FATAL(!current, ("buffer null")); + DEBUG_FATAL(!buffer, ("buffer nullptr")); + DEBUG_FATAL(!current, ("buffer nullptr")); } // ---------------------------------------------------------------------- @@ -59,8 +59,8 @@ BitBuffer::BitBuffer(void *buffer, int size, bool inputStream) BitBuffer::~BitBuffer(void) { - base = NULL; - current = NULL; + base = nullptr; + current = nullptr; } // ---------------------------------------------------------------------- @@ -181,17 +181,17 @@ BitFile::BitFile(const char *fileName, bool inputStream) { if (isInput) { - hFile = CreateFile(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); } else { // try to truncate it first - hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (hFile == INVALID_HANDLE_VALUE) { //if that fails, create it - hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); } } @@ -215,7 +215,7 @@ BitFile::~BitFile(void) } } - hFile = NULL; + hFile = nullptr; delete [] name; } @@ -224,7 +224,7 @@ BitFile::~BitFile(void) int BitFile::getOffset(void) const { - return static_cast(SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); + return static_cast(SetFilePointer(hFile, 0, nullptr, FILE_CURRENT)); } // ---------------------------------------------------------------------- @@ -254,7 +254,7 @@ void BitFile::outputBits(uint32 code, uint32 count) if (!mask) { uint32 bytesWritten; - if (!WriteFile(hFile, &rack, sizeof(rack), &bytesWritten, NULL)) + if (!WriteFile(hFile, &rack, sizeof(rack), &bytesWritten, nullptr)) { DEBUG_FATAL(true,("BitFile::outputBits error %d.", GetLastError())); } @@ -280,7 +280,7 @@ void BitFile::outputRack(void) if (mask != INITIAL_MASK_VALUE) { - if (!WriteFile(hFile, &rack, sizeof(rack), &bytesWritten, NULL)) + if (!WriteFile(hFile, &rack, sizeof(rack), &bytesWritten, nullptr)) { DEBUG_FATAL(true,("BitFile::outputRack writing error %d.", GetLastError())); } @@ -312,7 +312,7 @@ uint32 BitFile::inputBits(uint32 count) { uint32 bytesRead; - const BOOL result = ReadFile(hFile, &rack, sizeof(rack), &bytesRead, NULL); + const BOOL result = ReadFile(hFile, &rack, sizeof(rack), &bytesRead, nullptr); UNREF(result); DEBUG_FATAL(result && !bytesRead,("BitFile::inputBits hit EOF")); @@ -383,8 +383,8 @@ ByteBuffer::ByteBuffer(void *buffer, int size, bool inputStream) ByteBuffer::~ByteBuffer(void) { - base = NULL; - current = NULL; + base = nullptr; + current = nullptr; } // ---------------------------------------------------------------------- @@ -422,7 +422,7 @@ void ByteBuffer::output(byte b) bool ByteBuffer::input(byte *b) { - DEBUG_FATAL(!b, ("null pointer")); + DEBUG_FATAL(!b, ("nullptr pointer")); DEBUG_FATAL(!isInput,("ByteBuffer::input called on output stream")); if ((current - base) >= bufSize) @@ -446,15 +446,15 @@ ByteFile::ByteFile(const char *fileName, bool inputStream) { if (isInput) { - hFile = CreateFile(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); } else { - hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (hFile == INVALID_HANDLE_VALUE) { - hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(fileName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); } } @@ -473,7 +473,7 @@ ByteFile::~ByteFile(void) if (hFile != INVALID_HANDLE_VALUE && !CloseHandle(hFile)) DEBUG_FATAL(true,("ByteFile::~ByteFile - Unable to close HANDLE for file %s - Error %d", name, GetLastError())); - hFile = NULL; + hFile = nullptr; delete [] name; } @@ -482,7 +482,7 @@ ByteFile::~ByteFile(void) int ByteFile::getOffset(void) const { - return static_cast(SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); + return static_cast(SetFilePointer(hFile, 0, nullptr, FILE_CURRENT)); } // ---------------------------------------------------------------------- @@ -497,7 +497,7 @@ void ByteFile::output(byte b) byte out = b; uint32 bytesWritten; - if (!WriteFile(hFile, &out, sizeof(byte), &bytesWritten, NULL)) + if (!WriteFile(hFile, &out, sizeof(byte), &bytesWritten, nullptr)) { DEBUG_FATAL(true,("ByteFile::output error %d.", GetLastError())); } @@ -518,7 +518,7 @@ bool ByteFile::input(byte *b) DEBUG_FATAL(!isInput,("ByteFile::input called on output stream.")); uint32 bytesRead; - BOOL result = ReadFile(hFile, b, sizeof(byte), &bytesRead, NULL); + BOOL result = ReadFile(hFile, b, sizeof(byte), &bytesRead, nullptr); // check for EOS return (result && !bytesRead); diff --git a/engine/shared/library/sharedCompression/src/shared/Lz77.cpp b/engine/shared/library/sharedCompression/src/shared/Lz77.cpp index cb18232f..1f630cb8 100755 --- a/engine/shared/library/sharedCompression/src/shared/Lz77.cpp +++ b/engine/shared/library/sharedCompression/src/shared/Lz77.cpp @@ -47,7 +47,7 @@ Lz77::Lz77(uint32 _indexBitCount, uint32 _lengthBitCount) lookAheadSize(rawLookAheadSize + breakEven), treeRoot(windowSize), window(new byte[windowSize]), - tree(NULL) + tree(nullptr) { } @@ -232,10 +232,10 @@ uint32 Lz77::findNextNode(uint32 node) * Delete a string from the tree. * * This routine performs the classic binary tree deletion algorithm. - * If the node to be deleted has a null link in either direction, we - * just pull the non-null link up one to replace the existing link. + * If the node to be deleted has a nullptr link in either direction, we + * just pull the non-nullptr link up one to replace the existing link. * If both links exist, we instead delete the next link in order, which - * is guaranteed to have a null link, then replace the node to be deleted + * is guaranteed to have a nullptr link, then replace the node to be deleted * with the next link. */ @@ -286,7 +286,7 @@ uint32 Lz77::addString(uint32 newNode, uint32 *matchPosition) uint32 *child; int delta = 0; - DEBUG_FATAL(!matchPosition, ("matchPosition is NULL")); + DEBUG_FATAL(!matchPosition, ("matchPosition is nullptr")); if (newNode == endOfStream) return 0; diff --git a/engine/shared/library/sharedCompression/src/shared/ZlibCompressor.cpp b/engine/shared/library/sharedCompression/src/shared/ZlibCompressor.cpp index aedbda00..7f3aed3d 100755 --- a/engine/shared/library/sharedCompression/src/shared/ZlibCompressor.cpp +++ b/engine/shared/library/sharedCompression/src/shared/ZlibCompressor.cpp @@ -121,8 +121,8 @@ void ZlibCompressorNamespace::remove() DEBUG_FATAL(static_cast(ms_memoryPool.size()) != ms_poolElementCount, ("ZLibCompressor memory pool entries not all released")); operator delete(ms_memoryBottom); - ms_memoryBottom = NULL; - ms_memoryTop = NULL; + ms_memoryBottom = nullptr; + ms_memoryTop = nullptr; ms_memoryPool.clear(); ms_mutex.leave(); @@ -155,12 +155,12 @@ int ZlibCompressor::compress(const void *inputBuffer, int inputSize, void *outpu z.avail_out = outputSize; z.total_out = 0; - z.msg = NULL; - z.state = NULL; + z.msg = nullptr; + z.state = nullptr; z.zalloc = allocateWrapper; z.zfree = freeWrapper; - z.opaque = NULL; + z.opaque = nullptr; z.data_type = Z_BINARY; z.adler = 0; @@ -196,12 +196,12 @@ int ZlibCompressor::expand(const void *inputBuffer, int inputSize, void *outputB z.avail_out = outputSize; z.total_out = 0; - z.msg = NULL; - z.state = NULL; + z.msg = nullptr; + z.state = nullptr; z.zalloc = allocateWrapper; z.zfree = freeWrapper; - z.opaque = NULL; + z.opaque = nullptr; z.data_type = Z_BINARY; z.adler = 0; diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h index 22617057..03c2d7dc 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h @@ -1,13 +1,13 @@ /* Bindable.h * * Defines classes based on built-in simple types that know how to bind themselves to - * database queries and support null values. + * database queries and support nullptr values. * * Each class supports the following functions: - * bool isNull -- test whether the value is null - * void setToNull -- set the value to null - * getValue -- return the value (make sure you test for null before calling this. The results - * are undefined if the Bindable is null.) + * bool isNull -- test whether the value is nullptr + * void setToNull -- set the value to nullptr + * getValue -- return the value (make sure you test for nullptr before calling this. The results + * are undefined if the Bindable is nullptr.) * setValue -- set the value * * ODBC version diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBase.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBase.h index 51008166..2aa7e5b8 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBase.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBase.h @@ -31,7 +31,7 @@ namespace DB { explicit Bindable(int _indicator); /** - * The size of the data, or -1 for NULL. + * The size of the data, or -1 for nullptr. */ int indicator; }; diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBool.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBool.h index 36929d60..044371fe 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBool.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableBool.h @@ -18,7 +18,7 @@ namespace DB { /** Represents a bool in C++, bound to a CHAR(1) column. The column can have the values 'Y' or 'N'. - * TODO: use a boolean type in the database, if we can find one that allows NULL's and is fairly + * TODO: use a boolean type in the database, if we can find one that allows nullptr's and is fairly * portable. (May not exist -- according to the docs, Oracle does not have a boolean datatype.) */ class BindableBool : public Bindable diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableString.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableString.h index 103b2ada..2548990e 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableString.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableString.h @@ -133,11 +133,11 @@ namespace DB std::string getValueASCII() const; /** Allocate a new string and copy the buffer to it. The caller takes responsibility - for delete[]ing it later. (If the string is NULL, this returns a null pointer.) + for delete[]ing it later. (If the string is nullptr, this returns a nullptr pointer.) */ char *makeCopyOfValue() const; -/** Set the value of the bindable string from another (null-terminated) string +/** Set the value of the bindable string from another (nullptr-terminated) string If the source buffer is too big, it FATAL's. Another alternative would be to have it truncate the string. Right now, it's better to FATAL to avoid hard-to-find bugs @@ -168,7 +168,7 @@ namespace DB private: - char m_value[S+1]; // column of size S, plus one byte for a trailing null + char m_value[S+1]; // column of size S, plus one byte for a trailing nullptr }; // ====================================================================== @@ -206,7 +206,7 @@ namespace DB { if (isNull()) { - return strncpy(buffer,"\0",1); // in the database, a zero-length string and a NULL aren't really + return strncpy(buffer,"\0",1); // in the database, a zero-length string and a nullptr aren't really // the same thing, but this is the closest we can do here. } return strncpy(buffer,m_value,(bufsize>(S+1))?(S+1):bufsize); @@ -259,7 +259,7 @@ namespace DB } FATAL((i==S+1) && (m_value[S]!='\0'),("Attempt to save string \"%s\" to the database. It is too long for the column.",buffer)); indicator=i; // set indicator to actual length of string -// m_value[S]='\0'; // guarantee null terminator -- uncomment if you remove the above FATAL +// m_value[S]='\0'; // guarantee nullptr terminator -- uncomment if you remove the above FATAL } template diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableUnicode.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableUnicode.h index 9c85e6d4..544ead4c 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableUnicode.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableUnicode.h @@ -143,7 +143,7 @@ namespace DB private: - char m_value[S+1]; // column of size S, plus one byte for a trailing null + char m_value[S+1]; // column of size S, plus one byte for a trailing nullptr }; // ====================================================================== diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBufferRow.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBufferRow.h index 0d1b70d0..550f2896 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBufferRow.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBufferRow.h @@ -33,9 +33,9 @@ namespace DB * Combines the values in this row with the values in newRow. * * For each column: - * If the column is null in newRow, do nothing. (Leave the value + * If the column is nullptr in newRow, do nothing. (Leave the value * in this row unchanged.) - * If the column is not null in newRow, replace the value in this + * If the column is not nullptr in newRow, replace the value in this * row with the value in newRow. */ virtual void combine(const DB::Row &newRow) =0; diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbServer.cpp b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbServer.cpp index 13f7460e..83015b31 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbServer.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/DbServer.cpp @@ -29,7 +29,7 @@ using namespace DB; Mutex Server::ms_profileMutex; bool Server::ms_enableProfiling = false; bool Server::ms_enableVerboseMode = false; -DB::Profiler *Server::ms_profiler = NULL; +DB::Profiler *Server::ms_profiler = nullptr; int Server::ms_reconnectTime=0; int Server::ms_maxErrorCountBeforeDisconnect=5; int Server::ms_maxErrorCountBeforeBailout=10; @@ -51,7 +51,7 @@ Server::SesListElem::SesListElem (Session *_ses, SesListElem *_next) : ses (_ses // ---------------------------------------------------------------------- Server::Server(const char *_dsn, const char *_uid, const char *_pwd, bool useMemoryManager) : - sessionList (NULL), + sessionList (nullptr), sessionListLock(), m_useMemoryManager(useMemoryManager) { @@ -194,7 +194,7 @@ Session *Server::popSession() else { sessionListLock.leave(); - return NULL; + return nullptr; } } @@ -294,7 +294,7 @@ void Server::endProfiling() { ms_profileMutex.enter(); delete ms_profiler; - ms_profiler = NULL; + ms_profiler = nullptr; ms_enableProfiling = false; ms_profileMutex.leave(); } diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedStandardString.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedStandardString.h index ff154c7c..57a4395e 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedStandardString.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedStandardString.h @@ -15,7 +15,7 @@ // ====================================================================== /** - * A unicode-string-compatible class that encodes a null value as a single space + * A unicode-string-compatible class that encodes a nullptr value as a single space */ class NullEncodedStandardString { diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedUnicodeString.h b/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedUnicodeString.h index b28de588..45a2c521 100755 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedUnicodeString.h +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/core/NullEncodedUnicodeString.h @@ -15,7 +15,7 @@ // ====================================================================== /** - * A unicode-string-compatible class that encodes a null value as a single space + * A unicode-string-compatible class that encodes a nullptr value as a single space */ class NullEncodedUnicodeString { diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.cpp index 7fff3387..b0cec73d 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.cpp @@ -22,9 +22,9 @@ using namespace DB; BindableVarray::BindableVarray() : m_initialized(false), - m_tdo (NULL), - m_data (NULL), - m_session (NULL) + m_tdo (nullptr), + m_data (nullptr), + m_session (nullptr) { } @@ -52,7 +52,7 @@ bool BindableVarray::create(DB::Session *session, const std::string &name, const schema.length(), reinterpret_cast(const_cast(name.c_str())), name.length(), - NULL, + nullptr, 0, OCI_DURATION_SESSION, OCI_TYPEGET_HEADER, @@ -64,7 +64,7 @@ bool BindableVarray::create(DB::Session *session, const std::string &name, const localSession->errhp, localSession->svchp, OCI_TYPECODE_VARRAY, - m_tdo, NULL, + m_tdo, nullptr, OCI_DURATION_DEFAULT, true, reinterpret_cast(&m_data))))) @@ -86,9 +86,9 @@ void BindableVarray::free() OCIObjectFree (localSession->envhp, localSession->errhp, m_data, 0))); m_initialized = false; - m_tdo=NULL; - m_data=NULL; - m_session=NULL; + m_tdo=nullptr; + m_data=nullptr; + m_session=nullptr; } // ---------------------------------------------------------------------- @@ -354,7 +354,7 @@ std::string BindableVarrayNumber::outputValue() const if (exists) { if (*indicator == OCI_IND_NULL) - result += "NULL"; + result += "nullptr"; else { double value; @@ -400,7 +400,7 @@ bool BindableVarrayString::push_back(const Unicode::String &value) bool BindableVarrayString::push_back(const std::string &value) { - OCIString *buffer = NULL; + OCIString *buffer = nullptr; OCIInd buffer_indicator (OCI_IND_NOTNULL); OCISession *localSession = safe_cast(m_session); @@ -437,7 +437,7 @@ bool BindableVarrayString::push_back(bool bvalue) else value = "N"; - OCIString *buffer = NULL; + OCIString *buffer = nullptr; OCIInd buffer_indicator (OCI_IND_NOTNULL); OCISession *localSession = safe_cast(m_session); @@ -469,7 +469,7 @@ bool BindableVarrayString::push_back(bool IsNULL, const Unicode::String &value) bool BindableVarrayString::push_back(bool IsNULL, const std::string &value) { - OCIString *buffer = NULL; + OCIString *buffer = nullptr; OCIInd buffer_indicator; if ( IsNULL ) { @@ -515,7 +515,7 @@ bool BindableVarrayString::push_back(bool IsNULL, bool bvalue) else value = "N"; - OCIString *buffer = NULL; + OCIString *buffer = nullptr; OCIInd buffer_indicator; if ( IsNULL ) { @@ -568,14 +568,14 @@ std::string BindableVarrayString::outputValue() const if (exists) { if (*indicator == OCI_IND_NULL) - result += "NULL"; + result += "nullptr"; else { OraText * text = OCIStringPtr(localSession->envhp, *element); if (text) result += '"' + std::string(reinterpret_cast(text)) + '"'; else - result += "NULL"; + result += "nullptr"; } } else diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp index ab311290..b4486dc8 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp @@ -49,13 +49,13 @@ bool DB::OCIQueryImpl::setup(Session *session) { // setSession(session); - DEBUG_FATAL(m_session!=0,("m_session was not NULL")); - DEBUG_FATAL(m_server!=0,("m_server was not NULL")); + DEBUG_FATAL(m_session!=0,("m_session was not nullptr")); + DEBUG_FATAL(m_server!=0,("m_server was not nullptr")); DEBUG_FATAL(m_stmthp!=0,("m_stmthp was not 0")); DEBUG_FATAL(m_cursorhp!=0,("m_cursorhp was not 0")); m_session=dynamic_cast(session); - FATAL((m_session==0),("Must pass a non-NULL OCISession to setup().")); + FATAL((m_session==0),("Must pass a non-nullptr OCISession to setup().")); m_server=m_session->m_server; NOT_NULL(m_server); @@ -180,7 +180,7 @@ bool DB::OCIQueryImpl::exec() m_session->setOkToFetch(); m_session->setLastQueryStatement(m_sql); sword status=OCIStmtExecute(m_session->svchp, m_stmthp, m_session->errhp, 1, 0, - NULL, NULL, OCI_DEFAULT); + nullptr, nullptr, OCI_DEFAULT); if (status == OCI_NO_DATA) { @@ -393,8 +393,8 @@ DB::OCIQueryImpl::BindRec::BindRec(size_t numElements) : length(0), stringAdjust(false), m_numElements(numElements), - m_indicatorArray(NULL), - m_lengthArray(NULL) + m_indicatorArray(nullptr), + m_lengthArray(nullptr) { // This is ugly, but it avoids having to create two different kinds of bindrecs that inherit from an abstract base class if (m_numElements > 1) @@ -714,11 +714,11 @@ bool DB::OCIQueryImpl::bindParameter(BindableVarray &buffer) &(br->bindp), m_session->errhp, nextParameter++, - NULL, + nullptr, 0, SQLT_NTY, - NULL, - NULL, + nullptr, + nullptr, 0, 0, 0, diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp index ead0cb9c..7c40e0ae 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciServer.cpp @@ -63,7 +63,7 @@ bool DB::OCIServer::checkerr(OCISession const & session, int status) text errbuf[512]; sb4 errcode = 0; - OCIErrorGet((dvoid *)(session.errhp), (ub4) 1, (text *) NULL, &errcode, + OCIErrorGet((dvoid *)(session.errhp), (ub4) 1, (text *) nullptr, &errcode, errbuf, (ub4) sizeof(errbuf), OCI_HTYPE_ERROR); WARNING(true,("Database error: %.*s",512,errbuf)); diff --git a/engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp b/engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp index 124998bc..e7e7bc66 100755 --- a/engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src_oci/OciSession.cpp @@ -56,11 +56,11 @@ static void freeHook(dvoid *, dvoid *memptr) DB::OCISession::OCISession(DB::OCIServer *server) : m_server(server), - envhp(NULL), - errhp(NULL), - srvhp(NULL), - sesp(NULL), - svchp(NULL), + envhp(nullptr), + errhp(nullptr), + srvhp(nullptr), + sesp(nullptr), + svchp(nullptr), autoCommitMode(true), m_resetTime(server->getReconnectTime()==0 ? 0 : time(0) + server->getReconnectTime()), m_okToFetch(true) @@ -235,11 +235,11 @@ bool DB::OCISession::disconnect() success = false; } - svchp = NULL; - sesp = NULL; - srvhp = NULL; - errhp = NULL; - envhp = NULL; + svchp = nullptr; + sesp = nullptr; + srvhp = nullptr; + errhp = nullptr; + envhp = nullptr; connectLock.leave(); return success; diff --git a/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp b/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp index 3dff8883..95dfef41 100755 --- a/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp +++ b/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp @@ -160,7 +160,7 @@ void DebugMonitor::install(void) // handle input from the output terminal, particularly to // handle profiler modifications when the output window // is active. - s_outputScreen = newterm(NULL, s_ttyOutputFile, stdin); + s_outputScreen = newterm(nullptr, s_ttyOutputFile, stdin); if (!s_outputScreen) { DEBUG_WARNING(true, ("DebugMonitor: newterm() failed [%s].", strerror(errno))); diff --git a/engine/shared/library/sharedDebug/src/linux/PerformanceTimer.cpp b/engine/shared/library/sharedDebug/src/linux/PerformanceTimer.cpp index 68c36d8c..f7bd1037 100755 --- a/engine/shared/library/sharedDebug/src/linux/PerformanceTimer.cpp +++ b/engine/shared/library/sharedDebug/src/linux/PerformanceTimer.cpp @@ -39,7 +39,7 @@ PerformanceTimer::~PerformanceTimer() void PerformanceTimer::start() { - int const result = gettimeofday(&startTime, NULL); + int const result = gettimeofday(&startTime, nullptr); FATAL(result != 0,("PerformanceTimer::start failed")); } @@ -55,7 +55,7 @@ void PerformanceTimer::resume() usec += 1000000; } - int const result = gettimeofday(&startTime, NULL); + int const result = gettimeofday(&startTime, nullptr); FATAL(result != 0,("PerformanceTimer::resume failed")); startTime.tv_sec -= sec; @@ -71,7 +71,7 @@ void PerformanceTimer::resume() void PerformanceTimer::stop() { - int result = gettimeofday(&stopTime, NULL); + int result = gettimeofday(&stopTime, nullptr); FATAL(result != 0,("PerformanceTimer::start failed")); } @@ -95,7 +95,7 @@ float PerformanceTimer::getSplitTime() const { timeval currentTime; - int const result = gettimeofday(¤tTime, NULL); + int const result = gettimeofday(¤tTime, nullptr); FATAL(result != 0,("PerformanceTimer::getSplitTime failed")); long sec = currentTime.tv_sec - startTime.tv_sec; @@ -117,7 +117,7 @@ void PerformanceTimer::logElapsedTime(const char* string) const #ifdef _DEBUG static char buffer [1000]; - sprintf(buffer, "%s : %1.5f seconds\n", string ? string : "null", getElapsedTime()); + sprintf(buffer, "%s : %1.5f seconds\n", string ? string : "nullptr", getElapsedTime()); DEBUG_REPORT_LOG_PRINT(true, ("%s", buffer)); #endif } diff --git a/engine/shared/library/sharedDebug/src/shared/DataLint.cpp b/engine/shared/library/sharedDebug/src/shared/DataLint.cpp index 5190728f..8f96856d 100755 --- a/engine/shared/library/sharedDebug/src/shared/DataLint.cpp +++ b/engine/shared/library/sharedDebug/src/shared/DataLint.cpp @@ -35,9 +35,9 @@ namespace DataLintNamespace bool ms_installed = false; DataLint::AssetType m_currentAssetType = DataLint::AT_invalid; bool m_enabled = false; - WarningList * m_warningList = NULL; - StringList * m_assetStack = NULL; - DataLint::StringPairList * m_assetList = NULL; + WarningList * m_warningList = nullptr; + StringList * m_assetStack = nullptr; + DataLint::StringPairList * m_assetList = nullptr; std::string m_dataLintCategorizedAssetsFile("DataLint_CategorizedAssets.txt"); std::string m_dataLintUnSupportedAssetsFile("DataLint_UnSupportedAssets.txt"); Mode m_mode = M_client; @@ -123,17 +123,17 @@ void DataLint::report() // Client only - FILE *assetErrorFileAppearance = NULL; - FILE *assetErrorFileArrangementDescriptor = NULL; - FILE *assetErrorFileLocalizedStringTable = NULL; - FILE *assetErrorFilePortalProperty = NULL; - FILE *assetErrorFileShaderTemplate = NULL; - FILE *assetErrorFileSkyBox = NULL; - FILE *assetErrorFileSlotDescriptor = NULL; - FILE *assetErrorFileSoundTemplate = NULL; - FILE *assetErrorFileTerrain = NULL; - FILE *assetErrorFileTexture = NULL; - FILE *assetErrorFileTextureRenderer = NULL; + FILE *assetErrorFileAppearance = nullptr; + FILE *assetErrorFileArrangementDescriptor = nullptr; + FILE *assetErrorFileLocalizedStringTable = nullptr; + FILE *assetErrorFilePortalProperty = nullptr; + FILE *assetErrorFileShaderTemplate = nullptr; + FILE *assetErrorFileSkyBox = nullptr; + FILE *assetErrorFileSlotDescriptor = nullptr; + FILE *assetErrorFileSoundTemplate = nullptr; + FILE *assetErrorFileTerrain = nullptr; + FILE *assetErrorFileTexture = nullptr; + FILE *assetErrorFileTextureRenderer = nullptr; if (m_mode == M_client) { @@ -450,7 +450,7 @@ std::string DataLintNamespace::formatErrorMessage(WarningPair &warningPair, int char *assetError = strstr(text, " : "); - if (assetError != NULL) + if (assetError != nullptr) { ++assetError; ++assetError; @@ -567,12 +567,12 @@ void DataLint::clearAssetStack() //----------------------------------------------------------------------------- void DataLint::addFilePath(char const *filePath) { - if (filePath == NULL || (strlen(filePath) <= 0)) + if (filePath == nullptr || (strlen(filePath) <= 0)) { return; } - if (m_assetList != NULL) + if (m_assetList != nullptr) { char text[4096]; sprintf(text, "%s", filePath); @@ -592,7 +592,7 @@ void DataLint::addFilePath(char const *filePath) //----------------------------------------------------------------------------- void DataLint::removeFilePath(char const *filePath) { - if (m_assetList != NULL) + if (m_assetList != nullptr) { StringPairList::iterator stringPairListIter = m_assetList->begin(); @@ -611,8 +611,8 @@ void DataLint::removeFilePath(char const *filePath) //----------------------------------------------------------------------------- bool DataLintNamespace::isAnAppearanceAsset(char const *text) { - bool const appearanceAsset = (strstr(text, "appearance/") != NULL); - bool const portalPropertyAsset = (strstr(text, ".pob") != NULL); + bool const appearanceAsset = (strstr(text, "appearance/") != nullptr); + bool const portalPropertyAsset = (strstr(text, ".pob") != nullptr); return (appearanceAsset && !portalPropertyAsset); } @@ -620,7 +620,7 @@ bool DataLintNamespace::isAnAppearanceAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isAnArrangementDescriptorAsset(char const *text) { - bool const arrangementDescriptorAsset = (strstr(text, "slot/arrangement/") != NULL); + bool const arrangementDescriptorAsset = (strstr(text, "slot/arrangement/") != nullptr); return arrangementDescriptorAsset; } @@ -628,7 +628,7 @@ bool DataLintNamespace::isAnArrangementDescriptorAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isALocalizedStringAsset(char const *text) { - bool const localizedStringAsset = (strstr(text, ".stf") != NULL); + bool const localizedStringAsset = (strstr(text, ".stf") != nullptr); return localizedStringAsset; } @@ -638,8 +638,8 @@ bool DataLintNamespace::isAnObjectTemplateAsset(char const *text) { bool result = false; UNREF(text); - bool const isInTheObjectDirectory = (strstr(text, "object/") != NULL); - bool const isInTheAbstractDirectory = (strstr(text, "abstract/") != NULL); + bool const isInTheObjectDirectory = (strstr(text, "object/") != nullptr); + bool const isInTheAbstractDirectory = (strstr(text, "abstract/") != nullptr); if (isInTheObjectDirectory || isInTheAbstractDirectory) { @@ -655,7 +655,7 @@ bool DataLintNamespace::isAnObjectTemplateAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isAPortalProprtyAsset(char const *text) { - bool const portalPropertyAsset = (strstr(text, ".pob") != NULL); + bool const portalPropertyAsset = (strstr(text, ".pob") != nullptr); return portalPropertyAsset; } @@ -663,7 +663,7 @@ bool DataLintNamespace::isAPortalProprtyAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isAShaderTemplateAsset(char const *text) { - bool const shaderTemplateAsset = (strstr(text, "shader/") != NULL); + bool const shaderTemplateAsset = (strstr(text, "shader/") != nullptr); return shaderTemplateAsset; } @@ -671,7 +671,7 @@ bool DataLintNamespace::isAShaderTemplateAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isASkyBoxAsset(char const *text) { - bool const skyBoxAsset = (strstr(text, "skybox/") != NULL); + bool const skyBoxAsset = (strstr(text, "skybox/") != nullptr); return skyBoxAsset; } @@ -679,7 +679,7 @@ bool DataLintNamespace::isASkyBoxAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isASlotDescriptorAsset(char const *text) { - bool const slotDescriptorAsset = (strstr(text, "slot/descriptor/") != NULL); + bool const slotDescriptorAsset = (strstr(text, "slot/descriptor/") != nullptr); return slotDescriptorAsset; } @@ -687,7 +687,7 @@ bool DataLintNamespace::isASlotDescriptorAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isASoundAsset(char const *text) { - bool const soundAsset = (strstr(text, "sound/") != NULL); + bool const soundAsset = (strstr(text, "sound/") != nullptr); return soundAsset; } @@ -701,7 +701,7 @@ bool DataLintNamespace::isATerrainAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isATextureAsset(char const *text) { - bool const textureAsset = (strstr(text, ".dds") != NULL); + bool const textureAsset = (strstr(text, ".dds") != nullptr); return textureAsset; } @@ -709,7 +709,7 @@ bool DataLintNamespace::isATextureAsset(char const *text) //----------------------------------------------------------------------------- bool DataLintNamespace::isATextureRendererTemplateAsset(char const *text) { - bool const textureRendererAsset = (strstr(text, ".trt") != NULL); + bool const textureRendererAsset = (strstr(text, ".trt") != nullptr); return textureRendererAsset; } @@ -749,7 +749,7 @@ bool DataLintNamespace::isAnUnSupportedAsset(char const *text) //----------------------------------------------------------------------------- DataLint::StringPairList DataLintNamespace::getList(int const reserveCount, AssetFunction assetTypeFunction) { - DEBUG_FATAL(!m_assetList, ("DataLint::getList() - m_assetList is NULL")); + DEBUG_FATAL(!m_assetList, ("DataLint::getList() - m_assetList is nullptr")); // Create the list of terrains diff --git a/engine/shared/library/sharedDebug/src/shared/DebugFlags.cpp b/engine/shared/library/sharedDebug/src/shared/DebugFlags.cpp index c676ddeb..c82795d4 100755 --- a/engine/shared/library/sharedDebug/src/shared/DebugFlags.cpp +++ b/engine/shared/library/sharedDebug/src/shared/DebugFlags.cpp @@ -25,8 +25,8 @@ std::vector DebugFlags::ms_flagsSortedByReportPriority; void DebugFlags::config(bool &variable, const char *configSection, const char *configName) { - DEBUG_FATAL(strchr(configSection, ' ') != NULL, ("no spaces are allowed in debug flag section names: %s", configSection)); - DEBUG_FATAL(strchr(configName, ' ') != NULL, ("no spaces are allowed in debug flag names: %s", configName)); + DEBUG_FATAL(strchr(configSection, ' ') != nullptr, ("no spaces are allowed in debug flag section names: %s", configSection)); + DEBUG_FATAL(strchr(configName, ' ') != nullptr, ("no spaces are allowed in debug flag names: %s", configName)); if (configSection && configName && ConfigFile::isInstalled()) { @@ -102,9 +102,9 @@ void DebugFlags::registerFlag(bool &variable, const char *section, const char *n f.section = section; f.name = name; f.reportPriority = 0; - f.reportRoutine1 = NULL; - f.reportRoutine2 = NULL; - f.context = NULL; + f.reportRoutine1 = nullptr; + f.reportRoutine2 = nullptr; + f.context = nullptr; #ifdef _DEBUG f.m_callStack.sample(); #endif @@ -127,8 +127,8 @@ void DebugFlags::registerFlag(bool &variable, const char *section, const char *n f.name = name; f.reportPriority = reportPriority; f.reportRoutine1 = reportRoutine; - f.reportRoutine2 = NULL; - f.context = NULL; + f.reportRoutine2 = nullptr; + f.context = nullptr; #ifdef _DEBUG f.m_callStack.sample(); #endif @@ -150,7 +150,7 @@ void DebugFlags::registerFlag(bool &variable, const char *section, const char *n f.section = section; f.name = name; f.reportPriority = reportPriority; - f.reportRoutine1 = NULL; + f.reportRoutine1 = nullptr; f.reportRoutine2 = reportRoutine; f.context = context; #ifdef _DEBUG @@ -230,7 +230,7 @@ DebugFlags::Flag const * DebugFlags::getFlag(char const * const section, char co return &f; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedDebug/src/shared/DebugKey.cpp b/engine/shared/library/sharedDebug/src/shared/DebugKey.cpp index 1fb1eefe..3fd2a330 100755 --- a/engine/shared/library/sharedDebug/src/shared/DebugKey.cpp +++ b/engine/shared/library/sharedDebug/src/shared/DebugKey.cpp @@ -108,7 +108,7 @@ bool DebugKey::isDown(int i) bool DebugKey::isActive() { #if PRODUCTION == 0 - return ms_currentFlag != NULL; + return ms_currentFlag != nullptr; #else return false; #endif diff --git a/engine/shared/library/sharedDebug/src/shared/InstallTimer.cpp b/engine/shared/library/sharedDebug/src/shared/InstallTimer.cpp index 5fe48326..80e21bc9 100755 --- a/engine/shared/library/sharedDebug/src/shared/InstallTimer.cpp +++ b/engine/shared/library/sharedDebug/src/shared/InstallTimer.cpp @@ -64,7 +64,7 @@ void InstallTimer::manualExit() unsigned long const endingNumberOfBytesAllocated = MemoryManager::getCurrentNumberOfBytesAllocated(); --ms_indent; REPORT_LOG_PRINT(ms_enabled, ("InstallTimer:%*c%6.4f %d %s\n", ms_indent * 2, ' ', m_performanceTimer.getElapsedTime(), static_cast(endingNumberOfBytesAllocated - m_startingNumberOfBytesAllocated), m_description)); - m_description = NULL; + m_description = nullptr; } } diff --git a/engine/shared/library/sharedDebug/src/shared/PixCounter.cpp b/engine/shared/library/sharedDebug/src/shared/PixCounter.cpp index dcb14966..b0a63e6d 100755 --- a/engine/shared/library/sharedDebug/src/shared/PixCounter.cpp +++ b/engine/shared/library/sharedDebug/src/shared/PixCounter.cpp @@ -83,13 +83,13 @@ void PixCounterNamespace::remove() { #ifdef _WIN32 FreeLibrary(ms_pixDll); - ms_pixDll = NULL; + ms_pixDll = nullptr; #endif - ms_setCounterFloat = NULL; - ms_setCounterInt = NULL; - ms_setCounterInt64 = NULL; - ms_setCounterString = NULL; + ms_setCounterFloat = nullptr; + ms_setCounterInt = nullptr; + ms_setCounterInt64 = nullptr; + ms_setCounterString = nullptr; // Make sure the counter memory gets freed at this point Counters().swap(ms_counters); @@ -379,7 +379,7 @@ PixCounter::String::String() : Counter(), m_enabled(false), m_lastFrameValue(), - m_lastFrameValuePointer(NULL), + m_lastFrameValuePointer(nullptr), m_currentValue() { } diff --git a/engine/shared/library/sharedDebug/src/shared/Profiler.cpp b/engine/shared/library/sharedDebug/src/shared/Profiler.cpp index eb484451..59e92811 100755 --- a/engine/shared/library/sharedDebug/src/shared/Profiler.cpp +++ b/engine/shared/library/sharedDebug/src/shared/Profiler.cpp @@ -238,7 +238,7 @@ void Profiler::install() ms_profilerEntriesCurrent = &ms_profilerEntries1; ms_profilerEntriesLast = &ms_profilerEntries2; - ms_rootVisibleExpandableEntry = new VisibleExpandableEntry(NULL); + ms_rootVisibleExpandableEntry = new VisibleExpandableEntry(nullptr); ms_rootVisibleExpandableEntry->setExpanded(true); ms_selectedVisibleExpandableEntry = ms_rootVisibleExpandableEntry; } @@ -248,13 +248,13 @@ void Profiler::install() void Profiler::remove() { delete ms_rootVisibleExpandableEntry; - ms_rootVisibleExpandableEntry = NULL; - ms_beforeSelectedVisibleExpandableEntry = NULL; - ms_selectedVisibleExpandableEntry = NULL; - ms_afterSelectedVisibleExpandableEntry = NULL; - ms_previousVisibleExpandableEntry = NULL; - ms_profilerEntriesCurrent = NULL; - ms_profilerEntriesLast = NULL; + ms_rootVisibleExpandableEntry = nullptr; + ms_beforeSelectedVisibleExpandableEntry = nullptr; + ms_selectedVisibleExpandableEntry = nullptr; + ms_afterSelectedVisibleExpandableEntry = nullptr; + ms_previousVisibleExpandableEntry = nullptr; + ms_profilerEntriesCurrent = nullptr; + ms_profilerEntriesLast = nullptr; } // ---------------------------------------------------------------------- @@ -374,11 +374,11 @@ bool ProfilerNamespace::formatEntry(int indent, ProfilerTimer::Type totalTime, i void ProfilerNamespace::processEntry(char const *rootName, int indent, ProfilerEntry const & entry, VisibleExpandableEntry * visibleExpandableEntry) { if (rootName == entry.name) - rootName = NULL; + rootName = nullptr; if (!rootName) { - if (!formatEntry(indent, entry.totalTime, entry.totalCalls, visibleExpandableEntry != NULL, visibleExpandableEntry && visibleExpandableEntry->isExpanded(), visibleExpandableEntry == ms_selectedVisibleExpandableEntry, entry.name)) + if (!formatEntry(indent, entry.totalTime, entry.totalCalls, visibleExpandableEntry != nullptr, visibleExpandableEntry && visibleExpandableEntry->isExpanded(), visibleExpandableEntry == ms_selectedVisibleExpandableEntry, entry.name)) return; } @@ -410,7 +410,7 @@ void ProfilerNamespace::processEntry(char const *rootName, int indent, ProfilerE if (child.children.empty()) { - processEntry(rootName, indent, child, NULL); + processEntry(rootName, indent, child, nullptr); } else { @@ -483,9 +483,9 @@ void ProfilerNamespace::generateReport() ms_rootVisibleExpandableEntry->markAllChildrenInvisible(); ms_rootVisibleExpandableEntry->findOrAddExpandableChild(rootEntry.name); - ms_previousVisibleExpandableEntry = NULL; - ms_beforeSelectedVisibleExpandableEntry = NULL; - ms_afterSelectedVisibleExpandableEntry = NULL; + ms_previousVisibleExpandableEntry = nullptr; + ms_beforeSelectedVisibleExpandableEntry = nullptr; + ms_afterSelectedVisibleExpandableEntry = nullptr; processEntry(ms_rootProfilerName, 0, rootEntry, ms_rootVisibleExpandableEntry); if (ms_rootVisibleExpandableEntry->pruneInvisibleChildren()) @@ -494,7 +494,7 @@ void ProfilerNamespace::generateReport() if (ms_setRoot) { if (ms_rootProfilerName) - ms_rootProfilerName = NULL; + ms_rootProfilerName = nullptr; else ms_rootProfilerName = ms_selectedVisibleExpandableEntry->getName(); ms_setRoot = false; @@ -720,7 +720,7 @@ void ProfilerNamespace::enterWithTime(char const *name, ProfilerTimer::Type time // search for another call to this block from the parent int entryIndex = -1; - ProfilerEntry *entry = NULL; + ProfilerEntry *entry = nullptr; if (!ms_profilerEntryStack.empty()) { ProfilerEntry &parent = (*ms_profilerEntriesCurrent)[ms_profilerEntryStack.back()]; diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.cpp b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.cpp index c9e832b9..e6b40c19 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.cpp +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.cpp @@ -92,10 +92,10 @@ void RemoteDebug::remove(void) return; } - ms_removeFunction = NULL; - ms_openFunction = NULL; - ms_closeFunction = NULL; - ms_sendFunction = NULL; + ms_removeFunction = nullptr; + ms_openFunction = nullptr; + ms_closeFunction = nullptr; + ms_sendFunction = nullptr; //empty out session-level data for (StreamMap::iterator it = ms_streams->begin(); it != ms_streams->end(); ++it) @@ -147,7 +147,7 @@ uint32 RemoteDebug::registerStream(const std::string& streamName) DEBUG_FATAL(!ms_installed, ("remoteDebug not installed")); uint32 streamNum = 0; - Channel *parent = NULL; + Channel *parent = nullptr; std::string base; std::string rest = streamName; //look for subchannels with a double backslash @@ -203,7 +203,7 @@ uint32 RemoteDebug::registerStaticView(const std::string& channelName) { DEBUG_FATAL(!ms_installed, ("remoteDebug not installed")); uint32 staticViewNum = 0; - Channel *parent = NULL; + Channel *parent = nullptr; std::string base; std::string rest = channelName; //look for subchannels with a double backslash @@ -356,7 +356,7 @@ uint32 RemoteDebug::registerVariable(const char* variableName, void *memLoc, VAR std::string variable = variableName; uint32 variableNum = 0; - Channel *parent = NULL; + Channel *parent = nullptr; std::string base; std::string rest = variable; //look for subchannels with a double backslash @@ -375,7 +375,7 @@ uint32 RemoteDebug::registerVariable(const char* variableName, void *memLoc, VAR //only add the variable if we don't have it yet if (variableNumber == -1) { - registerVariable(newBase.c_str(), NULL, BOOL, sendToClients); + registerVariable(newBase.c_str(), nullptr, BOOL, sendToClients); } //look for any other subChannel uint32 oldRestIndex = restIndex; diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h index 8f24d6af..f2b7070c 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug.h @@ -62,7 +62,7 @@ public: { INT, //32 bit signed int FLOAT, //32 bit signed float - CSTRING, //null terminated char[] + CSTRING, //nullptr terminated char[] BOOL //0 or 1 (could use an int, but useful for tools) }; @@ -92,7 +92,7 @@ public: static void install(RemoveFunction, OpenFunction, CloseFunction, SendFunction, IsReadyFunction); ///open a session - static void open(const char *server = NULL, uint16 port = 0); + static void open(const char *server = nullptr, uint16 port = 0); ///packs the data into a packet, and sends it using the client-defined SendFunction static void send(MESSAGE_TYPE type, const char* name = ""); diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp index da1f9878..e945d875 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp @@ -30,7 +30,7 @@ uint32 RemoteDebugServer::ms_inputTarget; // ====================================================================== RemoteDebug::Channel::Channel(const std::string& name, Channel *parent) -: m_name(NULL), +: m_name(nullptr), m_parent(parent) { m_name = new std::string(name); @@ -41,16 +41,16 @@ RemoteDebug::Channel::Channel(const std::string& name, Channel *parent) RemoteDebug::Channel::~Channel() { - m_parent = NULL; + m_parent = nullptr; if(m_name) { delete m_name; - m_name = NULL; + m_name = nullptr; } if (m_children) { delete m_children; - m_children = NULL; + m_children = nullptr; } } @@ -72,7 +72,7 @@ const std::string& RemoteDebug::Channel::name() RemoteDebug::Variable::Variable(const std::string& name, void *memLoc, VARIABLE_TYPES type) : m_memLoc(memLoc), - m_name(NULL), + m_name(nullptr), m_type(type) { m_name = new std::string(name); @@ -111,7 +111,7 @@ RemoteDebug::Variable::~Variable() if(m_name) { delete m_name; - m_name = NULL; + m_name = nullptr; } } @@ -307,7 +307,7 @@ void RemoteDebugClient::receive(const unsigned char * const message, const uint3 if (channelNumber < ms_nextVariable) return; //do not send value back to server (hence the "false") - registerVariable(ms_buffer, NULL, BOOL, false); + registerVariable(ms_buffer, nullptr, BOOL, false); if (ms_newVariableFunction) ms_newVariableFunction(channelNumber, const_cast(ms_buffer)); break; @@ -477,7 +477,7 @@ void RemoteDebugServer::receive(const unsigned char * const message, const uint3 memcpy(ms_buffer, charMessage + sizeOfMessageType + sizeOfChannelNumber + sizeOfSizeofPayload, sizeOfPayload); } - Variable* v = NULL; + Variable* v = nullptr; switch(type) { case STREAM: @@ -524,27 +524,27 @@ void RemoteDebugServer::receive(const unsigned char * const message, const uint3 break; case STATIC_UP: - if ((*ms_upFunctionMap)[ms_inputTarget] != NULL) + if ((*ms_upFunctionMap)[ms_inputTarget] != nullptr) (*ms_upFunctionMap)[ms_inputTarget](); //lint !e10, !e522 ("expecting a function" and "expected void assignment) break; case STATIC_DOWN: - if ((*ms_downFunctionMap)[ms_inputTarget] != NULL) + if ((*ms_downFunctionMap)[ms_inputTarget] != nullptr) (*ms_downFunctionMap)[ms_inputTarget](); //lint !e10, !e522 ("expecting a function" and "expected void assignment) break; case STATIC_LEFT: - if ((*ms_leftFunctionMap)[ms_inputTarget] != NULL) + if ((*ms_leftFunctionMap)[ms_inputTarget] != nullptr) (*ms_leftFunctionMap)[ms_inputTarget](); //lint !e10, !e522 ("expecting a function" and "expected void assignment) break; case STATIC_RIGHT: - if ((*ms_rightFunctionMap)[ms_inputTarget] != NULL) + if ((*ms_rightFunctionMap)[ms_inputTarget] != nullptr) (*ms_rightFunctionMap)[ms_inputTarget](); //lint !e10, !e522 ("expecting a function" and "expected void assignment) break; case STATIC_ENTER: - if ((*ms_enterFunctionMap)[ms_inputTarget] != NULL) + if ((*ms_enterFunctionMap)[ms_inputTarget] != nullptr) (*ms_enterFunctionMap)[ms_inputTarget](); //lint !e10, !e522 ("expecting a function" and "expected void assignment) break; diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h index d3dd088a..8daccef3 100755 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.h @@ -29,13 +29,13 @@ class RemoteDebug::Channel NodeList* m_children; ///the fully qualified name of the channel std::string* m_name; - ///its parent (which is NULL for top-level nodes + ///its parent (which is nullptr for top-level nodes Channel *m_parent; }; /** This class stores data about a variable channel, both on the server (where the variable actually * resides), and the client (which just displays it). The client simply creates Variable's with - * NULL'd out memLoc's, since it doesn't have direct access to the memory. + * nullptr'd out memLoc's, since it doesn't have direct access to the memory. */ class RemoteDebug::Variable { diff --git a/engine/shared/library/sharedDebug/src/shared/Report.cpp b/engine/shared/library/sharedDebug/src/shared/Report.cpp index 69de29bd..5f7f8082 100755 --- a/engine/shared/library/sharedDebug/src/shared/Report.cpp +++ b/engine/shared/library/sharedDebug/src/shared/Report.cpp @@ -175,7 +175,7 @@ void Report::puts(const char *buffer) // if (flags & RF_fatal) // title = "Fatal Report"; - // MessageBox(NULL, buffer, title, MB_OK | MB_ICONEXCLAMATION); + // MessageBox(nullptr, buffer, title, MB_OK | MB_ICONEXCLAMATION); //} } @@ -198,7 +198,7 @@ void Report::vprintf(const char *format, va_list va) { char buffer[8 * 1024]; - // make sure the buffer is always NULL terminated + // make sure the buffer is always nullptr terminated buffer[sizeof(buffer)-1] = '\0'; // format the string diff --git a/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp b/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp index be918f39..b810a0b8 100755 --- a/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp +++ b/engine/shared/library/sharedFile/src/shared/AsynchronousLoader.cpp @@ -169,9 +169,9 @@ void AsynchronousLoader::install(const char *fileName) const int numberOfExtensions = iff.getChunkLengthTotal(sizeof(int32)); ms_extensionFunctionsList.reserve(numberOfExtensions); ExtensionFunctions extensionFunctions; - extensionFunctions.extension = NULL; - extensionFunctions.fetchFunction = NULL; - extensionFunctions.releaseFunction = NULL; + extensionFunctions.extension = nullptr; + extensionFunctions.fetchFunction = nullptr; + extensionFunctions.releaseFunction = nullptr; for (int i = 0; i < numberOfExtensions; ++i) { extensionFunctions.extension = ms_fileData + iff.read_int32(); @@ -235,10 +235,10 @@ void AsynchronousLoaderNamespace::remove() { DEBUG_FATAL(!ms_installed, ("not installed")); Request *request = reinterpret_cast(ms_requestMemoryBlockManager->allocate()); - request->fileRecordList = NULL; - request->callback = NULL; - request->data = NULL; - request->cachedFiles = NULL; + request->fileRecordList = nullptr; + request->callback = nullptr; + request->data = nullptr; + request->cachedFiles = nullptr; submitRequest(request); @@ -270,7 +270,7 @@ void AsynchronousLoaderNamespace::remove() ms_cachedFilesPool.clear(); delete ms_requestMemoryBlockManager; - ms_requestMemoryBlockManager = NULL; + ms_requestMemoryBlockManager = nullptr; } // ---------------------------------------------------------------------- @@ -369,7 +369,7 @@ void AsynchronousLoader::add(const char *fileName, Callback callback, void *data request->fileRecordList = i->second; request->callback = callback; request->data = data; - request->cachedFiles = NULL; + request->cachedFiles = nullptr; submitRequest(request); } else @@ -390,8 +390,8 @@ void AsynchronousLoader::remove(Callback callback, void *data) for (Requests::iterator i = ms_pendingRequests.begin(); i != iEnd; ++i) if ((*i)->callback == callback && (*i)->data == data) { - (*i)->callback = NULL; - (*i)->data = NULL; + (*i)->callback = nullptr; + (*i)->data = nullptr; } } @@ -400,8 +400,8 @@ void AsynchronousLoader::remove(Callback callback, void *data) for (Requests::iterator i = ms_completedRequests.begin(); i != iEnd; ++i) if ((*i)->callback == callback && (*i)->data == data) { - (*i)->callback = NULL; - (*i)->data = NULL; + (*i)->callback = nullptr; + (*i)->data = nullptr; } } @@ -466,8 +466,8 @@ void AsynchronousLoaderNamespace::threadRoutine() CachedFile cachedFile; cachedFile.fileRecord = fileRecord; - cachedFile.file = NULL; - cachedFile.resource = NULL; + cachedFile.file = nullptr; + cachedFile.resource = nullptr; // check if the resource is already loaded if (!fileRecord->alreadyCached) @@ -622,7 +622,7 @@ void AsynchronousLoader::processCallbacks() else bytes += cachedFile.file->length(); TreeFile::addCachedFile(cachedFile.fileRecord->fileName, cachedFile.file); - cachedFile.file = NULL; + cachedFile.file = nullptr; } } } @@ -653,13 +653,13 @@ void AsynchronousLoader::processCallbacks() else bytes += cachedFile.file->length(); delete cachedFile.file; - cachedFile.file = NULL; + cachedFile.file = nullptr; } if (cachedFile.resource) { ms_extensionFunctionsList[cachedFile.fileRecord->extensionFunctionsIndex].releaseFunction(cachedFile.resource); - cachedFile.resource = NULL; + cachedFile.resource = nullptr; } } request->cachedFiles->clear(); @@ -667,7 +667,7 @@ void AsynchronousLoader::processCallbacks() ms_mutex.enter(); ms_cachedFilesPool.push_back(request->cachedFiles); - request->cachedFiles = NULL; + request->cachedFiles = nullptr; ms_mutex.leave(); } diff --git a/engine/shared/library/sharedFile/src/shared/FileManifest.cpp b/engine/shared/library/sharedFile/src/shared/FileManifest.cpp index ecf1becf..c5552775 100755 --- a/engine/shared/library/sharedFile/src/shared/FileManifest.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileManifest.cpp @@ -73,8 +73,8 @@ void FileManifest::install() s_accessThreshold = ConfigFile::getKeyInt("SharedFile", "fileManifestAccessThreshold", -1, s_accessThreshold); // if we are developing, and want to update the manifest, read in the tab file as well - const char * manifestFile = ConfigFile::getKeyString("SharedFile", "updateFileManifest", 0, NULL); - if (manifestFile != NULL) + const char * manifestFile = ConfigFile::getKeyString("SharedFile", "updateFileManifest", 0, nullptr); + if (manifestFile != nullptr) { s_updateManifest = true; @@ -183,8 +183,8 @@ void FileManifest::remove() #if PRODUCTION == 0 // dump out the new manifest if requested - const char * manifestFile = ConfigFile::getKeyString("SharedFile", "updateFileManifest", 0, NULL); - if (manifestFile != NULL) + const char * manifestFile = ConfigFile::getKeyString("SharedFile", "updateFileManifest", 0, nullptr); + if (manifestFile != nullptr) { StdioFile outputFile(manifestFile,"w"); DEBUG_FATAL(!outputFile.isOpen(), ("FileManifest::remove(): Could not open %s for writing.", manifestFile)); @@ -201,7 +201,7 @@ void FileManifest::remove() { if (!i->second) { - DEBUG_WARNING(true, ("FileManifest::remove(): Found a null pointer in the fileManifest map!\n")); + DEBUG_WARNING(true, ("FileManifest::remove(): Found a nullptr pointer in the fileManifest map!\n")); continue; } diff --git a/engine/shared/library/sharedFile/src/shared/FileNameUtils.cpp b/engine/shared/library/sharedFile/src/shared/FileNameUtils.cpp index 01ac3c98..58912176 100755 --- a/engine/shared/library/sharedFile/src/shared/FileNameUtils.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileNameUtils.cpp @@ -59,9 +59,9 @@ bool FileNameUtils::isReadable(std::string const &path) { FILE *fp = fopen(path.c_str(), "r"); - result = (fp != NULL); + result = (fp != nullptr); - if (fp != NULL) + if (fp != nullptr) { fclose(fp); } @@ -79,9 +79,9 @@ bool FileNameUtils::isWritable(std::string const &path) { FILE *fp = fopen(path.c_str(), "w"); - result = (fp != NULL); + result = (fp != nullptr); - if (fp != NULL) + if (fp != nullptr) { fclose(fp); } diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp index 6c47b26c..ff5eec8d 100755 --- a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp @@ -109,11 +109,11 @@ int FileStreamer::getFileSize(const char *fileName) FileStreamer::File *FileStreamer::open(const char *fileName, bool randomAccess) { DEBUG_FATAL(!ms_installed, ("not installed")); - DEBUG_FATAL(!fileName, ("file name null")); + DEBUG_FATAL(!fileName, ("file name nullptr")); OsFile *osFile = OsFile::open(fileName, randomAccess); if (!osFile) - return NULL; + return nullptr; #if PRODUCTION // Stop checking the fileName if one of these returns true @@ -150,7 +150,7 @@ void FileStreamer::File::install(bool useThread) void FileStreamer::File::remove() { delete ms_memoryBlockManager; - ms_memoryBlockManager = NULL; + ms_memoryBlockManager = nullptr; } // ---------------------------------------------------------------------- @@ -192,7 +192,7 @@ FileStreamer::File::~File() bool FileStreamer::File::isOpen() const { - return m_osFile != NULL; + return m_osFile != nullptr; } // ---------------------------------------------------------------------- @@ -249,7 +249,7 @@ void FileStreamer::File::close() if (isOpen()) { delete m_osFile; - m_osFile = NULL; + m_osFile = nullptr; } } diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamerFile.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamerFile.cpp index d6a798d5..e579ab9e 100755 --- a/engine/shared/library/sharedFile/src/shared/FileStreamerFile.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamerFile.cpp @@ -93,7 +93,7 @@ FileStreamerFile::~FileStreamerFile() bool FileStreamerFile::isOpen() const { - return m_file != NULL; + return m_file != nullptr; } // ---------------------------------------------------------------------- @@ -174,7 +174,7 @@ void FileStreamerFile::close() { if (m_owner) delete m_file; - m_file = NULL; + m_file = nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamerThread.cpp index 1d3c0b8c..a0789e5b 100755 --- a/engine/shared/library/sharedFile/src/shared/FileStreamerThread.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamerThread.cpp @@ -294,34 +294,34 @@ void FileStreamerThread::threadRoutine() //get the request to service ms_queueCriticalSection.enter(); - request = NULL; + request = nullptr; //if there is an AudioVideo request, service it first (interrupting any current data request) if (ms_firstAudioVideoRequest) { request = ms_firstAudioVideoRequest; ms_firstAudioVideoRequest = ms_firstAudioVideoRequest->next; - if (ms_firstAudioVideoRequest == NULL) - ms_lastAudioVideoRequest = NULL; - request->next = NULL; + if (ms_firstAudioVideoRequest == nullptr) + ms_lastAudioVideoRequest = nullptr; + request->next = nullptr; } else if (ms_firstDataRequest) { request = ms_firstDataRequest; ms_firstDataRequest = ms_firstDataRequest->next; - if (ms_firstDataRequest == NULL) - ms_lastDataRequest = NULL; - request->next = NULL; + if (ms_firstDataRequest == nullptr) + ms_lastDataRequest = nullptr; + request->next = nullptr; } else if (ms_firstLowRequest) { request = ms_firstLowRequest; ms_firstLowRequest = ms_firstLowRequest->next; - if (ms_firstLowRequest == NULL) - ms_lastLowRequest = NULL; - request->next = NULL; + if (ms_firstLowRequest == nullptr) + ms_lastLowRequest = nullptr; + request->next = nullptr; } else { @@ -369,7 +369,7 @@ void FileStreamerThread::Request::install() void FileStreamerThread::Request::remove() { delete ms_memoryBlockManager; - ms_memoryBlockManager = NULL; + ms_memoryBlockManager = nullptr; } // ---------------------------------------------------------------------- @@ -395,15 +395,15 @@ void FileStreamerThread::Request::operator delete(void *pointer) // ---------------------------------------------------------------------- FileStreamerThread::Request::Request() -: next(NULL), +: next(nullptr), type(Request::Unknown), - osFile(NULL), + osFile(nullptr), buffer(0), bytesToBeRead(0), bytesRead(0), - gate(NULL), + gate(nullptr), priority(AbstractFile::PriorityData), - returnValue(NULL) + returnValue(nullptr) { } @@ -412,10 +412,10 @@ FileStreamerThread::Request::Request() FileStreamerThread::Request::~Request() { #ifdef _DEBUG - next = NULL; - buffer = NULL; - gate = NULL; - returnValue = NULL; + next = nullptr; + buffer = nullptr; + gate = nullptr; + returnValue = nullptr; #endif } diff --git a/engine/shared/library/sharedFile/src/shared/Iff.cpp b/engine/shared/library/sharedFile/src/shared/Iff.cpp index 212ef576..48eaeed1 100755 --- a/engine/shared/library/sharedFile/src/shared/Iff.cpp +++ b/engine/shared/library/sharedFile/src/shared/Iff.cpp @@ -146,11 +146,11 @@ bool Iff::isValid(char const * fileName) int const fileLength = file->length(); byte *data = file->readEntireFileAndClose(); delete file; - file = NULL; + file = nullptr; bool const result = IffNamespace::isValid(data, fileLength); delete [] data; - data = NULL; + data = nullptr; return result; } @@ -167,12 +167,12 @@ bool Iff::isValid(char const * fileName) // Iff::open() Iff::Iff(void) -: fileName(NULL), +: fileName(nullptr), maxStackDepth(DEFAULT_STACK_DEPTH), stackDepth(0), stack(new Stack[DEFAULT_STACK_DEPTH]), length(0), - data(NULL), + data(nullptr), inChunk(false), growable(false), nonlinear(false), @@ -207,7 +207,7 @@ Iff::Iff(void) */ Iff::Iff(int newDataSize, const byte *newData, bool iffOwnsData) : - fileName(NULL), + fileName(nullptr), maxStackDepth(DEFAULT_STACK_DEPTH), stackDepth(0), stack(new Stack[DEFAULT_STACK_DEPTH]), @@ -242,12 +242,12 @@ Iff::Iff(int newDataSize, const byte *newData, bool iffOwnsData) : */ Iff::Iff(const char *newFileName, bool optional) -: fileName(NULL), +: fileName(nullptr), maxStackDepth(DEFAULT_STACK_DEPTH), stackDepth(0), stack(new Stack[DEFAULT_STACK_DEPTH]), length(0), - data(NULL), + data(nullptr), inChunk(false), growable(false), nonlinear(false), @@ -270,7 +270,7 @@ Iff::Iff(const char *newFileName, bool optional) */ Iff::Iff(int initialSize, bool isGrowable, bool clearDataBuffer) -: fileName(NULL), +: fileName(nullptr), maxStackDepth(DEFAULT_STACK_DEPTH), stackDepth(0), stack(new Stack[DEFAULT_STACK_DEPTH]), @@ -384,7 +384,7 @@ void Iff::open(AbstractFile & file, char const * const newFileName) DEBUG_FATAL(data, ("causing memory leak")); data = file.readEntireFileAndClose(); - FATAL(ConfigSharedFile::getValidateIff() && !IffNamespace::isValid(data, length), ("File corruption detected! Iff::isValid failed for %s (size=%d, crc=%08X). Please try a \"Full Scan\" from the LaunchPad.", newFileName ? newFileName : "null", length, Crc::calculate(data, length))); + FATAL(ConfigSharedFile::getValidateIff() && !IffNamespace::isValid(data, length), ("File corruption detected! Iff::isValid failed for %s (size=%d, crc=%08X). Please try a \"Full Scan\" from the LaunchPad.", newFileName ? newFileName : "nullptr", length, Crc::calculate(data, length))); // setup the stack data to know about the data stack[0].start = 0; @@ -406,11 +406,11 @@ void Iff::open(AbstractFile & file, char const * const newFileName) void Iff::close(void) { delete [] fileName; - fileName = NULL; + fileName = nullptr; if (ownsData) delete [] data; - data = NULL; //lint !e672 // possible memory leak in assignment to Iff::data // no, we only delete when we own it + data = nullptr; //lint !e672 // possible memory leak in assignment to Iff::data // no, we only delete when we own it stackDepth = 0; } @@ -886,7 +886,7 @@ void Iff::insertChunkFloatQuaternion(const Quaternion &quaternion) * Insert a string into the current chunk at the current location. * * This routine will call insertChunkData(const void *, int length) - * with the string using its string length (plus one for the null + * with the string using its string length (plus one for the nullptr * terminator). */ @@ -1555,10 +1555,10 @@ void Iff::read_string(char *string, int maxLength) *string = *source; } - // step over the null terminator on the input + // step over the nullptr terminator on the input ++s.used; - // null terminate the output string + // nullptr terminate the output string DEBUG_FATAL(maxLength <= 0, ("destination string too short")); *string = '\0'; } @@ -1594,7 +1594,7 @@ char *Iff::read_string(void) for ( ; sourceLength < maxLength && source[sourceLength]; ++sourceLength) ; - // verify that we found the null terminator + // verify that we found the nullptr terminator DEBUG_FATAL(sourceLength >= maxLength, ("hit end of chunk before string terminator")); // create and copy the string @@ -1634,10 +1634,10 @@ void Iff::read_string(std::string &string) for ( ; sourceLength < maxLength && source[sourceLength]; ++sourceLength) ; - // verify that we found the null terminator + // verify that we found the nullptr terminator DEBUG_FATAL(sourceLength >= maxLength, ("hit end of chunk before string terminator")); - // account for the null terminator + // account for the nullptr terminator ++sourceLength; s.used += sourceLength; diff --git a/engine/shared/library/sharedFile/src/shared/Iff.h b/engine/shared/library/sharedFile/src/shared/Iff.h index 71e07c44..1fe0660a 100755 --- a/engine/shared/library/sharedFile/src/shared/Iff.h +++ b/engine/shared/library/sharedFile/src/shared/Iff.h @@ -250,7 +250,7 @@ public: Unicode::String read_unicodeString(); #if 0 - real *read_float (int count, real *array=NULL); + real *read_float (int count, real *array=nullptr); #endif }; @@ -294,7 +294,7 @@ inline int Iff::getRawDataSize(void) const * to store raw iff data via a mechanism other than Iff::write(). * * @return A read-only pointer to the data buffer containing the raw Iff data - * managed by this Iff object. It may be NULL if no data is currently + * managed by this Iff object. It may be nullptr if no data is currently * managed by the Iff. * @see Iff::getRawDataSize(), Iff::write() */ diff --git a/engine/shared/library/sharedFile/src/shared/IndentedFileWriter.cpp b/engine/shared/library/sharedFile/src/shared/IndentedFileWriter.cpp index 2c5eb7f2..013c7204 100755 --- a/engine/shared/library/sharedFile/src/shared/IndentedFileWriter.cpp +++ b/engine/shared/library/sharedFile/src/shared/IndentedFileWriter.cpp @@ -23,7 +23,7 @@ IndentedFileWriter *IndentedFileWriter::createWriter(char const *filename) { // Kill the new writer since we weren't able to open the file for writing. delete newWriter; - return NULL; + return nullptr; } } @@ -36,7 +36,7 @@ IndentedFileWriter::~IndentedFileWriter() if (m_file) { fclose(m_file); - m_file = NULL; + m_file = nullptr; } } @@ -63,8 +63,8 @@ void IndentedFileWriter::unindent() void IndentedFileWriter::writeLine(char const *line) const { - FATAL(!m_file, ("writeLine(): m_file is NULL, programmer error.")); - FATAL(!line, ("writeLine(): line argument is NULL.")); + FATAL(!m_file, ("writeLine(): m_file is nullptr, programmer error.")); + FATAL(!line, ("writeLine(): line argument is nullptr.")); //-- Write one tab for each indentation level. for (int i = 0; i < m_indentCount; ++i) @@ -92,7 +92,7 @@ void IndentedFileWriter::writeLineFormat(char const *format, ...) const int const formatCount = vsnprintf(buffer, sizeof(buffer), format, varArgList); UNREF(formatCount); - //-- Ensure it's null terminated. + //-- Ensure it's nullptr terminated. buffer[sizeof(buffer) - 1] = '\0'; //-- Do the real print. @@ -108,7 +108,7 @@ void IndentedFileWriter::writeLineFormat(char const *format, ...) const IndentedFileWriter::IndentedFileWriter() : m_indentCount(0), - m_file(NULL) + m_file(nullptr) { } @@ -123,7 +123,7 @@ bool IndentedFileWriter::createFile(char const *filename) } m_file = fopen(filename, "w"); - return (m_file != NULL); + return (m_file != nullptr); } // ====================================================================== diff --git a/engine/shared/library/sharedFile/src/shared/MemoryFile.cpp b/engine/shared/library/sharedFile/src/shared/MemoryFile.cpp index 4c023f8c..d09b3c99 100755 --- a/engine/shared/library/sharedFile/src/shared/MemoryFile.cpp +++ b/engine/shared/library/sharedFile/src/shared/MemoryFile.cpp @@ -70,7 +70,7 @@ MemoryFile::MemoryFile(byte *buffer, int length) MemoryFile::MemoryFile(AbstractFile *file) : AbstractFile(PriorityData), - m_buffer(NULL), + m_buffer(nullptr), m_length(file->length()), m_offset(0) { @@ -88,7 +88,7 @@ MemoryFile::~MemoryFile() bool MemoryFile::isOpen() const { - return m_buffer != NULL; + return m_buffer != nullptr; } // ---------------------------------------------------------------------- @@ -162,7 +162,7 @@ int MemoryFile::write(int, const void *) void MemoryFile::close() { delete [] m_buffer; - m_buffer = NULL; + m_buffer = nullptr; } // ---------------------------------------------------------------------- @@ -170,7 +170,7 @@ void MemoryFile::close() byte *MemoryFile::readEntireFileAndClose() { byte *result = m_buffer; - m_buffer = NULL; + m_buffer = nullptr; return result; } diff --git a/engine/shared/library/sharedFile/src/shared/TreeFile.cpp b/engine/shared/library/sharedFile/src/shared/TreeFile.cpp index 09acf384..6c53bff5 100755 --- a/engine/shared/library/sharedFile/src/shared/TreeFile.cpp +++ b/engine/shared/library/sharedFile/src/shared/TreeFile.cpp @@ -123,7 +123,7 @@ void TreeFile::install(uint32 skuBits) sprintf(buffer, "searchPath%s%d", skuText, priority); char const * result; - for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, NULL)) != NULL; ++index) + for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, nullptr)) != nullptr; ++index) TreeFile::addSearchPath(result, priority); } @@ -133,7 +133,7 @@ void TreeFile::install(uint32 skuBits) sprintf(buffer, "searchTree%s%d", skuText, priority); char const * result; - for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, NULL)) != NULL; ++index) + for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, nullptr)) != nullptr; ++index) TreeFile::addSearchTree(result, priority); } @@ -143,7 +143,7 @@ void TreeFile::install(uint32 skuBits) sprintf(buffer, "searchTOC%s%d", skuText, priority); char const * result; - for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, NULL)) != NULL; ++index) + for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", buffer, index, nullptr)) != nullptr; ++index) TreeFile::addSearchTOC(result, priority); } } @@ -430,7 +430,7 @@ void TreeFile::removeAllSearches(void) * Find the node (if any) the requested file is in. * * @return Pointer to the highest priority node containing the file. If the - * file is not found, NULL is returned. If checking for filename collisions is + * file is not found, nullptr is returned. If checking for filename collisions is * set on, then this function DEBUG_FATALS if multiple files match */ @@ -440,14 +440,14 @@ TreeFile::SearchNode *TreeFile::find(const char *fileName) if (!fileName) { - DEBUG_WARNING(true, ("TreeFile::find() Cannot find a null filename")); - return NULL; + DEBUG_WARNING(true, ("TreeFile::find() Cannot find a nullptr filename")); + return nullptr; } if (fileName[0] == '\0') { DEBUG_WARNING(true, ("TreeFile::find() Cannot find an empty filename")); - return NULL; + return nullptr; } // search the list of nodes looking to see if the specified file exists @@ -457,7 +457,7 @@ TreeFile::SearchNode *TreeFile::find(const char *fileName) if ((*i)->exists(fileName, deleted)) return *i; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -479,7 +479,7 @@ bool TreeFile::exists(const char *fileName) FileManifest::addNewManifestEntry(fixedFileName, 0); #endif - return (find(fixedFileName) != NULL); + return (find(fixedFileName) != nullptr); } // ---------------------------------------------------------------------- @@ -621,7 +621,7 @@ void TreeFile::fixUpFileName(const char *fileName, char *outName) * Find the node (if any) the requested file is in. * * @return Pointer to the highest priority node containing the file. If the - * file is not found, NULL is returned. + * file is not found, nullptr is returned. */ bool TreeFile::getPathName(const char *fileName, char *pathName, int pathNameLength) @@ -655,12 +655,12 @@ bool TreeFile::getPathName(const char *fileName, char *pathName, int pathNameLen * * @param fileName File name to open * @param allowFail True to return false on failure, otherwise Fatal - * @return pointer to a newly allocated AbstractFile-derived class (caller must delete), NULL if failure. + * @return pointer to a newly allocated AbstractFile-derived class (caller must delete), nullptr if failure. */ AbstractFile* TreeFile::open(const char *fileName, AbstractFile::PriorityType priority, bool allowFail) { - AbstractFile *file = NULL; + AbstractFile *file = nullptr; char fixedFileName[Os::MAX_PATH_LENGTH]; fixUpFileName(fixedFileName, fileName, true); @@ -678,7 +678,7 @@ AbstractFile* TreeFile::open(const char *fileName, AbstractFile::PriorityType pr if (cachedIterator != cachedFilesMap.end()) { file = cachedIterator->second; - cachedIterator->second = NULL; + cachedIterator->second = nullptr; } ms_criticalSection.leave(); @@ -747,7 +747,7 @@ AbstractFile* TreeFile::open(const char *fileName, AbstractFile::PriorityType pr FileManifest::addNewManifestEntry(fixedFileName, 0); #endif - return NULL; + return nullptr; } const int length = file->length(); @@ -787,7 +787,7 @@ const char *TreeFile::getSearchPath(int index) for (SearchNodes::iterator i = ms_searchNodes.begin(); i != iEnd; ++i) { const SearchPath *searchPath = dynamic_cast(*i); - if (searchPath != NULL) + if (searchPath != nullptr) { if (count == index) return searchPath->getPathName(); @@ -795,14 +795,14 @@ const char *TreeFile::getSearchPath(int index) } } - return NULL; + return nullptr; } //----------------------------------------------------------------- /** * This function will return the shortest trailing path of its input that * can be loaded by the TreeFile. If no files can be loaded, this routine - * will return NULL. + * will return nullptr. */ const char *TreeFile::getShortestExistingPath(const char *path) @@ -810,9 +810,9 @@ const char *TreeFile::getShortestExistingPath(const char *path) NOT_NULL(path); if (!*path) - return NULL; + return nullptr; - const char *result = NULL; + const char *result = nullptr; do { // check if this one exists @@ -866,7 +866,7 @@ bool TreeFile::stripTreeFileSearchPathFromFile(const char *inputPath, char *outp { // make sure it's a relative search path const SearchPath *searchPath = dynamic_cast(*i); - if (searchPath != NULL) + if (searchPath != nullptr) { // check to see if the the search path is a prefix for the requested path const char *path = searchPath->getPathName(); diff --git a/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp b/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp index 9c63e47d..11c7d2e3 100755 --- a/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp +++ b/engine/shared/library/sharedFile/src/shared/TreeFile_SearchNode.cpp @@ -53,7 +53,7 @@ TreeFile::SearchNode::~SearchNode(void) TreeFile::SearchPath::SearchPath(int priority, const char *path) : SearchNode(priority), - m_pathName(NULL), + m_pathName(nullptr), m_pathNameLength(0) { NOT_NULL(path); @@ -145,7 +145,7 @@ AbstractFile *TreeFile::SearchPath::open(const char *fileName, AbstractFile::Pri makeAbsolutePath(fileName, buffer); FileStreamer::File *file = FileStreamer::open(buffer); if (!file) - return NULL; + return nullptr; return new FileStreamerFile(priority, *file); } @@ -209,7 +209,7 @@ AbstractFile *TreeFile::SearchAbsolute::open(const char *fileName, AbstractFile: FileStreamer::File *file = FileStreamer::open(fileName); if (!file) - return NULL; + return nullptr; return new FileStreamerFile(priority, *file); } @@ -248,12 +248,12 @@ bool TreeFile::SearchTree::validate(const char *fileName) TreeFile::SearchTree::SearchTree(int priority, const char *fileName) : SearchNode(priority), - m_treeFileName(NULL), - m_treeFile(NULL), + m_treeFileName(nullptr), + m_treeFile(nullptr), m_version(0), m_numberOfFiles(0), - m_fileNames(NULL), - m_tableOfContents(NULL) + m_fileNames(nullptr), + m_tableOfContents(nullptr) { NOT_NULL(fileName); @@ -435,7 +435,7 @@ void TreeFile::SearchTree::debugPrint(void) bool TreeFile::SearchTree::exists(const char *fileName, bool &deleted) const { NOT_NULL(fileName); - return localExists(fileName, NULL, deleted); + return localExists(fileName, nullptr, deleted); } // ---------------------------------------------------------------------- @@ -497,7 +497,7 @@ AbstractFile *TreeFile::SearchTree::open(const char *fileName, AbstractFile::Pri return new ZlibFile(entry.length, compressedBuffer, entry.compressedLength, true); } - return NULL; + return nullptr; } // ====================================================================== @@ -535,14 +535,14 @@ bool TreeFile::SearchTOC::validate(const char *fileName) TreeFile::SearchTOC::SearchTOC(int priority, const char *fileName) : SearchNode(priority), - m_TOCFileName(NULL), - m_TOCFile(NULL), - m_treeFiles(NULL), + m_TOCFileName(nullptr), + m_TOCFile(nullptr), + m_treeFiles(nullptr), m_numberOfFiles(0), - m_treeFileNames(NULL), - m_treeFileNamePointers(NULL), - m_tableOfContents(NULL), - m_fileNames(NULL) + m_treeFileNames(nullptr), + m_treeFileNamePointers(nullptr), + m_tableOfContents(nullptr), + m_fileNames(nullptr) { NOT_NULL(fileName); @@ -587,7 +587,7 @@ TreeFile::SearchTOC::SearchTOC(int priority, const char *fileName) // add on all paths in config file const char * result; - for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", "TOCTreePath", index, NULL)) != NULL; ++index) + for (int index = 0; (result = ConfigFile::getKeyString("SharedFile", "TOCTreePath", index, nullptr)) != nullptr; ++index) treePaths.push_back(result); // read in the tree file names and open the files @@ -598,7 +598,7 @@ TreeFile::SearchTOC::SearchTOC(int priority, const char *fileName) for (int treeFileNameIndex = 0, treeFileNameReadPosition = 0; treeFileNameIndex < static_cast(header.numberOfTreeFiles); treeFileNameIndex++) { m_treeFileNamePointers[treeFileNameIndex] = (m_treeFileNames + treeFileNameReadPosition); - m_treeFiles[treeFileNameIndex] = NULL; + m_treeFiles[treeFileNameIndex] = nullptr; // try to open the tree file in each of the relative paths for (std::vector::const_iterator pathIter = treePaths.begin(); pathIter != treePaths.end(); ++pathIter) @@ -656,7 +656,7 @@ TreeFile::SearchTOC::SearchTOC(int priority, const char *fileName) { currentFileNameLength = m_tableOfContents[i].fileNameOffset; m_tableOfContents[i].fileNameOffset = currentFileNameOffset; - // + 1 for the null termination + // + 1 for the nullptr termination currentFileNameOffset += (currentFileNameLength + 1); } } @@ -792,7 +792,7 @@ bool TreeFile::SearchTOC::exists(const char *fileName, bool &deleted) const { NOT_NULL(fileName); deleted = false; - return localExists(fileName, NULL); + return localExists(fileName, nullptr); } // ---------------------------------------------------------------------- @@ -862,7 +862,7 @@ AbstractFile *TreeFile::SearchTOC::open(const char *fileName, AbstractFile::Prio return new ZlibFile(entry.length, compressedBuffer, entry.compressedLength, true); } - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedFile/src/shared/ZlibFile.cpp b/engine/shared/library/sharedFile/src/shared/ZlibFile.cpp index 7c3778c7..9a498a87 100755 --- a/engine/shared/library/sharedFile/src/shared/ZlibFile.cpp +++ b/engine/shared/library/sharedFile/src/shared/ZlibFile.cpp @@ -66,7 +66,7 @@ ZlibFile::ZlibFile(int uncompressedLength, byte *compressedBuffer, int compresse m_compressedBuffer(compressedBuffer), m_compressedBufferLength(compressedBufferLength), m_ownsCompressedBuffer(ownsCompressedBuffer), - m_decompressedMemoryFile(NULL) + m_decompressedMemoryFile(nullptr) { } @@ -137,10 +137,10 @@ void ZlibFile::close() { if (m_ownsCompressedBuffer) delete [] m_compressedBuffer; - m_compressedBuffer = NULL; + m_compressedBuffer = nullptr; delete m_decompressedMemoryFile; - m_decompressedMemoryFile = NULL; + m_decompressedMemoryFile = nullptr; } // ---------------------------------------------------------------------- @@ -197,7 +197,7 @@ void ZlibFile::getZlibCompressedDataAndClose(byte *& compressedBuffer, int & com if (m_ownsCompressedBuffer) { compressedBuffer = m_compressedBuffer; - m_compressedBuffer = NULL; + m_compressedBuffer = nullptr; compressedBufferLength = m_compressedBufferLength; } else diff --git a/engine/shared/library/sharedFoundation/src/linux/Os.cpp b/engine/shared/library/sharedFoundation/src/linux/Os.cpp index 2ddccf74..b1e26987 100755 --- a/engine/shared/library/sharedFoundation/src/linux/Os.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/Os.cpp @@ -97,7 +97,7 @@ void Os::installCommon(void) mainThreadId = pthread_self(); // get the name of the executable -//Can't find UNIX call for this: DWORD result = GetModuleFileName(NULL, programName, sizeof(programName)); +//Can't find UNIX call for this: DWORD result = GetModuleFileName(nullptr, programName, sizeof(programName)); strcpy(programName, "TempName"); DWORD result = 1; @@ -119,7 +119,7 @@ void Os::installCommon(void) char buffer[512]; while (!feof(f)) { - if (fgets(buffer, 512, f) != NULL) { + if (fgets(buffer, 512, f) != nullptr) { if (strncmp(buffer, "processor\t: ", 12)==0) { processorCount = atoi(buffer+12)+1; @@ -165,13 +165,13 @@ void Os::abort(void) if (!isMainThread()) { threadDied = true; - pthread_exit(NULL); + pthread_exit(nullptr); } if (!shouldReturnFromAbort) { // let the C runtime deal with the abnormal termination - int * dummy = NULL; + int * dummy = nullptr; int forceCrash = *dummy; UNREF(forceCrash); for (;;) @@ -256,14 +256,14 @@ bool Os::writeFile(const char *fileName, const void *data, int length) // Le DWORD written; // open the file for writing - handle = CreateFile(fileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + handle = CreateFile(fileName, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); // check if it was opened if (handle == INVALID_HANDLE_VALUE) return false; // attempt to write the data - result = WriteFile(handle, data, static_cast(length), &written, NULL); + result = WriteFile(handle, data, static_cast(length), &written, nullptr); // make sure the data was written okay if (!result || written != static_cast(length)) diff --git a/engine/shared/library/sharedFoundation/src/linux/PerThreadData.cpp b/engine/shared/library/sharedFoundation/src/linux/PerThreadData.cpp index 3d7f8584..18bee813 100755 --- a/engine/shared/library/sharedFoundation/src/linux/PerThreadData.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/PerThreadData.cpp @@ -81,7 +81,7 @@ PerThreadData::Data *PerThreadData::getData(bool allowReturnNull) if (!slotCreated) { DEBUG_FATAL(true && !allowReturnNull, ("not installed")); - return NULL; + return nullptr; } Data * const data = reinterpret_cast(pthread_getspecific(slot)); @@ -97,7 +97,7 @@ PerThreadData::Data *PerThreadData::getData(bool allowReturnNull) * * If the client is calling this function on a thread that existed before the engine was * installed, the client should set isNewThread to false. Setting isNewThread to false - * prevents the function from validating that the thread's TLS is NULL. For threads existing + * prevents the function from validating that the thread's TLS is nullptr. For threads existing * before the engine is installed, the TLS data for the thread is undefined. * * @param isNewThread [IN] true if the thread was created after the engine was installed, false otherwise @@ -147,10 +147,10 @@ void PerThreadData::threadRemove(void) //close the event used for file streaming reads delete data->readGate; - data->readGate = NULL; + data->readGate = nullptr; // wipe the data in the thread slot - const BOOL result2 = pthread_setspecific(slot, NULL); + const BOOL result2 = pthread_setspecific(slot, nullptr); UNREF(result2); DEBUG_FATAL(result2, ("TlsSetValue failed")); //NB: unlike Windows, returns 0 on success. diff --git a/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h b/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h index df4fd5f6..86adef53 100755 --- a/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h +++ b/engine/shared/library/sharedFoundation/src/linux/PerThreadData.h @@ -93,7 +93,7 @@ public: * threads existing at the time of slot creation. Thus, if you build a * plugin that only initializes the engine the first time it is * used, and other threads already exist in the app, those threads - * will contain bogus non-null data in the TLS slot. If the plugin really + * will contain bogus non-nullptr data in the TLS slot. If the plugin really * wants to do lazy initialization of the engine, it will need * to handle calling PerThreadData::threadInstall() for all existing threads * (except the thread that initialized the engine, which already @@ -102,7 +102,7 @@ public: inline bool PerThreadData::isThreadInstalled(void) { - return (getData(true) != NULL); + return (getData(true) != nullptr); } // ---------------------------------------------------------------------- @@ -168,7 +168,7 @@ inline void PerThreadData::setExitChainFataling(bool newValue) * Get the first entry for the exit chain. * * This routine is not intended for general use; it should only be used by the ExitChain class. - * This routine may return NULL. + * This routine may return nullptr. * * @return Pointer to the first entry on the exit chain * @see ExitChain::isFataling() @@ -184,7 +184,7 @@ inline ExitChain::Entry *PerThreadData::getExitChainFirstEntry(void) * Set the exit chain fataling flag value. * * This routine is not intended for general use; it should only be used by the ExitChain class. - * The parameter to this routine may be NULL. + * The parameter to this routine may be nullptr. * * @param newValue New value for the exit chain first entry */ diff --git a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp index 21668a79..822a4ee5 100755 --- a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp @@ -33,7 +33,7 @@ char* _itoa(int value, char* stringOut, int radix) bool QueryPerformanceCounter(__int64* time) { struct timeval tv; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); *time = static_cast(tv.tv_sec); *time = (*time * 1000000) + static_cast(tv.tv_usec); @@ -107,7 +107,7 @@ FILE* CreateFile(const char* fileName, DWORD access, DWORD shareMode, void* unsu FILE* retval = 0; DEBUG_FATAL(flagsAndAttributes != FILE_ATTRIBUTE_NORMAL, ("Unsupported File mode call to CreateFile()")); - DEBUG_FATAL(unsupB != NULL, ("Unsupported File mode call to CreateFile()")); + DEBUG_FATAL(unsupB != nullptr, ("Unsupported File mode call to CreateFile()")); //DEBUG_FATAL(shareMode != 0, ("Unsupported File mode call to CreateFile()")); DEBUG_FATAL(unsupA != 0, ("Unsupported File mode call to CreateFile()")); @@ -118,7 +118,7 @@ FILE* CreateFile(const char* fileName, DWORD access, DWORD shareMode, void* unsu if (retval) { fclose(retval); - retval = NULL; + retval = nullptr; } else { diff --git a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.h b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.h index 5e92921c..0cab423f 100755 --- a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.h +++ b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.h @@ -46,7 +46,7 @@ void OutputDebugString(const char* stringOut); typedef FILE* HANDLE; -#define INVALID_HANDLE_VALUE NULL //Have to use a #define because this may be a FILE* +#define INVALID_HANDLE_VALUE nullptr //Have to use a #define because this may be a FILE* const int GENERIC_READ = 1 << 0; @@ -66,8 +66,8 @@ const int FILE_END = SEEK_END; const int FILE_SHARE_READ = 1; -BOOL WriteFile(FILE* hFile, const void* lpBuffer, DWORD numBytesToWrite, DWORD* numBytesWritten, void* unsup=NULL); -BOOL ReadFile(FILE* hFile, void* lpBuffer, DWORD numBytesToWrite, DWORD* numBytesRead, void* unsup=NULL); +BOOL WriteFile(FILE* hFile, const void* lpBuffer, DWORD numBytesToWrite, DWORD* numBytesWritten, void* unsup=nullptr); +BOOL ReadFile(FILE* hFile, void* lpBuffer, DWORD numBytesToWrite, DWORD* numBytesRead, void* unsup=nullptr); DWORD SetFilePointer(FILE* hFile, long lDistanceToMove, long* lpDistanceToMoveHigh, DWORD dwMoveMethod); FILE* CreateFile(const char* fileName, DWORD access, DWORD shareMode, void* unsupA, DWORD creationDisposition, DWORD flagsAndAttributes, FILE* unsup2); BOOL CloseHandle(FILE* hFile); diff --git a/engine/shared/library/sharedFoundation/src/linux/SetupSharedFoundation.cpp b/engine/shared/library/sharedFoundation/src/linux/SetupSharedFoundation.cpp index 07dec783..e54017fc 100755 --- a/engine/shared/library/sharedFoundation/src/linux/SetupSharedFoundation.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/SetupSharedFoundation.cpp @@ -150,11 +150,11 @@ SetupSharedFoundation::Data::Data(Defaults defaults) case D_game: runInBackground = true; - lpCmdLine = NULL; + lpCmdLine = nullptr; argc = 0; - argv = NULL; + argv = nullptr; - configFile = NULL; + configFile = nullptr; frameRateLimit = CONST_REAL(0); break; @@ -162,11 +162,11 @@ SetupSharedFoundation::Data::Data(Defaults defaults) case D_console: runInBackground = true; - lpCmdLine = NULL; + lpCmdLine = nullptr; argc = 0; - argv = NULL; + argv = nullptr; - configFile = NULL; + configFile = nullptr; frameRateLimit = CONST_REAL(0); break; diff --git a/engine/shared/library/sharedFoundation/src/linux/vsnprintf.cpp b/engine/shared/library/sharedFoundation/src/linux/vsnprintf.cpp index 6b4c5647..069dcb48 100755 --- a/engine/shared/library/sharedFoundation/src/linux/vsnprintf.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/vsnprintf.cpp @@ -21,7 +21,7 @@ // // Remarks: // -// If the buffer would overflow, the null terminating character is not written and -1 +// If the buffer would overflow, the nullptr terminating character is not written and -1 // will be returned. #ifdef _MSC_VER diff --git a/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp b/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp index f094d140..502b31a7 100755 --- a/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp @@ -35,7 +35,7 @@ m_numInUseBits(0) { if (numBits > (m_numAllocatedBytes << 3)) { - m_arrayData = NULL; + m_arrayData = nullptr; m_numAllocatedBytes = 0; reserve(numBits); m_numInUseBytes = 0; @@ -294,7 +294,7 @@ void BitArray::reserve(int const numBits) { signed char * tmp = new signed char[static_cast(m_numInUseBytes)]; memset(&(tmp[oldNumInUseBytes]), 0, static_cast(m_numInUseBytes - oldNumInUseBytes)); - if ((oldNumInUseBytes > 0) && (m_arrayData != NULL)) + if ((oldNumInUseBytes > 0) && (m_arrayData != nullptr)) memcpy(tmp, m_arrayData, static_cast(oldNumInUseBytes)); //lint !e671 !e670 logically, you can't enter this code block unless oldNumInUseBytes is smaller. m_numAllocatedBytes = m_numInUseBytes; diff --git a/engine/shared/library/sharedFoundation/src/shared/BitArray.h b/engine/shared/library/sharedFoundation/src/shared/BitArray.h index 70b04b41..082fa6b4 100755 --- a/engine/shared/library/sharedFoundation/src/shared/BitArray.h +++ b/engine/shared/library/sharedFoundation/src/shared/BitArray.h @@ -58,7 +58,7 @@ public: // for DB persistence purpose, returns the BitArray as a // std::string where each 4 bits are printed as a hex nibble; - // and the converse that takes the null-terminated string + // and the converse that takes the nullptr-terminated string // and converts it back into the BitArray void getAsDbTextString(std::string &result, int maxNibbleCount = 32767) const; void setFromDbTextString(const char * text); diff --git a/engine/shared/library/sharedFoundation/src/shared/CalendarTime.cpp b/engine/shared/library/sharedFoundation/src/shared/CalendarTime.cpp index 64595534..c73395af 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CalendarTime.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CalendarTime.cpp @@ -17,11 +17,11 @@ std::string CalendarTime::convertEpochToTimeStringGMT(time_t epoch) std::string result; struct tm * timeinfo = ::gmtime(&epoch); - if (timeinfo == NULL) + if (timeinfo == nullptr) return result; char * asciiTime = ::asctime(timeinfo); - if (asciiTime == NULL) + if (asciiTime == nullptr) return result; static char resultBuffer[512]; @@ -48,7 +48,7 @@ std::string CalendarTime::convertEpochToTimeStringGMT_YYYYMMDDHHMMSS(time_t epoc std::string result; struct tm * timeinfo = ::gmtime(&epoch); - if (timeinfo == NULL) + if (timeinfo == nullptr) return result; static char resultBuffer[512]; @@ -64,11 +64,11 @@ std::string CalendarTime::convertEpochToTimeStringLocal(time_t epoch) std::string result; struct tm * timeinfo = ::localtime(&epoch); - if (timeinfo == NULL) + if (timeinfo == nullptr) return result; char * asciiTime = ::asctime(timeinfo); - if (asciiTime == NULL) + if (asciiTime == nullptr) return result; static char resultBuffer[512]; @@ -105,7 +105,7 @@ std::string CalendarTime::convertEpochToTimeStringLocal_YYYYMMDDHHMMSS(time_t ep std::string result; struct tm * timeinfo = ::localtime(&epoch); - if (timeinfo == NULL) + if (timeinfo == nullptr) return result; static char resultBuffer[512]; @@ -218,7 +218,7 @@ time_t CalendarTime::getNextGMTTimeOcurrence(time_t const startTime, int const d // the year, month, day, day of week, hour, minute, second // in GMT time struct tm * timeinfo = ::gmtime(&startTime); - if (timeinfo == NULL) + if (timeinfo == nullptr) return -1; // get number of days until the specified day of week to search for @@ -333,7 +333,7 @@ time_t CalendarTime::getNextGMTTimeOcurrence(time_t const startTime, int const m // the year, month, day, day of week, hour, minute, second // in GMT time struct tm * timeinfo = ::gmtime(&startTime); - if (timeinfo == NULL) + if (timeinfo == nullptr) return -1; // calculate the Epoch GMT time for the specified start time @@ -358,7 +358,7 @@ time_t CalendarTime::getNextGMTTimeOcurrence(time_t const startTime, int const m startTimeAtSpecifiedHourMinuteSecond += (60 * 60 * 24); timeinfo = ::gmtime(&startTimeAtSpecifiedHourMinuteSecond); - if (timeinfo == NULL) + if (timeinfo == nullptr) return -1; if (++sentinel > maxIterations) diff --git a/engine/shared/library/sharedFoundation/src/shared/CommandLine.cpp b/engine/shared/library/sharedFoundation/src/shared/CommandLine.cpp index 1198c252..5209d788 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CommandLine.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CommandLine.cpp @@ -63,7 +63,7 @@ bool CommandLine::Option::isOptionNext( int optionSpecCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionSpecCount) return false; else @@ -77,8 +77,8 @@ CommandLine::Option *CommandLine::Option::createOption( int *optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionCount, ("null optionCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionCount, ("nullptr optionCount arg")); DEBUG_FATAL(!isOptionNext(*optionSpec, *optionCount), ("attempted to create option with non-option data")); const char newShortName = (*optionSpec)->char1; @@ -129,7 +129,7 @@ CommandLine::MatchCode CommandLine::Option::match(void) // matching this short or long name. If the arg specs don't match, we've // got an argument matching error. - DEBUG_FATAL(!optionTable, ("internal error: null option table")); + DEBUG_FATAL(!optionTable, ("internal error: nullptr option table")); OptionTable::Record *record = 0; @@ -145,7 +145,7 @@ CommandLine::MatchCode CommandLine::Option::match(void) DEBUG_FATAL(!record, ("failed to find option info record for option --%s", longName)); } else - DEBUG_FATAL(true, ("corrupted option? both short and long name are null")); + DEBUG_FATAL(true, ("corrupted option? both short and long name are nullptr")); // attempt to match against this option against commandline-specified options @@ -200,7 +200,7 @@ bool CommandLine::Collection::isCollectionNext( int optionSpecCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionSpecCount) return false; else @@ -214,8 +214,8 @@ CommandLine::Collection *CommandLine::Collection::createCollection( int *optionSpecCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionSpecCount, ("null optionSpecCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionSpecCount, ("nullptr optionSpecCount arg")); DEBUG_FATAL(!isCollectionNext(*optionSpec, *optionSpecCount), ("tried to create collection from non-collection optionSpec")); if ((*optionSpec)->optionType == OST_BeginList) @@ -289,7 +289,7 @@ bool CommandLine::List::Node::isNode( int optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionCount) return false; else @@ -303,8 +303,8 @@ CommandLine::List::Node *CommandLine::List::Node::createNode( int *optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionCount, ("null optionCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionCount, ("nullptr optionCount arg")); DEBUG_FATAL(!isNode(*optionSpec, *optionCount), ("attempted to create list node with non-list-node data")); Option *newOption = 0; @@ -350,7 +350,7 @@ CommandLine::List::List( listType(newListType), minimumNodeCount(0) { - DEBUG_FATAL(!newFirstNode, ("null newFirstNode arg")); + DEBUG_FATAL(!newFirstNode, ("nullptr newFirstNode arg")); DEBUG_FATAL(newListType != OPLT_Normal, ("constructor only good for OPLT_Normal lists, caller passed %d", newListType)); } @@ -366,7 +366,7 @@ CommandLine::List::List( listType(newListType), minimumNodeCount(newMinimumNodeCount) { - DEBUG_FATAL(!newFirstNode, ("null newFirstNode arg")); + DEBUG_FATAL(!newFirstNode, ("nullptr newFirstNode arg")); DEBUG_FATAL(newListType != OPLT_MinimumMatch, ("constructor only good for OPLT_MinimumMatch lists, caller passed %d", newListType)); } @@ -391,7 +391,7 @@ bool CommandLine::List::isListNext( int optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionCount) return false; else @@ -405,8 +405,8 @@ CommandLine::List *CommandLine::List::createList( int *optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionCount, ("null optionCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionCount, ("nullptr optionCount arg")); DEBUG_FATAL(!isListNext(*optionSpec, *optionCount), ("tried to create list from non-list optionSpec")); Node *newFirstNode = 0; @@ -582,7 +582,7 @@ bool CommandLine::Switch::Node::isNode( const OptionSpec *optionSpec, int optionCount) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionCount) return false; else @@ -596,8 +596,8 @@ CommandLine::Switch::Node *CommandLine::Switch::Node::createNode( int *optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionCount, ("null optionCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionCount, ("nullptr optionCount arg")); DEBUG_FATAL(!isNode(*optionSpec, *optionCount), ("attempted to create list node with non-list-node data")); Option *newOption = 0; @@ -664,7 +664,7 @@ bool CommandLine::Switch::isSwitchNext( int optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); if (!optionCount) return false; else @@ -678,8 +678,8 @@ CommandLine::Switch *CommandLine::Switch::createSwitch( int *optionCount ) { - DEBUG_FATAL(!optionSpec, ("null optionSpec arg")); - DEBUG_FATAL(!optionCount, ("null optionCount arg")); + DEBUG_FATAL(!optionSpec, ("nullptr optionSpec arg")); + DEBUG_FATAL(!optionCount, ("nullptr optionCount arg")); DEBUG_FATAL(!isSwitchNext(*optionSpec, *optionCount), ("tried to create switch from non-switch option spec")); const bool newOneNodeIsRequired = ((*optionSpec)->int1 != 0); @@ -886,7 +886,7 @@ CommandLine::OptionTable::Record *CommandLine::OptionTable::findOptionRecord( char shortName ) const { - DEBUG_FATAL(!shortName, ("null shortName arg")); + DEBUG_FATAL(!shortName, ("nullptr shortName arg")); // walk the list for (Record *record = firstRecord; record; record = record->getNext()) @@ -960,7 +960,7 @@ CommandLine::Lexer::Lexer( ) : nextCharacter(newBuffer) { - DEBUG_FATAL(!newBuffer, ("null newBuffer arg")); + DEBUG_FATAL(!newBuffer, ("nullptr newBuffer arg")); } // ---------------------------------------------------------------------- @@ -994,10 +994,10 @@ CommandLine::Lexer::~Lexer(void) bool CommandLine::Lexer::gobbleString(bool isRequired, char *stringBuffer, int stringSize) { - DEBUG_FATAL(!stringBuffer, ("null stringStart arg")); + DEBUG_FATAL(!stringBuffer, ("nullptr stringStart arg")); DEBUG_FATAL(!stringSize, ("stringSize is zero")); - DEBUG_FATAL(!nextCharacter, ("null nextChar")); + DEBUG_FATAL(!nextCharacter, ("nullptr nextChar")); int stringLength = 0; @@ -1069,7 +1069,7 @@ bool CommandLine::Lexer::gobbleString(bool isRequired, char *stringBuffer, int s if (isRequired && (stringLength == 0)) return false; - // null-terminate the string + // nullptr-terminate the string *stringBuffer = 0; return true; } @@ -1078,8 +1078,8 @@ bool CommandLine::Lexer::gobbleString(bool isRequired, char *stringBuffer, int s bool CommandLine::Lexer::getNextToken(Token *token) { - DEBUG_FATAL(!token, ("null token arg")); - DEBUG_FATAL(!nextCharacter, ("null nextCharacter")); + DEBUG_FATAL(!token, ("nullptr token arg")); + DEBUG_FATAL(!nextCharacter, ("nullptr nextCharacter")); // clear out the token memset(token, 0, sizeof(*token)); @@ -1204,7 +1204,7 @@ void CommandLine::remove(void) void CommandLine::buildOptionTree(const OptionSpec *specList, int specCount) { - DEBUG_FATAL(!specList, ("null specList arg")); + DEBUG_FATAL(!specList, ("nullptr specList arg")); if (!specCount) { @@ -1247,7 +1247,7 @@ CommandLine::MatchCode CommandLine::parseCommandLineBuffer(void) case Lexer::TT_ShortOption: // we've found a short option, make sure specified short option exists { - DEBUG_FATAL(!optionTable, ("internal error: null optionTable")); + DEBUG_FATAL(!optionTable, ("internal error: nullptr optionTable")); OptionTable::Record *record = optionTable->findOptionRecord(token.getShortName()); if (!record) { @@ -1279,7 +1279,7 @@ CommandLine::MatchCode CommandLine::parseCommandLineBuffer(void) case Lexer::TT_LongOption: // we've found a long option, make sure specified long option exists { - DEBUG_FATAL(!optionTable, ("internal error: null optionTable")); + DEBUG_FATAL(!optionTable, ("internal error: nullptr optionTable")); OptionTable::Record *record = optionTable->findOptionRecord(token.getLongName()); if (!record) { @@ -1322,7 +1322,7 @@ CommandLine::MatchCode CommandLine::parseCommandLineBuffer(void) case Lexer::TT_Argument: { - DEBUG_FATAL(!optionTable, ("internal error: null optionTable")); + DEBUG_FATAL(!optionTable, ("internal error: nullptr optionTable")); OptionTable::Record *record = optionTable->findOptionRecord(OP_SNAME_UNTAGGED); if (!record) { @@ -1382,7 +1382,7 @@ CommandLine::MatchCode CommandLine::parseCommandLineBuffer(void) void CommandLine::absorbString(const char *newString) { DEBUG_FATAL(!installed, ("CommandLine not installed")); - DEBUG_FATAL(!newString, ("null newString arg")); + DEBUG_FATAL(!newString, ("nullptr newString arg")); const int stringLength = static_cast(strlen(newString)); int requiredBufferSpace; @@ -1398,7 +1398,7 @@ void CommandLine::absorbString(const char *newString) buffer[bufferSize++] = ' '; } - // copy contents of buffer, including null + // copy contents of buffer, including nullptr memcpy(buffer + bufferSize, newString, stringLength + 1); bufferSize += stringLength; @@ -1437,7 +1437,7 @@ void CommandLine::absorbString(const char *newString) void CommandLine::absorbStrings(const char **stringArray, int stringCount) { DEBUG_FATAL(!installed, ("CommandLine not installed")); - DEBUG_FATAL(!stringArray, ("null string array")); + DEBUG_FATAL(!stringArray, ("nullptr string array")); for (int i = 0; i < stringCount; ++i) absorbString(stringArray[i]); @@ -1452,7 +1452,7 @@ void CommandLine::absorbStrings(const char **stringArray, int stringCount) * (i.e. "-- ") will be considered part of the post command line string. * * @return A read-only pointer to the portion of the command line not meant - * for CommandLine parsing. May be NULL if the entire command line + * for CommandLine parsing. May be nullptr if the entire command line * was meant for CommandLine or if no command line was specified. */ @@ -1704,7 +1704,7 @@ int CommandLine::getOccurrenceCount(const char *longName) * @param shortName [IN] short name of the option * @param occurrenceIndex [IN] zero-based occurrence number * @return The read-only argument string associated with the specified option occurrence. - * May be NULL if no argument was associated with the specified option. + * May be nullptr if no argument was associated with the specified option. */ const char *CommandLine::getOptionString(char shortName, int occurrenceIndex) @@ -1730,7 +1730,7 @@ const char *CommandLine::getOptionString(char shortName, int occurrenceIndex) * @param longName [IN] long name of the option * @param occurrenceIndex [IN] zero-based occurrence number * @return The read-only argument string associated with the specified option occurrence. - * May be NULL if no argument was associated with the specified option. + * May be nullptr if no argument was associated with the specified option. */ const char *CommandLine::getOptionString(const char *longName, int occurrenceIndex) diff --git a/engine/shared/library/sharedFoundation/src/shared/CommandLine.h b/engine/shared/library/sharedFoundation/src/shared/CommandLine.h index 358b2e40..d4eab6a0 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CommandLine.h +++ b/engine/shared/library/sharedFoundation/src/shared/CommandLine.h @@ -755,7 +755,7 @@ inline const char *CommandLine::Lexer::getNextCharacter(void) inline void CommandLine::Lexer::gobbleWhitespace(void) { - DEBUG_FATAL(!nextCharacter, ("null nextCharacter")); + DEBUG_FATAL(!nextCharacter, ("nullptr nextCharacter")); while (isspace(*nextCharacter)) ++nextCharacter; } diff --git a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.cpp b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.cpp index 341f83e3..07c04692 100755 --- a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.cpp @@ -30,7 +30,7 @@ static char tagBuffer[6]; #define CONFIG_FILE_TEMPLATE_CREATE_INT(section, key, def) DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%d\n", section, key, def)) #define CONFIG_FILE_TEMPLATE_CREATE_BOOL(section, key, def) DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%s\n", section, key, def ? "true" : "false")) #define CONFIG_FILE_TEMPLATE_CREATE_FLOAT(section, key, def) DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%3.1f\n", section, key, def)) -#define CONFIG_FILE_TEMPLATE_CREATE_STRING(section, key, def) DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%s\n", section, key, def ? def : "NULL")) +#define CONFIG_FILE_TEMPLATE_CREATE_STRING(section, key, def) DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%s\n", section, key, def ? def : "nullptr")) #define CONFIG_FILE_TEMPLATE_CREATE_TAG(section, key, def) ConvertTagToString(def, tagBuffer), DEBUG_REPORT_LOG(true, ("cfg: [%s] %s=%d\n", section, key, tagBuffer)) #else @@ -43,8 +43,8 @@ static char tagBuffer[6]; #endif -#define NO_SPACE_SECTION(a) DEBUG_FATAL(strchr(a, ' ') != NULL, ("No spaces are allowed in config file section names: %s", a)) -#define NO_SPACE_KEY(a) DEBUG_FATAL(strchr(a, ' ') != NULL, ("No spaces are allowed in config file key names: %s", a)) +#define NO_SPACE_SECTION(a) DEBUG_FATAL(strchr(a, ' ') != nullptr, ("No spaces are allowed in config file section names: %s", a)) +#define NO_SPACE_KEY(a) DEBUG_FATAL(strchr(a, ' ') != nullptr, ("No spaces are allowed in config file key names: %s", a)) // ====================================================================== @@ -81,7 +81,7 @@ void ConfigFile::install(void) #endif ms_sections = new ConfigFile::SectionMap; - ms_currentSection = NULL; + ms_currentSection = nullptr; ExitChain::add(ConfigFile::remove, "ConfigFile::remove"); ms_installed = true; } @@ -110,7 +110,7 @@ void ConfigFile::remove(void) for (std::map::iterator it = ms_sections->begin(); it != ms_sections->end(); ++it) delete it->second; delete ms_sections; - ms_sections = NULL; + ms_sections = nullptr; ms_installed = false; } @@ -142,7 +142,7 @@ bool ConfigFile::loadFromCommandLine(const char *buffer) while (isspace(*buffer)) { ++buffer; - // advancing buffer, check for null (trailing white space on command line) + // advancing buffer, check for nullptr (trailing white space on command line) if(! *buffer) break; } @@ -196,7 +196,7 @@ bool ConfigFile::loadFromCommandLine(const char *buffer) //allocate a new section and set it as the current one Section *newSection = createSection(sectionName); //note that newSection is memory owned by the created Section object - //while sectionName is memory allocated to create a null terminated string + //while sectionName is memory allocated to create a nullptr terminated string ms_currentSection = newSection; } delete[] sectionName; @@ -292,7 +292,7 @@ bool ConfigFile::loadFromBuffer(char const * const buffer, int const length) processLine(currentLine); delete[] currentLine; bufferPosition += lineLength+1; - //trim ending whitespace. Remember that this string is not guaranteed to be NULL terminated. + //trim ending whitespace. Remember that this string is not guaranteed to be nullptr terminated. while (*bufferPosition && (bufferPosition < buffer + length) && isspace(static_cast(*bufferPosition))) ++bufferPosition; } @@ -311,26 +311,26 @@ bool ConfigFile::loadFile(const char *file) { DEBUG_FATAL(!ms_installed, ("ConfigFile not installed")); NOT_NULL(file); - ms_currentSection = NULL; - HANDLE handle = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ms_currentSection = nullptr; + HANDLE handle = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (handle != INVALID_HANDLE_VALUE) { // get the length of the config file - const DWORD length = GetFileSize(handle, NULL); + const DWORD length = GetFileSize(handle, nullptr); if (length != 0xffffffff) { // create a buffer to load the config file into char * const buffer = new char[length+2]; - // make sure the buffer is null terminated + // make sure the buffer is nullptr terminated buffer[length] = '\n'; buffer[length+1] = '\0'; // read the config file in DWORD readResult; - const BOOL result = ReadFile(handle, buffer, length, &readResult, NULL); + const BOOL result = ReadFile(handle, buffer, length, &readResult, nullptr); // make sure we read all the correct stuff if (result && readResult == length) @@ -360,7 +360,7 @@ void ConfigFile::processLine(const char *line) { DEBUG_FATAL(!ms_installed, ("ConfigFile not installed")); // validate argument - DEBUG_FATAL(!line, ("ConfigFile::processLine NULL")); + DEBUG_FATAL(!line, ("ConfigFile::processLine nullptr")); // check for a full line comment if (*line == '#' || *line == ';') @@ -418,7 +418,7 @@ void ConfigFile::processLine(const char *line) //allocate a new section and set it as the current one Section *newSection = createSection(sectionName); //note that newSection is memory owned by the created Section object - //while sectionName is memory allocated to create a null terminated string + //while sectionName is memory allocated to create a nullptr terminated string ms_currentSection = newSection; } delete[] sectionName; @@ -468,7 +468,7 @@ void ConfigFile::processKeys(const char *line) while (*endValue) { //build the value - char *value = NULL; + char *value = nullptr; while(isspace(*beginValue)) ++beginValue; if (*beginValue != '"') @@ -542,7 +542,7 @@ void ConfigFile::processKeys(const char *line) /** Get a Section pointer from a string * * @param section the name of the section - * @return the pointer if valid, otherwise NULL + * @return the pointer if valid, otherwise nullptr */ ConfigFile::Section *ConfigFile::getSection(const char *section) { @@ -550,7 +550,7 @@ ConfigFile::Section *ConfigFile::getSection(const char *section) if (it != ms_sections->end()) return it->second; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -581,7 +581,7 @@ void ConfigFile::removeSection(const char *name) if (iter != ms_sections->end()) { delete iter->second; - iter->second = NULL; + iter->second = nullptr; ms_sections->erase(iter); } } @@ -991,7 +991,7 @@ Tag ConfigFile::getKeyTag(const char *section, const char *key, Tag defaultValue ConfigFile::Element::Element(void) : - m_entry(NULL) + m_entry(nullptr) {} // ---------------------------------------------------------------------- @@ -1105,8 +1105,8 @@ Tag ConfigFile::Element::getAsTag(void) const ConfigFile::Key::Key(const char *name, const char *value, bool lazyAdd) : - m_elements(NULL), - m_name(NULL), + m_elements(nullptr), + m_name(nullptr), m_lazyAdd(lazyAdd) { m_name = new char[strlen(name)+1]; @@ -1248,8 +1248,8 @@ void ConfigFile::Key::dump(const char *keyName) const ConfigFile::Section::Section(const char *name) : - m_keys(NULL), - m_name(NULL) + m_keys(nullptr), + m_name(nullptr) { m_name = new char[strlen(name)+1]; strcpy(m_name, name); @@ -1284,7 +1284,7 @@ ConfigFile::Key *ConfigFile::Section::findKey(const char *key) const if (it != m_keys->end()) return it->second; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h index a4c034ed..09a78599 100755 --- a/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h +++ b/engine/shared/library/sharedFoundation/src/shared/ConfigFile.h @@ -99,7 +99,7 @@ public: int getKeyInt (const char *key, int index, int defaultValue = 0) const; bool getKeyBool (const char *key, int index, bool defaultValue = false) const; float getKeyFloat (const char *key, int index, float defaultValue = 0.f) const; - const char *getKeyString(const char *key, int index, const char *defaultValue = NULL) const; + const char *getKeyString(const char *key, int index, const char *defaultValue = nullptr) const; Tag getKeyTag (const char *key, int index, Tag defaultValue = 0) const; int getKeyCount(const char *key) const; void addKey(const char *keyName, const char *value, bool lazyAdd = false); diff --git a/engine/shared/library/sharedFoundation/src/shared/CrashReportInformation.cpp b/engine/shared/library/sharedFoundation/src/shared/CrashReportInformation.cpp index 920f1ffa..983fd7ff 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrashReportInformation.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CrashReportInformation.cpp @@ -87,7 +87,7 @@ char const * CrashReportInformation::getEntry(int index) if (index < static_cast(ms_dynamicText.size())) return ms_dynamicText[index]; - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedFoundation/src/shared/Crc.cpp b/engine/shared/library/sharedFoundation/src/shared/Crc.cpp index 4fddb3b8..28ef3514 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Crc.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/Crc.cpp @@ -99,7 +99,7 @@ uint32 Crc::calculateWithToLower(const char *string) uint32 Crc::calculate(const void *data, int length, uint32 initCrc) { - DEBUG_FATAL(!data, ("null data arg")); + DEBUG_FATAL(!data, ("nullptr data arg")); uint32 crc; const byte *d = reinterpret_cast(data); diff --git a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp index 206f0dea..9e8ca2b6 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp @@ -31,9 +31,9 @@ using namespace CrcStringTableNamespace; CrcStringTable::CrcStringTable() : m_numberOfEntries(0), - m_crcTable(NULL), - m_stringsOffsetTable(NULL), - m_strings(NULL) + m_crcTable(nullptr), + m_stringsOffsetTable(nullptr), + m_strings(nullptr) { } @@ -42,9 +42,9 @@ CrcStringTable::CrcStringTable() CrcStringTable::CrcStringTable(char const * fileName) : m_numberOfEntries(0), - m_crcTable(NULL), - m_stringsOffsetTable(NULL), - m_strings(NULL) + m_crcTable(nullptr), + m_stringsOffsetTable(nullptr), + m_strings(nullptr) { load(fileName); } @@ -69,7 +69,7 @@ void CrcStringTable::load(char const * fileName) if(fileName) DEBUG_WARNING(true, ("Could not load CrcStringTable %s", fileName)); else - DEBUG_WARNING(true, ("Could not load CrcStringTable, NULL file given")); + DEBUG_WARNING(true, ("Could not load CrcStringTable, nullptr file given")); return; } diff --git a/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h b/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h index c5574f7f..a86629e5 100755 --- a/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h +++ b/engine/shared/library/sharedFoundation/src/shared/DataResourceList.h @@ -82,7 +82,7 @@ private: template inline void DataResourceList::install() { - if (ms_bindings == NULL) + if (ms_bindings == nullptr) { ms_bindings = new CreateDataResourceMap(); ms_loaded = new LoadedDataResourceMap(); @@ -100,7 +100,7 @@ inline void DataResourceList::install() template inline void DataResourceList::remove(void) { - if (ms_loaded != NULL) + if (ms_loaded != nullptr) { #ifdef _DEBUG if (!ms_loaded->empty()) @@ -122,13 +122,13 @@ inline void DataResourceList::remove(void) #endif // _DEBUG delete ms_loaded; - ms_loaded = NULL; + ms_loaded = nullptr; } - if (ms_bindings != NULL) + if (ms_bindings != nullptr) { delete ms_bindings; - ms_bindings = NULL; + ms_bindings = nullptr; } } // DataResourceList::remove @@ -144,7 +144,7 @@ template inline void DataResourceList::registerTemplate(Tag id, CreateDataResourceFunc createFunc) { - if (ms_bindings == NULL) + if (ms_bindings == nullptr) install(); #ifdef _DEBUG @@ -237,7 +237,7 @@ inline T * DataResourceList::fetch(Tag id) typename CreateDataResourceMap::iterator iter = ms_bindings->find(id); if (iter == ms_bindings->end()) - return NULL; + return nullptr; return (*(*iter).second)(""); } // DataResourceList::fetch(Tag) @@ -268,11 +268,11 @@ inline const T * DataResourceList::fetch(Iff &source) char buffer[5]; ConvertTagToString(id, buffer); DEBUG_WARNING(true, ("DataResourceList::fetch Iff: trying to fetch resource for unknown tag %s!", buffer)); - return NULL; + return nullptr; } T *newDataResource = (*(*createIter).second)(source.getFileName()); - if (newDataResource != NULL) + if (newDataResource != nullptr) { // initialize the data resource newDataResource->loadFromIff(source); @@ -310,11 +310,11 @@ inline const T * DataResourceList::fetch(const CrcString &filename) // load the template Iff iff; if (!iff.open(filename.getString(), true)) - return NULL; + return nullptr; // put the template in the loaded list const T * const newDataResource = fetch(iff); - if (newDataResource != NULL) + if (newDataResource != nullptr) { newDataResource->addReference(); ms_loaded->insert(std::make_pair(&newDataResource->getCrcName (), newDataResource)); @@ -337,13 +337,13 @@ inline void DataResourceList::release(const T & dataResource) { NOT_NULL(ms_loaded); - if (ms_loaded != NULL && dataResource.getReferenceCount() == 0) + if (ms_loaded != nullptr && dataResource.getReferenceCount() == 0) { typename LoadedDataResourceMap::iterator iter = ms_loaded->find(&dataResource.getCrcName()); if (iter != ms_loaded->end()) { const T * const temp = (*iter).second; - (*iter).second = NULL; + (*iter).second = nullptr; ms_loaded->erase(iter); delete temp; } @@ -369,11 +369,11 @@ inline T * DataResourceList::reload(Iff &source) if (iter == ms_loaded->end()) { DEBUG_WARNING(true, ("DataResourceList::reload: trying to reload unloaded resource %s!", source.getFileName())); - return NULL; + return nullptr; } T * const dataResource = const_cast((*iter).second); - if (dataResource != NULL) + if (dataResource != nullptr) { // initialize the data resource dataResource->loadFromIff(source); diff --git a/engine/shared/library/sharedFoundation/src/shared/ExitChain.cpp b/engine/shared/library/sharedFoundation/src/shared/ExitChain.cpp index 3b1fb1bf..af70c5a0 100755 --- a/engine/shared/library/sharedFoundation/src/shared/ExitChain.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/ExitChain.cpp @@ -115,7 +115,7 @@ void ExitChain::add(Function function, const char *debugName, int priority, bool #endif // linked list traversal with a back pointer - for (back = NULL, front = PerThreadData::getExitChainFirstEntry(); front && front->priority > priority; back = front, front = front->next) + for (back = nullptr, front = PerThreadData::getExitChainFirstEntry(); front && front->priority > priority; back = front, front = front->next) ; // hook it into the linked list @@ -133,7 +133,7 @@ void ExitChain::add(Function function, const char *debugName, int priority, bool * The ExitChain will automatically remove a function from the ExitChain when it calls the function, so an * exit function should not attempt to remove itself from the ExitChain. * - * Calling this routine with a NULL pointer will cause this routine to call Fatal in debug compilations. + * Calling this routine with a nullptr pointer will cause this routine to call Fatal in debug compilations. * * Calling this routine with a function that is not on the ExitChain will cause this routine to call * Fatal in debug compilations. @@ -145,14 +145,14 @@ void ExitChain::remove(Function function) { Entry *back, *front; - if (function == NULL) + if (function == nullptr) { - DEBUG_FATAL(true, ("ExitChain::remove NULL function")); + DEBUG_FATAL(true, ("ExitChain::remove nullptr function")); return; //lint !e527 // Warning -- Unreachable } // linked list traversal with a back pointer - for (back = NULL, front = PerThreadData::getExitChainFirstEntry(); front && front->function != function; back = front, front = front->next) + for (back = nullptr, front = PerThreadData::getExitChainFirstEntry(); front && front->function != function; back = front, front = front->next) ; // make sure it was found @@ -191,7 +191,7 @@ void ExitChain::run(void) PerThreadData::setExitChainRunning(true); - while ((entry = PerThreadData::getExitChainFirstEntry()) != NULL) + while ((entry = PerThreadData::getExitChainFirstEntry()) != nullptr) { // remove the first entry off the ExitChain PerThreadData::setExitChainFirstEntry(entry->next); diff --git a/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp b/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp index 5d2c7327..37a3884f 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/Fatal.cpp @@ -33,7 +33,7 @@ namespace FatalNamespace int ms_numberOfWarnings = 0; bool ms_strict = false; - WarningCallback s_warningCallback = NULL; + WarningCallback s_warningCallback = nullptr; #if PRODUCTION == 0 PixCounter::ResetInteger ms_numberOfWarningsThisFrame; @@ -70,7 +70,7 @@ static void formatMessage(char *buffer, int bufferLength, int stackDepth, const else DebugHelp::getCallStack(callStack, callStackOffset + stackDepth); - // make sure the buffer is always null terminated + // make sure the buffer is always nullptr terminated buffer[--bufferLength] = '\0'; // look up the caller's file and line @@ -191,7 +191,7 @@ static void InternalWarning(const char *format, int extraFlags, va_list va, int char buffer[4 * 1024]; - if (NULL != s_warningCallback) + if (nullptr != s_warningCallback) { strcpy(buffer, "WARNING: "); vsnprintf(buffer + 9, sizeof(buffer) - 9, format, va); diff --git a/engine/shared/library/sharedFoundation/src/shared/Fatal.h b/engine/shared/library/sharedFoundation/src/shared/Fatal.h index f33eb5ac..14215b90 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Fatal.h +++ b/engine/shared/library/sharedFoundation/src/shared/Fatal.h @@ -68,15 +68,15 @@ void SetWarningCallback(WarningCallback); template inline T *NonNull(T *pointer, const char *name) { - WARNING(!pointer, ("%s pointer is null", name)); + WARNING(!pointer, ("%s pointer is nullptr", name)); return pointer; } #define NON_NULL(a) NonNull(a, #a) - #define NOT_NULL(a) FATAL(!a, ("%s pointer is null", #a)) + #define NOT_NULL(a) FATAL(!a, ("%s pointer is nullptr", #a)) - // FATAL if the specified pointer is not NULL (i.e. assert that the pointer is null, the opposite of NOT_NULL). - #define IS_NULL(a) FATAL(a, ("%s pointer is not null, unexpected.", #a)) + // FATAL if the specified pointer is not nullptr (i.e. assert that the pointer is nullptr, the opposite of NOT_NULL). + #define IS_NULL(a) FATAL(a, ("%s pointer is not nullptr, unexpected.", #a)) #else diff --git a/engine/shared/library/sharedFoundation/src/shared/FormattedString.h b/engine/shared/library/sharedFoundation/src/shared/FormattedString.h index b4e1f6de..d778be27 100755 --- a/engine/shared/library/sharedFoundation/src/shared/FormattedString.h +++ b/engine/shared/library/sharedFoundation/src/shared/FormattedString.h @@ -42,7 +42,7 @@ inline FormattedString::FormattedString() template inline char const * FormattedString::sprintf(char const * const format, ...) { - char const * result = NULL; + char const * result = nullptr; va_list va; va_start(va, format); @@ -64,7 +64,7 @@ inline char const * FormattedString::vsprintf(char const * const for int const charactersWritten = vsnprintf(m_text, lastIndex, format, va); // vsnprintf returns the number of characters written, not including - // the terminating null character, or a negative value if an output error occurs. + // the terminating nullptr character, or a negative value if an output error occurs. // If the number of characters to write exceeds count, then count characters are // written and -1 is returned. diff --git a/engine/shared/library/sharedFoundation/src/shared/LabelHash.cpp b/engine/shared/library/sharedFoundation/src/shared/LabelHash.cpp index 26848b94..2f28a3ca 100755 --- a/engine/shared/library/sharedFoundation/src/shared/LabelHash.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/LabelHash.cpp @@ -109,7 +109,7 @@ const char * LabelHash::findLabel( char const * const domain, uint32 hashValue ) { // Domain not found - return NULL; + return nullptr; } // ---------- @@ -127,6 +127,6 @@ const char * LabelHash::findLabel( char const * const domain, uint32 hashValue ) // ---------- // String not found - return NULL; + return nullptr; } diff --git a/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp b/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp index c5c86efd..c8067046 100755 --- a/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/MemoryBlockManager.cpp @@ -138,8 +138,8 @@ using namespace MemoryBlockManagerNamespace; MemoryBlockManager::Allocator::Allocator(const int elementSize) : m_referenceCount(0), - m_firstBlock(NULL), - m_firstFreeElement(NULL), + m_firstBlock(nullptr), + m_firstFreeElement(nullptr), m_elementSize(elementSize), m_elementsPerBlock(64), m_currentNumberOfBlocks(0), @@ -157,8 +157,8 @@ MemoryBlockManager::Allocator::Allocator(const int elementSize) MemoryBlockManager::Allocator::Allocator(int elementSize, int elementsPerBlock, int minimumBlocks, int maximumNumberOfBlocks) : m_referenceCount(0), - m_firstBlock(NULL), - m_firstFreeElement(NULL), + m_firstBlock(nullptr), + m_firstFreeElement(nullptr), m_elementSize(elementSize), m_elementsPerBlock(elementsPerBlock), m_currentNumberOfBlocks(0), @@ -188,8 +188,8 @@ MemoryBlockManager::Allocator::~Allocator() delete block; } - m_firstBlock = NULL; - m_firstFreeElement = NULL; + m_firstBlock = nullptr; + m_firstFreeElement = nullptr; } // ---------------------------------------------------------------------- @@ -427,7 +427,7 @@ MemoryBlockManager::MemoryBlockManager(char const * name, bool shared, int eleme : m_name(name), m_shared(shared), m_currentNumberOfElements(0), - m_allocator(NULL) + m_allocator(nullptr) { //-- Handle config option where we force all MemoryBlockManagers to be non-shared. if (shared && ms_forceAllNonShared) @@ -598,7 +598,7 @@ void *MemoryBlockManager::allocate(bool returnNullOnFailure) { ms_globalCriticalSection.leave(); DEBUG_FATAL(!returnNullOnFailure, ("MBM %s is full %d", m_name, m_currentNumberOfElements)); - return NULL; + return nullptr; } ++m_currentNumberOfElements; diff --git a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp index 5af0285d..4b77315c 100755 --- a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp @@ -105,7 +105,7 @@ void MessageQueue::clearDataFromMessageList(MessageList &messageList, bool destr { DEBUG_WARNING(!destructor, ("clearing message data from beginFrame")); delete message.m_data; - message.m_data = NULL; + message.m_data = nullptr; } } } @@ -199,7 +199,7 @@ void MessageQueue::clearMessage(const int index) VALIDATE_RANGE_INCLUSIVE_EXCLUSIVE(0, index, getNumberOfMessages()); Message& message = (*m_messageQueueRead)[static_cast(index)]; - DEBUG_WARNING(message.m_data, ("MessageQueue::clearMessage - clearing message with non-null data")); + DEBUG_WARNING(message.m_data, ("MessageQueue::clearMessage - clearing message with non-nullptr data")); message.m_message = 0; } diff --git a/engine/shared/library/sharedFoundation/src/shared/Misc.h b/engine/shared/library/sharedFoundation/src/shared/Misc.h index 326d3341..1c29b6ed 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Misc.h +++ b/engine/shared/library/sharedFoundation/src/shared/Misc.h @@ -135,7 +135,7 @@ templateinline void Zero(T &t) * the source string into the new memory, and then returns a pointer to * the new memory. * - * This routine will return NULL if called with NULL. + * This routine will return nullptr if called with nullptr. * * @param source The string to copy * @return A pointer to a copy of the source argument @@ -144,7 +144,7 @@ templateinline void Zero(T &t) inline char *DuplicateString(const char *source) { if (!source) - return NULL; + return nullptr; const uint length = strlen(source)+1; char *result = NON_NULL (new char[length]); @@ -160,7 +160,7 @@ inline char *DuplicateString(const char *source) * the source string into the new memory, and then returns a pointer to * the new memory. * - * This routine will return NULL if called with NULL. + * This routine will return nullptr if called with nullptr. * * @param source The string to copy * @return A pointer to a copy of the source argument @@ -169,7 +169,7 @@ inline char *DuplicateString(const char *source) inline char *DuplicateStringWithToLower(const char *source) { if (!source) - return NULL; + return nullptr; const uint length = strlen(source)+1; char *result = NON_NULL (new char[length]); @@ -193,7 +193,7 @@ inline char *DuplicateStringWithToLower(const char *source) inline void imemset(void *data, int value, int length) { - DEBUG_FATAL(!data, ("null data arg")); + DEBUG_FATAL(!data, ("nullptr data arg")); memset(data, value, static_cast(length)); } @@ -210,8 +210,8 @@ inline void imemset(void *data, int value, int length) inline void imemcpy(void *destination, const void *source, int length) { - DEBUG_FATAL(!destination, ("null destination arg")); - DEBUG_FATAL(!source, ("null source arg")); + DEBUG_FATAL(!destination, ("nullptr destination arg")); + DEBUG_FATAL(!source, ("nullptr source arg")); memcpy(destination, source, static_cast(length)); } @@ -228,8 +228,8 @@ inline void imemcpy(void *destination, const void *source, int length) inline void *memmove(void *destination, const void *source, int length) { - DEBUG_FATAL(!destination, ("null destination arg")); - DEBUG_FATAL(!source, ("null source arg")); + DEBUG_FATAL(!destination, ("nullptr destination arg")); + DEBUG_FATAL(!source, ("nullptr source arg")); return memmove(destination, source, static_cast(length)); } @@ -243,7 +243,7 @@ inline void *memmove(void *destination, const void *source, int length) inline int istrlen(const char *string) { - DEBUG_FATAL(!string, ("null string arg")); + DEBUG_FATAL(!string, ("nullptr string arg")); return static_cast(strlen(string)); } diff --git a/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.cpp b/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.cpp index 7de5a7d3..dae8108f 100755 --- a/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/PersistentCrcString.cpp @@ -50,23 +50,23 @@ void PersistentCrcString::install() void PersistentCrcStringNamespace::remove() { delete ms_memoryBlockManager8; - ms_memoryBlockManager8 = NULL; + ms_memoryBlockManager8 = nullptr; delete ms_memoryBlockManager16; - ms_memoryBlockManager16 = NULL; + ms_memoryBlockManager16 = nullptr; delete ms_memoryBlockManager32; - ms_memoryBlockManager32 = NULL; + ms_memoryBlockManager32 = nullptr; delete ms_memoryBlockManager48; - ms_memoryBlockManager48 = NULL; + ms_memoryBlockManager48 = nullptr; delete ms_memoryBlockManager64; - ms_memoryBlockManager64 = NULL; + ms_memoryBlockManager64 = nullptr; } // ====================================================================== PersistentCrcString::PersistentCrcString() : CrcString(), - m_memoryBlockManager(NULL), - m_buffer(NULL) + m_memoryBlockManager(nullptr), + m_buffer(nullptr) { DEBUG_FATAL(!ms_memoryBlockManager8, ("Constructing a PersistentCrcString before the class is installed")); } @@ -75,8 +75,8 @@ PersistentCrcString::PersistentCrcString() PersistentCrcString::PersistentCrcString(CrcString const &rhs) : CrcString(), - m_memoryBlockManager(NULL), - m_buffer(NULL) + m_memoryBlockManager(nullptr), + m_buffer(nullptr) { DEBUG_FATAL(!ms_memoryBlockManager8, ("Constructing a PersistentCrcString before the class is installed")); @@ -88,8 +88,8 @@ PersistentCrcString::PersistentCrcString(CrcString const &rhs) PersistentCrcString::PersistentCrcString(PersistentCrcString const &rhs) : CrcString(), //lint !e1738 // non copy constructor used to initialize base class // this appears to be intentional. - m_memoryBlockManager(NULL), - m_buffer(NULL) + m_memoryBlockManager(nullptr), + m_buffer(nullptr) { DEBUG_FATAL(!ms_memoryBlockManager8, ("Constructing a PersistentCrcString before the class is installed")); @@ -101,8 +101,8 @@ PersistentCrcString::PersistentCrcString(PersistentCrcString const &rhs) PersistentCrcString::PersistentCrcString(char const * string, bool applyNormalize) : CrcString(), - m_memoryBlockManager(NULL), - m_buffer(NULL) + m_memoryBlockManager(nullptr), + m_buffer(nullptr) { DEBUG_FATAL(!ms_memoryBlockManager8, ("Constructing a PersistentCrcString before the class is installed")); @@ -114,8 +114,8 @@ PersistentCrcString::PersistentCrcString(char const * string, bool applyNormaliz PersistentCrcString::PersistentCrcString(char const * string, uint32 crc) : CrcString(), - m_memoryBlockManager(NULL), - m_buffer(NULL) + m_memoryBlockManager(nullptr), + m_buffer(nullptr) { DEBUG_FATAL(!ms_memoryBlockManager8, ("Constructing a PersistentCrcString before the class is installed")); @@ -169,18 +169,18 @@ void PersistentCrcString::internalFree() { if (m_memoryBlockManager == ms_fakeConstCharMemoryBlockManager) { - m_memoryBlockManager = NULL; + m_memoryBlockManager = nullptr; } else { m_memoryBlockManager->free(m_buffer); - m_memoryBlockManager = NULL; + m_memoryBlockManager = nullptr; } } else delete [] m_buffer; - m_buffer = NULL; + m_buffer = nullptr; } } @@ -201,7 +201,7 @@ void PersistentCrcString::internalSet(char const * string, bool applyNormalize) const int stringLength = istrlen(string) + 1; DEBUG_FATAL(stringLength > Os::MAX_PATH_LENGTH, ("string too long for a filename")); - m_memoryBlockManager = NULL; + m_memoryBlockManager = nullptr; if (stringLength <= 8) m_memoryBlockManager = ms_memoryBlockManager8; else diff --git a/engine/shared/library/sharedFoundation/src/shared/Tag.h b/engine/shared/library/sharedFoundation/src/shared/Tag.h index 82a4f393..261b474e 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Tag.h +++ b/engine/shared/library/sharedFoundation/src/shared/Tag.h @@ -158,7 +158,7 @@ inline Tag ConvertIntToTag(int value) * array with the name of the specified tag. If a character of the tag * is not printable, it will be replaced with a question mark. * - * A null-character will be appended to the output buffer. + * A nullptr-character will be appended to the output buffer. * * This routine assumes the specified character buffer is at least 5 characters * in length. @@ -171,7 +171,7 @@ inline void ConvertTagToString(Tag tag, char *buffer) { int i, j, ch; - DEBUG_FATAL(!buffer, ("buffer is null")); + DEBUG_FATAL(!buffer, ("buffer is nullptr")); for (i = 0, j = 24; i < 4; ++i, j -= 8) { diff --git a/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp b/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp index 3ca86728..c56201a6 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/Watcher.cpp @@ -82,7 +82,7 @@ void WatchedByList::install() /** * Destroy a WatchedByList. * - * All watchers currently watching the owner of this object will be reset to NULL. + * All watchers currently watching the owner of this object will be reset to nullptr. */ WatchedByList::~WatchedByList() @@ -92,7 +92,7 @@ WatchedByList::~WatchedByList() if (m_list) { deleteList(m_list); - m_list = NULL; + m_list = nullptr; } } diff --git a/engine/shared/library/sharedFoundation/src/shared/Watcher.h b/engine/shared/library/sharedFoundation/src/shared/Watcher.h index ca637a79..921b91d5 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Watcher.h +++ b/engine/shared/library/sharedFoundation/src/shared/Watcher.h @@ -8,7 +8,7 @@ // @todo How do I get this into doxygen? It's information that really spans multiple classes // // The Watcher system allows pointers to objects to be automatically -// reset to NULL when the object watching them is destoyed. +// reset to nullptr when the object watching them is destoyed. // // For something to be watchable, it must provide a routine of the form: // @@ -66,7 +66,7 @@ class Watcher : public BaseWatcher { public: - explicit Watcher(T *data=NULL); + explicit Watcher(T *data=nullptr); Watcher(const Watcher &newValue); ~Watcher(); //lint !e1509 // Warning -- base class destructor for class is not virtual @@ -96,7 +96,7 @@ class ConstWatcher : public BaseWatcher { public: - explicit ConstWatcher(const T *data=NULL); + explicit ConstWatcher(const T *data=nullptr); ConstWatcher(const ConstWatcher &newValue); ~ConstWatcher(); //lint !e1509 // Warning -- base class destructor for class is not virtual @@ -177,7 +177,7 @@ inline BaseWatcher::BaseWatcher(void *data) inline void BaseWatcher::reset() { - m_data = NULL; + m_data = nullptr; } // ---------------------------------------------------------------------- @@ -190,7 +190,7 @@ inline void BaseWatcher::reset() inline BaseWatcher::~BaseWatcher() { - m_data = NULL; + m_data = nullptr; } // ---------------------------------------------------------------------- @@ -593,11 +593,11 @@ inline const T *ConstWatcher::operator ->() const /** * Construct a WatchedByList. * - * This list of watchers remains NULL until someone first watches the object. + * This list of watchers remains nullptr until someone first watches the object. */ inline WatchedByList::WatchedByList() -: m_list(NULL) +: m_list(nullptr) { } diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp index f11c603e..ada9369f 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.cpp @@ -106,8 +106,8 @@ m_value(), m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -131,8 +131,8 @@ DynamicVariable::DynamicVariable(const DynamicVariable &rhs) : m_position(rhs.m_position), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -158,8 +158,8 @@ DynamicVariable& DynamicVariable::operator=(const DynamicVariable &rhs) (*f)(m_cachedValue[0]); } - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } } @@ -201,8 +201,8 @@ void DynamicVariable::load(int position, int typeId, const Unicode::String &pack (*f)(m_cachedValue[0]); } - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } } @@ -235,8 +235,8 @@ DynamicVariable::DynamicVariable(int value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -249,8 +249,8 @@ DynamicVariable::DynamicVariable(const std::vector & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -263,8 +263,8 @@ DynamicVariable::DynamicVariable(float value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -277,8 +277,8 @@ DynamicVariable::DynamicVariable(const std::vector & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -291,8 +291,8 @@ DynamicVariable::DynamicVariable(const Unicode::String &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -303,8 +303,8 @@ DynamicVariable::DynamicVariable(const std::string &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -315,8 +315,8 @@ DynamicVariable::DynamicVariable(const std::vector & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -329,8 +329,8 @@ DynamicVariable::DynamicVariable(const NetworkId & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -341,8 +341,8 @@ DynamicVariable::DynamicVariable(const std::vector & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -355,8 +355,8 @@ DynamicVariable::DynamicVariable(const DynamicVariableLocationData & value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -369,8 +369,8 @@ DynamicVariable::DynamicVariable(const std::vector m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -383,8 +383,8 @@ DynamicVariable::DynamicVariable(const StringId &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; } // ---------------------------------------------------------------------- @@ -395,8 +395,8 @@ DynamicVariable::DynamicVariable(const std::vector &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -409,8 +409,8 @@ DynamicVariable::DynamicVariable(const Transform &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -423,8 +423,8 @@ DynamicVariable::DynamicVariable(const std::vector &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -437,8 +437,8 @@ DynamicVariable::DynamicVariable(const Vector &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -451,8 +451,8 @@ DynamicVariable::DynamicVariable(const std::vector &value) : m_position(-1), m_cachedValueDirty(true) { - m_cachedValue[0] = NULL; - m_cachedValue[1] = NULL; + m_cachedValue[0] = nullptr; + m_cachedValue[1] = nullptr; pack(value, m_value); } @@ -786,7 +786,7 @@ bool DynamicVariable::get(DynamicVariableLocationData & value) const char tempCell[BUFSIZE]; std::string data(Unicode::wideToNarrow(m_value)); const char * bufptrStart = data.c_str(); - char * bufptrEnd = NULL; + char * bufptrEnd = nullptr; cachedValue.pos.x = static_cast(strtod(bufptrStart, &bufptrEnd)); bufptrStart = bufptrEnd; while (*bufptrStart != '\0' && isspace(*bufptrStart)) @@ -811,7 +811,7 @@ bool DynamicVariable::get(DynamicVariableLocationData & value) const while (*bufptrStart != '\0' && isspace(*bufptrStart)) ++bufptrStart; bufptrEnd = const_cast(strchr(bufptrStart, ' ')); - if (bufptrEnd == NULL || bufptrEnd - bufptrStart >= BUFSIZE) + if (bufptrEnd == nullptr || bufptrEnd - bufptrStart >= BUFSIZE) { WARNING_STRICT_FATAL(true, ("DynamicVariable::get location buffer overflow in scene")); return false; @@ -875,7 +875,7 @@ bool DynamicVariable::get(std::vector & value) cons char tempCell[BUFSIZE]; const char * bufptrStart = buffer; - char * bufptrEnd = NULL; + char * bufptrEnd = nullptr; temp.pos.x = static_cast(strtod(bufptrStart, &bufptrEnd)); bufptrStart = bufptrEnd; while (*bufptrStart != '\0' && isspace(*bufptrStart)) @@ -900,7 +900,7 @@ bool DynamicVariable::get(std::vector & value) cons while (*bufptrStart != '\0' && isspace(*bufptrStart)) ++bufptrStart; bufptrEnd = const_cast(strchr(bufptrStart, ' ')); - if (bufptrEnd == NULL || bufptrEnd - bufptrStart >= BUFSIZE) + if (bufptrEnd == nullptr || bufptrEnd - bufptrStart >= BUFSIZE) { WARNING_STRICT_FATAL(true, ("DynamicVariable::get location array buffer overflow in scene")); return false; @@ -1430,8 +1430,8 @@ namespace Archive (*f)(target.m_cachedValue[0]); } - target.m_cachedValue[0] = NULL; - target.m_cachedValue[1] = NULL; + target.m_cachedValue[0] = nullptr; + target.m_cachedValue[1] = nullptr; } } diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h index 004de6fc..c69588ba 100755 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h @@ -150,8 +150,8 @@ private: // caching the value so we don't constantly convert them from the string representation // // if the value can fit in m_cachedValue, we directly store it there - // int uses m_cachedValue[0], m_cachedValue[1] = NULL - // float uses m_cachedValue[0], m_cachedValue[1] = NULL + // int uses m_cachedValue[0], m_cachedValue[1] = nullptr + // float uses m_cachedValue[0], m_cachedValue[1] = nullptr // NetworkId uses both m_cachedValue[0] and m_cachedValue[1] // // if not, we allocate storage for the value and store the pointer to it diff --git a/engine/shared/library/sharedGame/src/shared/appearance/WearableAppearanceMap.cpp b/engine/shared/library/sharedGame/src/shared/appearance/WearableAppearanceMap.cpp index 63d98b04..5b7e478f 100755 --- a/engine/shared/library/sharedGame/src/shared/appearance/WearableAppearanceMap.cpp +++ b/engine/shared/library/sharedGame/src/shared/appearance/WearableAppearanceMap.cpp @@ -155,9 +155,9 @@ WearableAppearanceMapNamespace::PersistentMapEntry::PersistentMapEntry(char cons MapEntry(), m_sourceWearableAppearanceName(sourceWearableAppearanceName, true), m_wearerAppearanceName(wearerAppearanceName, true), - m_mappedWearableAppearanceName(NULL) + m_mappedWearableAppearanceName(nullptr) { - if (mappedWearableAppearanceName != NULL) + if (mappedWearableAppearanceName != nullptr) m_mappedWearableAppearanceName = new PersistentCrcString(mappedWearableAppearanceName, true); } @@ -218,7 +218,7 @@ CrcString const &WearableAppearanceMapNamespace::TemporaryMapEntry::getWearerApp CrcString const *WearableAppearanceMapNamespace::TemporaryMapEntry::getMappedWearableAppearanceName() const { - return NULL; + return nullptr; } // ====================================================================== @@ -297,7 +297,7 @@ void WearableAppearanceMapNamespace::loadTableData(char const *filename) std::string const &mappedWearableAppearanceName = table->getStringValue(mappedWearableAppearanceNameColumnNumber, rowIndex); //-- Create map entry, add to vector. - s_mapEntries.push_back(new PersistentMapEntry(sourceWearableAppearanceName.c_str(), wearerAppearanceName.c_str(), (mappedWearableAppearanceName == cs_forbiddenWearableCellContents) ? NULL : mappedWearableAppearanceName.c_str())); + s_mapEntries.push_back(new PersistentMapEntry(sourceWearableAppearanceName.c_str(), wearerAppearanceName.c_str(), (mappedWearableAppearanceName == cs_forbiddenWearableCellContents) ? nullptr : mappedWearableAppearanceName.c_str())); } DataTableManager::close(filename); @@ -388,7 +388,7 @@ WearableAppearanceMap::MapResult WearableAppearanceMap::getMapResultForWearableA if (findResult.first == findResult.second) { // We have no mapping for this entry. That implies the source wearable appearance name can be used as is. - return MapResult(false, false, NULL); + return MapResult(false, false, nullptr); } else { @@ -398,7 +398,7 @@ WearableAppearanceMap::MapResult WearableAppearanceMap::getMapResultForWearableA // We have a mapping. Return it. CrcString const *const mappedWearableAppearanceName = mapEntry->getMappedWearableAppearanceName(); - return MapResult(true, mappedWearableAppearanceName == NULL, mappedWearableAppearanceName); + return MapResult(true, mappedWearableAppearanceName == nullptr, mappedWearableAppearanceName); } } diff --git a/engine/shared/library/sharedGame/src/shared/collision/CollisionCallbackManager.cpp b/engine/shared/library/sharedGame/src/shared/collision/CollisionCallbackManager.cpp index fc8d7b13..89f58b9a 100755 --- a/engine/shared/library/sharedGame/src/shared/collision/CollisionCallbackManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/collision/CollisionCallbackManager.cpp @@ -279,8 +279,8 @@ bool CollisionCallbackManager::intersectAndReflectWithTerrain(Object * const obj void CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame(Object * const object) { - FATAL(!ms_convertObjectToIndex, ("CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame: ms_convertObjectToIndex == NULL.")); - FATAL(!object, ("CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame: object == NULL.")); + FATAL(!ms_convertObjectToIndex, ("CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame: ms_convertObjectToIndex == nullptr.")); + FATAL(!object, ("CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame: object == nullptr.")); int const index = ms_convertObjectToIndex(object); @@ -298,9 +298,9 @@ void CollisionCallbackManagerNamespace::noCollisionDetectionThisFrame(Object * c bool CollisionCallbackManagerNamespace::collisionDetectionOnHit(Object * const object, Object * const wasHitByThisObject) { - FATAL(!ms_convertObjectToIndex, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: ms_convertObjectToIndex == NULL.")); - FATAL(!object, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: object == NULL.")); - FATAL(!wasHitByThisObject, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: wasHitByThisObject == NULL.")); + FATAL(!ms_convertObjectToIndex, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: ms_convertObjectToIndex == nullptr.")); + FATAL(!object, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: object == nullptr.")); + FATAL(!wasHitByThisObject, ("CollisionCallbackManagerNamespace::collisionDetectionOnHit: wasHitByThisObject == nullptr.")); CollisionCallbackManager::OnHitByObjectFunction function = 0; diff --git a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp index 544cf1af..af8d3ef1 100755 --- a/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp @@ -69,7 +69,7 @@ AiDebugString::AiDebugString(std::string const & text) Unicode::String const delimiters(Unicode::narrowToWide("`")); Unicode::UnicodeStringVector result; - if (Unicode::tokenize(Unicode::narrowToWide(text), result, &delimiters, NULL)) + if (Unicode::tokenize(Unicode::narrowToWide(text), result, &delimiters, nullptr)) { Unicode::UnicodeStringVector::const_iterator iterStringVector = result.begin(); diff --git a/engine/shared/library/sharedGame/src/shared/core/AssetCustomizationManager.cpp b/engine/shared/library/sharedGame/src/shared/core/AssetCustomizationManager.cpp index 34acdca1..88432113 100755 --- a/engine/shared/library/sharedGame/src/shared/core/AssetCustomizationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/AssetCustomizationManager.cpp @@ -192,31 +192,31 @@ void AssetCustomizationManagerNamespace::remove() s_installed = false; delete [] s_nameDataBlock; - s_nameDataBlock = NULL; + s_nameDataBlock = nullptr; s_nameDataBlockSize = 0; delete [] s_paletteIdNameOffsetMap; - s_paletteIdNameOffsetMap = NULL; + s_paletteIdNameOffsetMap = nullptr; s_maxValidPaletteId = 0; delete [] s_variableIdNameOffsetMap; - s_variableIdNameOffsetMap = NULL; + s_variableIdNameOffsetMap = nullptr; s_maxValidVariableId = 0; delete [] s_defaultValueMap; - s_defaultValueMap = NULL; + s_defaultValueMap = nullptr; s_maxValidDefaultId = 0; delete [] s_intRangeMap; - s_intRangeMap = NULL; + s_intRangeMap = nullptr; s_maxValidIntRangeId = 0; delete [] s_rangeTypeMap; - s_rangeTypeMap = NULL; + s_rangeTypeMap = nullptr; s_maxValidRangeId = 0; delete [] s_variableUsageMap; - s_variableUsageMap = NULL; + s_variableUsageMap = nullptr; s_maxValidVariableUsageId = 0; delete [] s_variableUsageList; @@ -224,19 +224,19 @@ void AssetCustomizationManagerNamespace::remove() s_variableUsageListEntryCount = 0; delete [] s_usageIndex; - s_usageIndex = NULL; + s_usageIndex = nullptr; s_usageIndexEntryCount = 0; delete [] s_linkList; - s_linkList = NULL; + s_linkList = nullptr; s_linkListEntryCount = 0; delete [] s_linkIndex; - s_linkIndex = NULL; + s_linkIndex = nullptr; s_linkIndexEntryCount = 0; delete [] s_crcLookupTable; - s_crcLookupTable = NULL; + s_crcLookupTable = nullptr; s_crcLookupEntryCount = 0; } @@ -488,7 +488,7 @@ int AssetCustomizationManagerNamespace::lookupAssetId(CrcString const &assetName uint32 const key = assetName.getCrc(); CrcLookupEntry const *entry = static_cast(bsearch(&key, s_crcLookupTable, static_cast(s_crcLookupEntryCount), sizeof(CrcLookupEntry), compare_uint32)); - return (entry != NULL) ? entry->assetId : 0; + return (entry != nullptr) ? entry->assetId : 0; } // ---------------------------------------------------------------------- @@ -584,7 +584,7 @@ void AssetCustomizationManagerNamespace::addVariablesForAssetAndLinks(int assetI getRangeTypeInfoFromRangeId(variableUsage->rangeId, isPalette, idForRealType); //-- Create variable based on type. - CustomizationVariable *variable = NULL; + CustomizationVariable *variable = nullptr; if (isPalette) { //-- Get palette. diff --git a/engine/shared/library/sharedGame/src/shared/core/CitizenRankDataTable.cpp b/engine/shared/library/sharedGame/src/shared/core/CitizenRankDataTable.cpp index 2edf349d..a5f37664 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CitizenRankDataTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/CitizenRankDataTable.cpp @@ -63,7 +63,7 @@ void CitizenRankDataTable::install() FATAL((columnRankSlotId < 0), ("column \"rankSlotId\" not found in %s", cs_citizenRankDataTableName)); FATAL((columnTitle < 0), ("column \"title\" not found in %s", cs_citizenRankDataTableName)); - CitizenRankDataTable::CitizenRank const * currentRank = NULL; + CitizenRankDataTable::CitizenRank const * currentRank = nullptr; int const numRows = table->getNumRows(); std::string rankName, alternateTitle; @@ -199,7 +199,7 @@ CitizenRankDataTable::CitizenRank const * CitizenRankDataTable::getRank(std::str if (iterFind != s_allCitizenRanksByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -210,7 +210,7 @@ CitizenRankDataTable::CitizenRank const * CitizenRankDataTable::isARankTitle(std if (iterFind != s_allCitizenRanksByTitle.end()) return iterFind->second; - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.cpp b/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.cpp index 74cc78cc..f7402fdb 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.cpp @@ -34,7 +34,7 @@ namespace CollectionsDataTableNamespace // for quick lookup of a slot by begin slot id, we use a vector because // slot id are guaranteed to start at 0 and be contiguous; for counter-type // slot, only the begin slot id index points to the slot; the other slot - // id indices point to NULL + // id indices point to nullptr std::vector s_allSlotsById; // all title(able) slots @@ -232,10 +232,10 @@ void CollectionsDataTable::install() FATAL((columnNoReward < 0), ("column \"noReward\" not found in %s", cs_collectionsDataTableName)); FATAL((columnTrackServerFirst < 0), ("column \"trackServerFirst\" not found in %s", cs_collectionsDataTableName)); - CollectionsDataTable::CollectionInfoBook const * currentBook = NULL; - CollectionsDataTable::CollectionInfoPage const * currentPage = NULL; - CollectionsDataTable::CollectionInfoCollection const * currentCollection = NULL; - CollectionsDataTable::CollectionInfoSlot const * currentSlot = NULL; + CollectionsDataTable::CollectionInfoBook const * currentBook = nullptr; + CollectionsDataTable::CollectionInfoPage const * currentPage = nullptr; + CollectionsDataTable::CollectionInfoCollection const * currentCollection = nullptr; + CollectionsDataTable::CollectionInfoSlot const * currentSlot = nullptr; int const numRows = table->getNumRows(); std::string bookName, pageName, collectionName, slotName, category, prereq, alternateTitle, icon, music; @@ -350,8 +350,8 @@ void CollectionsDataTable::install() FATAL(title, ("%s: book %s cannot be \"titleable\")", cs_collectionsDataTableName, bookName.c_str())); FATAL(!titles.empty(), ("%s: book %s cannot have any alternate titles (books are not \"titleable\")", cs_collectionsDataTableName, bookName.c_str())); currentBook = new CollectionInfoBook(bookName, icon, showIfNotYetEarned, hidden); - currentPage = NULL; - currentCollection = NULL; + currentPage = nullptr; + currentCollection = nullptr; s_allBooks.push_back(currentBook); s_allBooksByName[bookName] = currentBook; } @@ -376,7 +376,7 @@ void CollectionsDataTable::install() // start new page FATAL((!titles.empty() && !title), ("%s: page %s cannot have any alternate titles unless it is defined as \"titleable\")", cs_collectionsDataTableName, pageName.c_str())); currentPage = new CollectionInfoPage(pageName, icon, showIfNotYetEarned, hidden, titles, *currentBook); - currentCollection = NULL; + currentCollection = nullptr; s_pagesInBook[currentBook->name].push_back(currentPage); s_allPagesByName[pageName] = currentPage; @@ -549,7 +549,7 @@ void CollectionsDataTable::install() IGNORE_RETURN(s_slotCategoriesByCollection[currentCollection->name].insert(*iterCategories)); } - currentSlot = NULL; + currentSlot = nullptr; categories.clear(); prereqs.clear(); } @@ -575,7 +575,7 @@ void CollectionsDataTable::install() } // save off all slots ordered by slot ids - s_allSlotsById.resize(allSlotsById.size(), NULL); + s_allSlotsById.resize(allSlotsById.size(), nullptr); beginSlotId = -1; for (std::map::const_iterator iterSlotId = allSlotsById.begin(); iterSlotId != allSlotsById.end(); ++iterSlotId) { @@ -612,7 +612,7 @@ void CollectionsDataTable::install() } else { - s_allSlotsById[iterSlotId->first] = NULL; + s_allSlotsById[iterSlotId->first] = nullptr; } } @@ -733,7 +733,7 @@ CollectionsDataTable::CollectionInfoSlot const * CollectionsDataTable::getSlotBy if (iterFind != s_allSlotsByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -743,7 +743,7 @@ CollectionsDataTable::CollectionInfoSlot const * CollectionsDataTable::getSlotBy CollectionsDataTable::CollectionInfoSlot const * CollectionsDataTable::getSlotByBeginSlotId(int slotId) { if ((slotId < 0) || (slotId >= static_cast(s_allSlotsById.size()))) - return NULL; + return nullptr; return s_allSlotsById[slotId]; } @@ -763,7 +763,7 @@ CollectionsDataTable::CollectionInfoSlot const * CollectionsDataTable::isASlotTi if (iterFind != s_allSlotTitles.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -796,7 +796,7 @@ CollectionsDataTable::CollectionInfoCollection const * CollectionsDataTable::isA if (iterFind != s_allCollectionTitles.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -818,7 +818,7 @@ CollectionsDataTable::CollectionInfoCollection const * CollectionsDataTable::get if (iterFind != s_allCollectionsByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -866,7 +866,7 @@ CollectionsDataTable::CollectionInfoPage const * CollectionsDataTable::isAPageTi if (iterFind != s_allPageTitles.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -879,7 +879,7 @@ CollectionsDataTable::CollectionInfoPage const * CollectionsDataTable::getPageBy if (iterFind != s_allPagesByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -946,7 +946,7 @@ CollectionsDataTable::CollectionInfoBook const * CollectionsDataTable::getBookBy if (iterFind != s_allBooksByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.cpp b/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.cpp index 585dbd1d..8c896b4f 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.cpp @@ -125,7 +125,7 @@ void CommoditiesAdvancedSearchAttribute::install() { // handle search attribute name alias tokens.clear(); - if (Unicode::tokenize(Unicode::narrowToWide(searchAttributeName), tokens, NULL, NULL) && (tokens.size() > 1)) + if (Unicode::tokenize(Unicode::narrowToWide(searchAttributeName), tokens, nullptr, nullptr) && (tokens.size() > 1)) { // the first value is the search attribute name to display searchAttributeName = Unicode::wideToNarrow(tokens[0]); @@ -177,7 +177,7 @@ void CommoditiesAdvancedSearchAttribute::install() { // for enum, parse out the aliases (if any) for the enum value tokens.clear(); - if (Unicode::tokenize(Unicode::narrowToWide(defaultSearchValue), tokens, NULL, NULL) && !tokens.empty()) + if (Unicode::tokenize(Unicode::narrowToWide(defaultSearchValue), tokens, nullptr, nullptr) && !tokens.empty()) { #ifdef _WIN32 #ifdef _DEBUG @@ -340,7 +340,7 @@ CommoditiesAdvancedSearchAttribute::SearchAttribute const * CommoditiesAdvancedS return iterFindAttribute->second; } - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.cpp b/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.cpp index 051bb14e..77dc02eb 100755 --- a/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/CustomizationManager.cpp @@ -441,7 +441,7 @@ CustomizationVariable * CustomizationManager::findVariable (CustomizationData & if(!ms_installed) { DEBUG_FATAL(true, ("CustomizationManager not installed")); - return NULL; //lint !e527 unreachable (reachable in release) + return nullptr; //lint !e527 unreachable (reachable in release) } PathType type = PT_none; @@ -455,7 +455,7 @@ CustomizationVariable * CustomizationManager::findVariable (CustomizationData & if(!ms_installed) { DEBUG_FATAL(true, ("CustomizationManager not installed")); - return NULL; //lint !e527 unreachable (reachable in release) + return nullptr; //lint !e527 unreachable (reachable in release) } type = PT_none; @@ -467,7 +467,7 @@ CustomizationVariable * CustomizationManager::findVariable (CustomizationData & { //if we have the ranged customization variable is a dependent variable, ignore it (there will be another that controls it) if(rangedCV->getIsDependentVariable()) - cv = NULL; + cv = nullptr; } if (!cv) diff --git a/engine/shared/library/sharedGame/src/shared/core/FormManager.cpp b/engine/shared/library/sharedGame/src/shared/core/FormManager.cpp index 7074ff4c..789c118a 100755 --- a/engine/shared/library/sharedGame/src/shared/core/FormManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/FormManager.cpp @@ -81,10 +81,10 @@ FormManager::Field::Field(Form const * const parent) FormManager::Field::~Field() { delete m_choices; - m_choices = NULL; + m_choices = nullptr; delete m_otherValidationRules; - m_otherValidationRules = NULL; - m_parentForm = NULL; + m_otherValidationRules = nullptr; + m_parentForm = nullptr; } //---------------------------------------------------------------------- @@ -453,12 +453,12 @@ FormManager::Form::~Form() { //this vector does NOT own the pointers delete m_orderedFieldList; - m_orderedFieldList = NULL; + m_orderedFieldList = nullptr; //this list owns the pointers, so release it std::for_each(m_fields->begin(), m_fields->end(), PointerDeleterPairSecond()); delete m_fields; - m_fields = NULL; + m_fields = nullptr; } //---------------------------------------------------------------------- @@ -477,7 +477,7 @@ FormManager::Field const * FormManager::Form::getField(std::string const & field if(i != m_fields->end()) return i->second; else - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -531,13 +531,13 @@ void FormManager::remove () clearData(); delete ms_forms; - ms_forms = NULL; + ms_forms = nullptr; delete ms_serverObjectTemplateToForms; - ms_serverObjectTemplateToForms = NULL; + ms_serverObjectTemplateToForms = nullptr; delete ms_sharedObjectTemplateToForms; - ms_sharedObjectTemplateToForms = NULL; + ms_sharedObjectTemplateToForms = nullptr; delete ms_automaticallyCreateObjectForServerObjectTemplate; - ms_automaticallyCreateObjectForServerObjectTemplate = NULL; + ms_automaticallyCreateObjectForServerObjectTemplate = nullptr; s_tablesLoaded = false; s_installed = false; @@ -764,13 +764,13 @@ FormManager::Form const * FormManager::getFormByName(std::string const & formNam { DEBUG_FATAL (!s_installed, ("not installed")); if(!s_installed) - return NULL; + return nullptr; std::map::iterator i = ms_forms->find(formName); if(i != ms_forms->end()) return i->second; else - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -779,13 +779,13 @@ FormManager::Form const * FormManager::getFormForServerObjectTemplate(std::strin { DEBUG_FATAL (!s_installed, ("not installed")); if(!s_installed) - return NULL; + return nullptr; std::map::iterator i = ms_serverObjectTemplateToForms->find(serverTemplateName); if(i != ms_serverObjectTemplateToForms->end()) return i->second; else - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -794,13 +794,13 @@ FormManager::Form const * FormManager::getFormForSharedObjectTemplate(std::strin { DEBUG_FATAL (!s_installed, ("not installed")); if(!s_installed) - return NULL; + return nullptr; std::map::iterator i = ms_sharedObjectTemplateToForms->find(sharedTemplateName); if(i != ms_sharedObjectTemplateToForms->end()) return i->second; else - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp b/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp index e0b848ba..9ec51701 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp @@ -74,7 +74,7 @@ void GameScheduler::remove() DEBUG_FATAL(!s_installed, ("GameScheduler not installed.")); delete s_scheduler; - s_scheduler = NULL; + s_scheduler = nullptr; s_installed = false; } diff --git a/engine/shared/library/sharedGame/src/shared/core/GroundZoneManager.cpp b/engine/shared/library/sharedGame/src/shared/core/GroundZoneManager.cpp index bc38d3e0..ddf2992d 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GroundZoneManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/GroundZoneManager.cpp @@ -103,12 +103,12 @@ BuildoutArea const * GroundZoneManager::getZoneName(std::string const & sceneNam if(!SharedBuildoutAreaManager::isBuildoutScene(sceneName)) { - return NULL; + return nullptr; } else { BuildoutArea const * const ba = SharedBuildoutAreaManager::findBuildoutAreaAtPosition(sceneName, location_w.x, location_w.z, true); - if (NULL != ba) + if (nullptr != ba) { if (!ba->compositeName.empty()) zoneName = ba->compositeName; @@ -126,7 +126,7 @@ Vector GroundZoneManager::transformWorldLocationToZoneLocation(std::string const Vector pos_w = location_w; std::string zoneName; BuildoutArea const * const ba = GroundZoneManager::getZoneName(sceneName, location_w, zoneName); - if (NULL != ba) + if (nullptr != ba) { pos_w = ba->getRelativePosition(location_w, true); } diff --git a/engine/shared/library/sharedGame/src/shared/core/GuildRankDataTable.cpp b/engine/shared/library/sharedGame/src/shared/core/GuildRankDataTable.cpp index 2bd66b99..b5f2c62a 100755 --- a/engine/shared/library/sharedGame/src/shared/core/GuildRankDataTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/GuildRankDataTable.cpp @@ -65,7 +65,7 @@ void GuildRankDataTable::install() FATAL((columnRankSlotId < 0), ("column \"rankSlotId\" not found in %s", cs_guildRankDataTableName)); FATAL((columnTitle < 0), ("column \"title\" not found in %s", cs_guildRankDataTableName)); - GuildRankDataTable::GuildRank const * currentRank = NULL; + GuildRankDataTable::GuildRank const * currentRank = nullptr; int const numRows = table->getNumRows(); std::string rankName, alternateTitle; @@ -207,7 +207,7 @@ GuildRankDataTable::GuildRank const * GuildRankDataTable::getRank(std::string co if (iterFind != s_allGuildRanksByName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -218,7 +218,7 @@ GuildRankDataTable::GuildRank const * GuildRankDataTable::getRankForDisplayRankN if (iterFind != s_allGuildRanksByDisplayName.end()) return iterFind->second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -229,7 +229,7 @@ GuildRankDataTable::GuildRank const * GuildRankDataTable::isARankTitle(std::stri if (iterFind != s_allGuildRanksByTitle.end()) return iterFind->second; - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp index 31a0e655..3f26cadd 100755 --- a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp @@ -1127,7 +1127,7 @@ std::map const & LfgCharacterData::calculateStatistics(std::ma } } - int32 const timeNow = static_cast(::time(NULL)); + int32 const timeNow = static_cast(::time(nullptr)); for (std::map::const_iterator iterLfgData = connectedCharacterLfgData.begin(); iterLfgData != connectedCharacterLfgData.end(); ++iterLfgData) { // searchable/anonymous diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.cpp b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.cpp index 6acce604..f7cfb688 100755 --- a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.cpp @@ -379,10 +379,10 @@ void LfgDataTable::install() unsigned long maxValueForNumBits; std::map names; std::map allSlotsById; - LfgNode * lfgNode = NULL; - LfgNode * currentTier1Node = NULL; - LfgNode * currentTier2Node = NULL; - LfgNode * currentTier3Node = NULL; + LfgNode * lfgNode = nullptr; + LfgNode * currentTier1Node = nullptr; + LfgNode * currentTier2Node = nullptr; + LfgNode * currentTier3Node = nullptr; for (int i = 0; i < numRows; ++i) { @@ -472,15 +472,15 @@ void LfgDataTable::install() FATAL(((minValue > 0) && (maxValueBeginSlotId < 0)), ("%s, row %d: minValueBeginSlotId/minValueEndSlotId/maxValueBeginSlotId/maxValueEndSlotId must be specified if minValue/maxValue is specified", cs_lfgDataTableName, (i+3))); // create a new node - lfgNode = NULL; + lfgNode = nullptr; if (!tier1.empty()) { - lfgNode = new LfgNode(tier1, internalAttribute, minValueBeginSlotId, minValueEndSlotId, maxValueBeginSlotId, maxValueEndSlotId, minValue, maxValue, defaultMatchCondition, NULL); + lfgNode = new LfgNode(tier1, internalAttribute, minValueBeginSlotId, minValueEndSlotId, maxValueBeginSlotId, maxValueEndSlotId, minValue, maxValue, defaultMatchCondition, nullptr); s_topLevelNodes.push_back(lfgNode); currentTier1Node = lfgNode; - currentTier2Node = NULL; - currentTier3Node = NULL; + currentTier2Node = nullptr; + currentTier3Node = nullptr; } else if (!tier2.empty()) { @@ -490,7 +490,7 @@ void LfgDataTable::install() currentTier1Node->children.push_back(lfgNode); currentTier2Node = lfgNode; - currentTier3Node = NULL; + currentTier3Node = nullptr; } else if (!tier3.empty()) { @@ -580,7 +580,7 @@ void LfgDataTable::install() // find out the leaf node's ancestor, if any, that has the Any/All option LfgNode const * parentNode = node.parent; - bool const hasParent = (parentNode != NULL); + bool const hasParent = (parentNode != nullptr); int countParentWithNonNaDefaultMatchCondition = 0; std::string stringParentWithNonNaDefaultMatchCondition; while (parentNode) @@ -670,7 +670,7 @@ LfgDataTable::LfgNode const * LfgDataTable::getLfgNodeByName(std::string const & { std::map::const_iterator iterNode = s_allNodesByName.find(lfgNodeName); if (iterNode == s_allNodesByName.end()) - return NULL; + return nullptr; return iterNode->second; } @@ -681,7 +681,7 @@ LfgDataTable::LfgNode const * LfgDataTable::getLfgLeafNodeByName(std::string con { std::map::const_iterator iterNode = s_allLeafNodesByName.find(lfgNodeName); if (iterNode == s_allLeafNodesByName.end()) - return NULL; + return nullptr; return iterNode->second; } diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h index e95f1e85..5ffc3e70 100755 --- a/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h +++ b/engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h @@ -47,7 +47,7 @@ public: { public: LfgNode(std::string const & pName, bool pInternalAttribute, int pMinValueBeginSlotId, int pMinValueEndSlotId, int pMaxValueBeginSlotId, int pMaxValueEndSlotId, int pMinValue, int pMaxValue, DefaultMatchConditionType pDefaultMatchCondition, LfgNode const * pParent) : - name(pName), internalAttribute(pInternalAttribute), minValueBeginSlotId(pMinValueBeginSlotId), minValueEndSlotId(pMinValueEndSlotId), maxValueBeginSlotId(pMaxValueBeginSlotId), maxValueEndSlotId(pMaxValueEndSlotId), minValue(pMinValue), maxValue(pMaxValue), defaultMatchCondition(pDefaultMatchCondition), actualMatchCondition(DMCT_NA), parent(pParent), anyAllGroupingParent(NULL), children(), hasAnyInternalAttributeLeafNodeDescendants(false), hasAnyExternalAttributeLeafNodeDescendants(false), internalAttributeMatchFunction(NULL) {}; + name(pName), internalAttribute(pInternalAttribute), minValueBeginSlotId(pMinValueBeginSlotId), minValueEndSlotId(pMinValueEndSlotId), maxValueBeginSlotId(pMaxValueBeginSlotId), maxValueEndSlotId(pMaxValueEndSlotId), minValue(pMinValue), maxValue(pMaxValue), defaultMatchCondition(pDefaultMatchCondition), actualMatchCondition(DMCT_NA), parent(pParent), anyAllGroupingParent(nullptr), children(), hasAnyInternalAttributeLeafNodeDescendants(false), hasAnyExternalAttributeLeafNodeDescendants(false), internalAttributeMatchFunction(nullptr) {}; std::string const name; bool const internalAttribute; diff --git a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp index 24efe09a..d089cc2c 100755 --- a/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp @@ -530,9 +530,9 @@ void PlayerCreationManager::buildRacialMinsMaxes() const DataTable * dt = DataTableManager::getTable( "datatables/creation/attribute_limits.iff", true); - WARNING_STRICT_FATAL(dt == NULL, ("Unable to read the " + WARNING_STRICT_FATAL(dt == nullptr, ("Unable to read the " "attribute_limits datatable")); - if (dt == NULL) + if (dt == nullptr) return; int numAttribs = dt->getNumColumns() - 1; diff --git a/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp b/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp index 40e7ffb8..a9edcafd 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp @@ -29,7 +29,7 @@ namespace SharedBuffBuilderManagerNamespace const std::string ms_reactiveSecondChanceComponentName = "reactive_second_chance"; } -SharedBuffBuilderManager::BuffBuilderDataType * SharedBuffBuilderManager::ms_buffBuilderData=NULL; +SharedBuffBuilderManager::BuffBuilderDataType * SharedBuffBuilderManager::ms_buffBuilderData=nullptr; using namespace SharedBuffBuilderManagerNamespace; // ====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp b/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp index cec5ff33..5786d3e6 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp @@ -321,7 +321,7 @@ std::string SharedBuildoutAreaManager::getBuildoutNameForPosition(std::string co { BuildoutArea const * const ba = findBuildoutAreaAtPosition(sceneName, location_w.x, location_w.z, ignoreInternal, ignoreNonActiveEvents); - if (NULL != ba) + if (nullptr != ba) return sceneName + cms_sceneAndAreaDelimeter + ba->areaName; return sceneName; @@ -537,7 +537,7 @@ SharedBuildoutAreaManager::BuildoutAreaVector const * SharedBuildoutAreaManager: { return &it->second; } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -546,8 +546,8 @@ BuildoutArea const * SharedBuildoutAreaManager::findBuildoutAreaAtPosition(std:: { BuildoutAreaVector const * const bav = findBuildoutAreasForScene(sceneId); - if (NULL == bav) - return NULL; + if (nullptr == bav) + return nullptr; for (BuildoutAreaVector::const_iterator it = bav->begin(); it != bav->end(); ++it) { @@ -567,7 +567,7 @@ BuildoutArea const * SharedBuildoutAreaManager::findBuildoutAreaAtPosition(std:: } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -579,11 +579,11 @@ BuildoutArea const * SharedBuildoutAreaManager::findBuildoutAreaAtPosition(float if (ignoreInternal && buildoutArea.internalBuildoutArea) { - return NULL; + return nullptr; } if(ignoreNonActiveEvents && !buildoutArea.requiredEventName.empty()) - return NULL; + return nullptr; if (buildoutArea.isLocationInside(x, z)) { @@ -591,7 +591,7 @@ BuildoutArea const * SharedBuildoutAreaManager::findBuildoutAreaAtPosition(float } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.cpp b/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.cpp index 62e46247..c0ee57fa 100755 --- a/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/SharedImageDesignerManager.cpp @@ -358,7 +358,7 @@ bool SharedImageDesignerManager::isSessionValid(SharedImageDesignerManager::Sess if(customizationDataHair) customizationDataForThisCustomization = customizationDataHair; else - customizationDataForThisCustomization = NULL; + customizationDataForThisCustomization = nullptr; } if(customizationDataForThisCustomization) diff --git a/engine/shared/library/sharedGame/src/shared/core/Universe.cpp b/engine/shared/library/sharedGame/src/shared/core/Universe.cpp index 5d5186d4..60eeba1e 100755 --- a/engine/shared/library/sharedGame/src/shared/core/Universe.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/Universe.cpp @@ -17,14 +17,14 @@ // ====================================================================== -Universe * Universe::ms_theInstance = NULL; +Universe * Universe::ms_theInstance = nullptr; bool Universe::ms_installed = false; //=================================================================== void Universe::installDerived(Universe *derivedInstance) { - DEBUG_FATAL(ms_installed || ms_theInstance!=NULL,("Installed Universe twice.\n")); + DEBUG_FATAL(ms_installed || ms_theInstance!=nullptr,("Installed Universe twice.\n")); ms_theInstance = derivedInstance; ms_installed = true; @@ -43,7 +43,7 @@ void Universe::remove() Universe::Universe() : m_resourceClassNameMap (new ResourceClassNameMap), m_resourceClassNameCrcMap (new ResourceClassNameCrcMap), - m_resourceTreeRoot (NULL) + m_resourceTreeRoot (nullptr) { ResourceClassObject::install(); // sets up some static strings used by the import process } diff --git a/engine/shared/library/sharedGame/src/shared/core/WearableEntry.cpp b/engine/shared/library/sharedGame/src/shared/core/WearableEntry.cpp index 767c20f4..f0c9912a 100755 --- a/engine/shared/library/sharedGame/src/shared/core/WearableEntry.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/WearableEntry.cpp @@ -103,7 +103,7 @@ namespace Archive put(target, source.m_networkId); put(target, source.m_objectTemplate); - bool isWeapon = (source.m_weaponSharedBaselines.get() != NULL); + bool isWeapon = (source.m_weaponSharedBaselines.get() != nullptr); put(target, isWeapon); if (isWeapon) { diff --git a/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp b/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp index 775c8119..4a4139a9 100755 --- a/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/mount/MountValidScaleRangeTable.cpp @@ -248,7 +248,7 @@ void MountValidScaleRangeTableNamespace::loadTableData(char const *filename) TemporaryCrcString const mountableCreatureAppearanceNameCrc(mountableCreatureAppearanceName.c_str(), true); //-- Find or create new MountableCreature instance for this creature name. - MountableCreature *mountableCreature = NULL; + MountableCreature *mountableCreature = nullptr; MountableCreatureTable::iterator lowerBoundIt = s_mountableCreatureTable.lower_bound((const CrcString*)&mountableCreatureAppearanceNameCrc); bool const mountableCreatureEntryExists = ((lowerBoundIt != s_mountableCreatureTable.end()) && !s_mountableCreatureTable.key_comp()(static_cast(&mountableCreatureAppearanceNameCrc), lowerBoundIt->first)); @@ -289,7 +289,7 @@ MountValidScaleRangeTableNamespace::MountableCreature const *MountValidScaleRang else { DEBUG_WARNING(true, ("'datatables/mount/valid_scale_range.iff' missing entry for creature appearance name '%s'", creatureAppearanceName.getString())); - return NULL; + return nullptr; } } diff --git a/engine/shared/library/sharedGame/src/shared/mount/SharedSaddleManager.cpp b/engine/shared/library/sharedGame/src/shared/mount/SharedSaddleManager.cpp index 5c2de639..083ed7c5 100755 --- a/engine/shared/library/sharedGame/src/shared/mount/SharedSaddleManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/mount/SharedSaddleManager.cpp @@ -433,7 +433,7 @@ int SharedSaddleManagerNamespace::TemporaryRiderPoseMapEntry::getRiderSeatIndex( CrcString const *SharedSaddleManagerNamespace::TemporaryRiderPoseMapEntry::getRiderPoseName() const { - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.cpp b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.cpp index 71d3696c..46293784 100755 --- a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.cpp @@ -39,8 +39,8 @@ using namespace ResourceClassObjectNamespace; ResourceClassObject::ResourceClassObject() : m_resourceClassName(), - m_parentClass(NULL), - m_friendlyName(NULL), + m_parentClass(nullptr), + m_friendlyName(nullptr), m_minTypes(0), m_maxTypes(0), m_minPools(0), @@ -49,7 +49,7 @@ ResourceClassObject::ResourceClassObject() : m_nameTable(), m_recycled(false), m_permanent(false), - m_recycledVersion(NULL), + m_recycledVersion(nullptr), m_resourceAttributeRanges(new ResourceAttributeRangesType()), m_children(new ClassList) { @@ -60,18 +60,18 @@ ResourceClassObject::ResourceClassObject() : ResourceClassObject::~ResourceClassObject() { delete m_children; - m_children = NULL; + m_children = nullptr; delete m_resourceAttributeRanges; - m_resourceAttributeRanges = NULL; + m_resourceAttributeRanges = nullptr; - m_parentClass = NULL; - m_recycledVersion = NULL; + m_parentClass = nullptr; + m_recycledVersion = nullptr; - if (m_friendlyName != NULL) + if (m_friendlyName != nullptr) { delete m_friendlyName; - m_friendlyName = NULL; + m_friendlyName = nullptr; } } @@ -254,7 +254,7 @@ ResourceClassObject::ResourceAttributeRangesType const & ResourceClassObject::ge { static const ResourceAttributeRangesType emptyRanges; - if (m_resourceAttributeRanges != NULL) + if (m_resourceAttributeRanges != nullptr) return *m_resourceAttributeRanges; return emptyRanges; } @@ -304,7 +304,7 @@ void ResourceClassObject::loadTreeFromIff() int numRows = resourceDataTable->getNumRows(); ResourceClassObject * parents[8]; for (int i=0; i<8; ++i) - parents[i]=NULL; + parents[i]=nullptr; static const std::string colName_resourceClassName = "ENUM"; static const std::string colName_maxTypes = "Maximum # types"; @@ -334,7 +334,7 @@ void ResourceClassObject::loadTreeFromIff() if (possibleName.size()!=0) { if (wheresTheName==0) - newClass->m_parentClass = NULL; + newClass->m_parentClass = nullptr; else { newClass->m_parentClass = parents[wheresTheName-1]; @@ -438,12 +438,12 @@ bool ResourceClassObject::isLeaf() const void ResourceClassObject::getChildren(std::vector & children, bool recurse) const { - if (m_children == NULL) + if (m_children == nullptr) return; for (ClassList::const_iterator i = m_children->begin(); i != m_children->end(); ++i) { - if (*i != NULL) + if (*i != nullptr) { children.push_back(*i); if (recurse) @@ -456,12 +456,12 @@ void ResourceClassObject::getChildren(std::vector & void ResourceClassObject::getLeafChildren(std::vector & children) const { - if (m_children == NULL) + if (m_children == nullptr) return; for (ClassList::const_iterator i = m_children->begin(); i != m_children->end(); ++i) { - if (*i != NULL) + if (*i != nullptr) { if ((*i)->isLeaf()) children.push_back(*i); @@ -493,7 +493,7 @@ ResourceClassObject const * ResourceClassObject::getRecycledVersion() const return m_recycledVersion; else if (m_parentClass) return m_parentClass->getRecycledVersion(); - else return NULL; + else return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h index 16de81e8..1361de6e 100755 --- a/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h +++ b/engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h @@ -118,7 +118,7 @@ inline const StringId & ResourceClassObject::getFriendlyName () const inline bool ResourceClassObject::isRoot() const { - return (m_parentClass == NULL); + return (m_parentClass == nullptr); } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp b/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp index 08cc4479..74f3f8ba 100755 --- a/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp @@ -160,7 +160,7 @@ WaypointDataBase::WaypointDataBase() : void WaypointDataBase::setName(Unicode::String const &name) { //This magical number (250) is chosen because the waypoint datatable has VARCHAR2(512) in this column, - //and we're assuming 2 bytes per char (which is not quite true actually) plus an extra one for null plus + //and we're assuming 2 bytes per char (which is not quite true actually) plus an extra one for nullptr plus //a few extra for good measure and because nobody needs 251-character waypoint names. if (name.length() > 250) { diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp index 9e973c36..a83d8b7f 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag SharedBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion @@ -112,26 +112,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNumberOfPoles(true); #endif } if (!m_numberOfPoles.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter numberOfPoles in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); return base->getNumberOfPoles(); } } @@ -141,9 +141,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNumberOfPoles(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -160,7 +160,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -176,26 +176,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNumberOfPolesMin(true); #endif } if (!m_numberOfPoles.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter numberOfPoles in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); return base->getNumberOfPolesMin(); } } @@ -205,9 +205,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNumberOfPolesMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -224,7 +224,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -240,26 +240,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNumberOfPolesMax(true); #endif } if (!m_numberOfPoles.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter numberOfPoles in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter numberOfPoles has not been defined in template %s!", DataResource::getName())); return base->getNumberOfPolesMax(); } } @@ -269,9 +269,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNumberOfPolesMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -288,7 +288,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -304,26 +304,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getRadius(true); #endif } if (!m_radius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter radius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); return base->getRadius(); } } @@ -333,9 +333,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -352,7 +352,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -368,26 +368,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getRadiusMin(true); #endif } if (!m_radius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter radius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); return base->getRadiusMin(); } } @@ -397,9 +397,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -416,7 +416,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -432,26 +432,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedBattlefieldMarkerObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getRadiusMax(true); #endif } if (!m_radius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter radius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter radius has not been defined in template %s!", DataResource::getName())); return base->getRadiusMax(); } } @@ -461,9 +461,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -480,7 +480,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -529,12 +529,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp index 793143b0..89b64952 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedBuildingObjectTemplate::getTemplateVersion(void) const */ Tag SharedBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBuildingObjectTemplate::getHighestTemplateVersion @@ -111,33 +111,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTerrainModificationFileName(true); #endif } if (!m_terrainModificationFileName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter terrainModificationFileName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter terrainModificationFileName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter terrainModificationFileName has not been defined in template %s!", DataResource::getName())); return base->getTerrainModificationFileName(); } } const std::string & value = m_terrainModificationFileName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -153,33 +153,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedBuildingObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedBuildingObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInteriorLayoutFileName(true); #endif } if (!m_interiorLayoutFileName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter interiorLayoutFileName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter interiorLayoutFileName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter interiorLayoutFileName has not been defined in template %s!", DataResource::getName())); return base->getInteriorLayoutFileName(); } } const std::string & value = m_interiorLayoutFileName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -226,12 +226,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp index 1cdcca72..0c319760 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedCellObjectTemplate::getTemplateVersion(void) const */ Tag SharedCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCellObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp index ba6ece47..ab455e20 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag SharedConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedConstructionContractObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp index 5254f31c..6c5c3db1 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp @@ -104,10 +104,10 @@ Tag SharedCreatureObjectTemplate::getTemplateVersion(void) const */ Tag SharedCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCreatureObjectTemplate::getHighestTemplateVersion @@ -175,33 +175,33 @@ SharedCreatureObjectTemplate::Gender testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getGender(true); #endif } if (!m_gender.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter gender in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter gender has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter gender has not been defined in template %s!", DataResource::getName())); return base->getGender(); } } Gender value = static_cast(m_gender.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -217,33 +217,33 @@ SharedCreatureObjectTemplate::Niche testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNiche(true); #endif } if (!m_niche.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter niche in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter niche has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter niche has not been defined in template %s!", DataResource::getName())); return base->getNiche(); } } Niche value = static_cast(m_niche.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -259,33 +259,33 @@ SharedCreatureObjectTemplate::Species testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSpecies(true); #endif } if (!m_species.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter species in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter species has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter species has not been defined in template %s!", DataResource::getName())); return base->getSpecies(); } } Species value = static_cast(m_species.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -301,33 +301,33 @@ SharedCreatureObjectTemplate::Race testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getRace(true); #endif } if (!m_race.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter race in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter race has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter race has not been defined in template %s!", DataResource::getName())); return base->getRace(); } } Race value = static_cast(m_race.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -337,8 +337,8 @@ UNREF(testData); float SharedCreatureObjectTemplate::getAcceleration(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -346,14 +346,14 @@ float SharedCreatureObjectTemplate::getAcceleration(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAcceleration(index); } } @@ -363,9 +363,9 @@ float SharedCreatureObjectTemplate::getAcceleration(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAcceleration(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -386,8 +386,8 @@ float SharedCreatureObjectTemplate::getAcceleration(MovementTypes index) const float SharedCreatureObjectTemplate::getAccelerationMin(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -395,14 +395,14 @@ float SharedCreatureObjectTemplate::getAccelerationMin(MovementTypes index) cons DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAccelerationMin(index); } } @@ -412,9 +412,9 @@ float SharedCreatureObjectTemplate::getAccelerationMin(MovementTypes index) cons if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccelerationMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -435,8 +435,8 @@ float SharedCreatureObjectTemplate::getAccelerationMin(MovementTypes index) cons float SharedCreatureObjectTemplate::getAccelerationMax(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -444,14 +444,14 @@ float SharedCreatureObjectTemplate::getAccelerationMax(MovementTypes index) cons DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAccelerationMax(index); } } @@ -461,9 +461,9 @@ float SharedCreatureObjectTemplate::getAccelerationMax(MovementTypes index) cons if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccelerationMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -484,8 +484,8 @@ float SharedCreatureObjectTemplate::getAccelerationMax(MovementTypes index) cons float SharedCreatureObjectTemplate::getSpeed(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -493,14 +493,14 @@ float SharedCreatureObjectTemplate::getSpeed(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeed(index); } } @@ -510,9 +510,9 @@ float SharedCreatureObjectTemplate::getSpeed(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeed(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -533,8 +533,8 @@ float SharedCreatureObjectTemplate::getSpeed(MovementTypes index) const float SharedCreatureObjectTemplate::getSpeedMin(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -542,14 +542,14 @@ float SharedCreatureObjectTemplate::getSpeedMin(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeedMin(index); } } @@ -559,9 +559,9 @@ float SharedCreatureObjectTemplate::getSpeedMin(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeedMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -582,8 +582,8 @@ float SharedCreatureObjectTemplate::getSpeedMin(MovementTypes index) const float SharedCreatureObjectTemplate::getSpeedMax(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -591,14 +591,14 @@ float SharedCreatureObjectTemplate::getSpeedMax(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeedMax(index); } } @@ -608,9 +608,9 @@ float SharedCreatureObjectTemplate::getSpeedMax(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeedMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -631,8 +631,8 @@ float SharedCreatureObjectTemplate::getSpeedMax(MovementTypes index) const float SharedCreatureObjectTemplate::getTurnRate(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -640,14 +640,14 @@ float SharedCreatureObjectTemplate::getTurnRate(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRate(index); } } @@ -657,9 +657,9 @@ float SharedCreatureObjectTemplate::getTurnRate(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRate(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -680,8 +680,8 @@ float SharedCreatureObjectTemplate::getTurnRate(MovementTypes index) const float SharedCreatureObjectTemplate::getTurnRateMin(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -689,14 +689,14 @@ float SharedCreatureObjectTemplate::getTurnRateMin(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRateMin(index); } } @@ -706,9 +706,9 @@ float SharedCreatureObjectTemplate::getTurnRateMin(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRateMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -729,8 +729,8 @@ float SharedCreatureObjectTemplate::getTurnRateMin(MovementTypes index) const float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -738,14 +738,14 @@ float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRateMax(index); } } @@ -755,9 +755,9 @@ float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRateMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -784,33 +784,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAnimationMapFilename(true); #endif } if (!m_animationMapFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter animationMapFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter animationMapFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter animationMapFilename has not been defined in template %s!", DataResource::getName())); return base->getAnimationMapFilename(); } } const std::string & value = m_animationMapFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -826,26 +826,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModAngle(true); #endif } if (!m_slopeModAngle.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModAngle in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); return base->getSlopeModAngle(); } } @@ -855,9 +855,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModAngle(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -874,7 +874,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -890,26 +890,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModAngleMin(true); #endif } if (!m_slopeModAngle.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModAngle in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); return base->getSlopeModAngleMin(); } } @@ -919,9 +919,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModAngleMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -938,7 +938,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -954,26 +954,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModAngleMax(true); #endif } if (!m_slopeModAngle.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModAngle in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModAngle has not been defined in template %s!", DataResource::getName())); return base->getSlopeModAngleMax(); } } @@ -983,9 +983,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModAngleMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1002,7 +1002,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1018,26 +1018,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModPercent(true); #endif } if (!m_slopeModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); return base->getSlopeModPercent(); } } @@ -1047,9 +1047,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModPercent(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1066,7 +1066,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1082,26 +1082,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModPercentMin(true); #endif } if (!m_slopeModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); return base->getSlopeModPercentMin(); } } @@ -1111,9 +1111,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModPercentMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1130,7 +1130,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1146,26 +1146,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeModPercentMax(true); #endif } if (!m_slopeModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeModPercent has not been defined in template %s!", DataResource::getName())); return base->getSlopeModPercentMax(); } } @@ -1175,9 +1175,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeModPercentMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1194,7 +1194,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1210,26 +1210,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWaterModPercent(true); #endif } if (!m_waterModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter waterModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); return base->getWaterModPercent(); } } @@ -1239,9 +1239,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWaterModPercent(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1258,7 +1258,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1274,26 +1274,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWaterModPercentMin(true); #endif } if (!m_waterModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter waterModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); return base->getWaterModPercentMin(); } } @@ -1303,9 +1303,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWaterModPercentMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1322,7 +1322,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1338,26 +1338,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWaterModPercentMax(true); #endif } if (!m_waterModPercent.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter waterModPercent in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter waterModPercent has not been defined in template %s!", DataResource::getName())); return base->getWaterModPercentMax(); } } @@ -1367,9 +1367,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWaterModPercentMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1386,7 +1386,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1402,26 +1402,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getStepHeight(true); #endif } if (!m_stepHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter stepHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); return base->getStepHeight(); } } @@ -1431,9 +1431,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getStepHeight(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1450,7 +1450,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1466,26 +1466,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getStepHeightMin(true); #endif } if (!m_stepHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter stepHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); return base->getStepHeightMin(); } } @@ -1495,9 +1495,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getStepHeightMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1514,7 +1514,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1530,26 +1530,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getStepHeightMax(true); #endif } if (!m_stepHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter stepHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter stepHeight has not been defined in template %s!", DataResource::getName())); return base->getStepHeightMax(); } } @@ -1559,9 +1559,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getStepHeightMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1578,7 +1578,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1594,26 +1594,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionHeight(true); #endif } if (!m_collisionHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); return base->getCollisionHeight(); } } @@ -1623,9 +1623,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionHeight(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1642,7 +1642,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1658,26 +1658,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionHeightMin(true); #endif } if (!m_collisionHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); return base->getCollisionHeightMin(); } } @@ -1687,9 +1687,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionHeightMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1706,7 +1706,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1722,26 +1722,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionHeightMax(true); #endif } if (!m_collisionHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionHeight has not been defined in template %s!", DataResource::getName())); return base->getCollisionHeightMax(); } } @@ -1751,9 +1751,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionHeightMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1770,7 +1770,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1786,26 +1786,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionRadius(true); #endif } if (!m_collisionRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); return base->getCollisionRadius(); } } @@ -1815,9 +1815,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1834,7 +1834,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1850,26 +1850,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionRadiusMin(true); #endif } if (!m_collisionRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); return base->getCollisionRadiusMin(); } } @@ -1879,9 +1879,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1898,7 +1898,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1914,26 +1914,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionRadiusMax(true); #endif } if (!m_collisionRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionRadius has not been defined in template %s!", DataResource::getName())); return base->getCollisionRadiusMax(); } } @@ -1943,9 +1943,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1962,7 +1962,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1978,33 +1978,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMovementDatatable(true); #endif } if (!m_movementDatatable.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter movementDatatable in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter movementDatatable has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter movementDatatable has not been defined in template %s!", DataResource::getName())); return base->getMovementDatatable(); } } const std::string & value = m_movementDatatable.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2014,8 +2014,8 @@ UNREF(testData); bool SharedCreatureObjectTemplate::getPostureAlignToTerrain(Postures index) const { - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -2023,14 +2023,14 @@ bool SharedCreatureObjectTemplate::getPostureAlignToTerrain(Postures index) cons DEBUG_FATAL(index < 0 || index >= 15, ("template param index out of range")); if (!m_postureAlignToTerrain[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter postureAlignToTerrain in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter postureAlignToTerrain has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter postureAlignToTerrain has not been defined in template %s!", DataResource::getName())); return base->getPostureAlignToTerrain(index); } } @@ -2047,26 +2047,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSwimHeight(true); #endif } if (!m_swimHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter swimHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); return base->getSwimHeight(); } } @@ -2076,9 +2076,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSwimHeight(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2095,7 +2095,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2111,26 +2111,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSwimHeightMin(true); #endif } if (!m_swimHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter swimHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); return base->getSwimHeightMin(); } } @@ -2140,9 +2140,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSwimHeightMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2159,7 +2159,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2175,26 +2175,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSwimHeightMax(true); #endif } if (!m_swimHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter swimHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter swimHeight has not been defined in template %s!", DataResource::getName())); return base->getSwimHeightMax(); } } @@ -2204,9 +2204,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSwimHeightMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2223,7 +2223,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2239,26 +2239,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWarpTolerance(true); #endif } if (!m_warpTolerance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter warpTolerance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); return base->getWarpTolerance(); } } @@ -2268,9 +2268,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWarpTolerance(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2287,7 +2287,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2303,26 +2303,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWarpToleranceMin(true); #endif } if (!m_warpTolerance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter warpTolerance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); return base->getWarpToleranceMin(); } } @@ -2332,9 +2332,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWarpToleranceMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2351,7 +2351,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2367,26 +2367,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWarpToleranceMax(true); #endif } if (!m_warpTolerance.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter warpTolerance in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter warpTolerance has not been defined in template %s!", DataResource::getName())); return base->getWarpToleranceMax(); } } @@ -2396,9 +2396,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWarpToleranceMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2415,7 +2415,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2431,26 +2431,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetX(true); #endif } if (!m_collisionOffsetX.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetX in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetX(); } } @@ -2460,9 +2460,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetX(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2479,7 +2479,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2495,26 +2495,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetXMin(true); #endif } if (!m_collisionOffsetX.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetX in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetXMin(); } } @@ -2524,9 +2524,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetXMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2543,7 +2543,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2559,26 +2559,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetXMax(true); #endif } if (!m_collisionOffsetX.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetX in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetX has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetXMax(); } } @@ -2588,9 +2588,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetXMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2607,7 +2607,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2623,26 +2623,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetZ(true); #endif } if (!m_collisionOffsetZ.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetZ in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetZ(); } } @@ -2652,9 +2652,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetZ(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2671,7 +2671,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2687,26 +2687,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetZMin(true); #endif } if (!m_collisionOffsetZ.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetZ in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetZMin(); } } @@ -2716,9 +2716,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetZMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2735,7 +2735,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2751,26 +2751,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionOffsetZMax(true); #endif } if (!m_collisionOffsetZ.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionOffsetZ in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionOffsetZ has not been defined in template %s!", DataResource::getName())); return base->getCollisionOffsetZMax(); } } @@ -2780,9 +2780,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionOffsetZMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2799,7 +2799,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2815,26 +2815,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionLength(true); #endif } if (!m_collisionLength.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionLength in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); return base->getCollisionLength(); } } @@ -2844,9 +2844,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionLength(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2863,7 +2863,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2879,26 +2879,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionLengthMin(true); #endif } if (!m_collisionLength.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionLength in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); return base->getCollisionLengthMin(); } } @@ -2908,9 +2908,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionLengthMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2927,7 +2927,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2943,26 +2943,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCollisionLengthMax(true); #endif } if (!m_collisionLength.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter collisionLength in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter collisionLength has not been defined in template %s!", DataResource::getName())); return base->getCollisionLengthMax(); } } @@ -2972,9 +2972,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCollisionLengthMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2991,7 +2991,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3007,26 +3007,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCameraHeight(true); #endif } if (!m_cameraHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cameraHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); return base->getCameraHeight(); } } @@ -3036,9 +3036,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCameraHeight(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3055,7 +3055,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3071,26 +3071,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCameraHeightMin(true); #endif } if (!m_cameraHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cameraHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); return base->getCameraHeightMin(); } } @@ -3100,9 +3100,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCameraHeightMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3119,7 +3119,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3135,26 +3135,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedCreatureObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedCreatureObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCameraHeightMax(true); #endif } if (!m_cameraHeight.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cameraHeight in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cameraHeight has not been defined in template %s!", DataResource::getName())); return base->getCameraHeightMax(); } } @@ -3164,9 +3164,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCameraHeightMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -3183,7 +3183,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -3258,12 +3258,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp index fe3956f4..961cebca 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp @@ -55,7 +55,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); } @@ -64,7 +64,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); } @@ -116,10 +116,10 @@ Tag SharedDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -127,28 +127,28 @@ Tag SharedDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const //@BEGIN TFD void SharedDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlots(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -170,28 +170,28 @@ void SharedDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde void SharedDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlotsMin(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -213,28 +213,28 @@ void SharedDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i void SharedDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_slotsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slots has not been defined in template %s!", DataResource::getName())); base->getSlotsMax(data, index); return; } } - if (m_slotsAppend && base != NULL) + if (m_slotsAppend && base != nullptr) { int baseCount = base->getSlotsCount(); if (index < baseCount) @@ -258,20 +258,20 @@ size_t SharedDraftSchematicObjectTemplate::getSlotsCount(void) const { if (!m_slotsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getSlotsCount(); } size_t count = m_slots.size(); // if we are extending our base template, add it's count - if (m_slotsAppend && m_baseData != NULL) + if (m_slotsAppend && m_baseData != nullptr) { const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getSlotsCount(); } @@ -280,28 +280,28 @@ size_t SharedDraftSchematicObjectTemplate::getSlotsCount(void) const void SharedDraftSchematicObjectTemplate::getAttributes(SchematicAttribute &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributes(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -324,28 +324,28 @@ void SharedDraftSchematicObjectTemplate::getAttributes(SchematicAttribute &data, void SharedDraftSchematicObjectTemplate::getAttributesMin(SchematicAttribute &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributesMin(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -368,28 +368,28 @@ void SharedDraftSchematicObjectTemplate::getAttributesMin(SchematicAttribute &da void SharedDraftSchematicObjectTemplate::getAttributesMax(SchematicAttribute &data, int index) const { - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_attributesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attributes has not been defined in template %s!", DataResource::getName())); base->getAttributesMax(data, index); return; } } - if (m_attributesAppend && base != NULL) + if (m_attributesAppend && base != nullptr) { int baseCount = base->getAttributesCount(); if (index < baseCount) @@ -414,20 +414,20 @@ size_t SharedDraftSchematicObjectTemplate::getAttributesCount(void) const { if (!m_attributesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getAttributesCount(); } size_t count = m_attributes.size(); // if we are extending our base template, add it's count - if (m_attributesAppend && m_baseData != NULL) + if (m_attributesAppend && m_baseData != nullptr) { const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getAttributesCount(); } @@ -442,33 +442,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCraftedSharedTemplate(true); #endif } if (!m_craftedSharedTemplate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter craftedSharedTemplate in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter craftedSharedTemplate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter craftedSharedTemplate has not been defined in template %s!", DataResource::getName())); return base->getCraftedSharedTemplate(); } } const std::string & value = m_craftedSharedTemplate.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -514,12 +514,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -548,7 +548,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); m_slotsAppend = file.read_bool8(); @@ -567,7 +567,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); m_attributesAppend = file.read_bool8(); @@ -646,33 +646,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -688,33 +688,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getHardpoint(true); #endif } if (!m_hardpoint.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter hardpoint in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter hardpoint has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter hardpoint has not been defined in template %s!", DataResource::getName())); return base->getHardpoint(versionOk); } } const std::string & value = m_hardpoint.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -819,33 +819,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getName(true); #endif } if (!m_name.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter name has not been defined in template %s!", DataResource::getName())); return base->getName(versionOk); } } const StringId value = m_name.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -861,33 +861,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getExperiment(true); #endif } if (!m_experiment.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter experiment in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter experiment has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter experiment has not been defined in template %s!", DataResource::getName())); return base->getExperiment(versionOk); } } const StringId value = m_experiment.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -903,26 +903,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValue(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValue(versionOk); } } @@ -932,9 +932,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -951,7 +951,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -967,26 +967,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMin(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMin(versionOk); } } @@ -996,9 +996,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1015,7 +1015,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1031,26 +1031,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = NULL; - if (m_baseData != NULL) + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getValueMax(true); #endif } if (!m_value.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter value has not been defined in template %s!", DataResource::getName())); return base->getValueMax(versionOk); } } @@ -1060,9 +1060,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1079,7 +1079,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp index 5a07a293..4a7e73fa 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedFactoryObjectTemplate::getTemplateVersion(void) const */ Tag SharedFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedFactoryObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp index 1c30083d..d3c1d6d0 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedGroupObjectTemplate::getTemplateVersion(void) const */ Tag SharedGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGroupObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp index 4243b93c..e57241db 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedGuildObjectTemplate::getTemplateVersion(void) const */ Tag SharedGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGuildObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp index 08158117..5e66bbf1 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedInstallationObjectTemplate::getTemplateVersion(void) const */ Tag SharedInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedInstallationObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp index 0e9edb7c..4934dd40 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedIntangibleObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp index c4840885..3c8ad274 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag SharedJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag SharedJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedJediManagerObjectTemplate::getHighestTemplateVersion @@ -141,12 +141,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp index 8b5e0965..de9c8b4d 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp index b2745f8e..10eaba74 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedMissionObjectTemplate::getTemplateVersion(void) const */ Tag SharedMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedMissionObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp index 034adea5..dc0fe57a 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp @@ -109,8 +109,8 @@ SharedObjectTemplate::SharedObjectTemplate(const std::string & filename) : ObjectTemplate(filename) ,m_versionOk(true) //@END TFD INIT - , m_slotDescriptor(NULL) - , m_arrangementDescriptor(NULL) + , m_slotDescriptor(nullptr) + , m_arrangementDescriptor(nullptr) , m_clientData (0) , m_preloadManager (0) { @@ -232,10 +232,10 @@ Tag SharedObjectTemplate::getTemplateVersion(void) const */ Tag SharedObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedObjectTemplate::getHighestTemplateVersion @@ -274,33 +274,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getObjectName(true); #endif } if (!m_objectName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter objectName in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter objectName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter objectName has not been defined in template %s!", DataResource::getName())); return base->getObjectName(); } } const StringId value = m_objectName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -316,33 +316,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDetailedDescription(true); #endif } if (!m_detailedDescription.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter detailedDescription in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter detailedDescription has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter detailedDescription has not been defined in template %s!", DataResource::getName())); return base->getDetailedDescription(); } } const StringId value = m_detailedDescription.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -358,33 +358,33 @@ StringId testDataValue = DefaultStringId; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLookAtText(true); #endif } if (!m_lookAtText.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter lookAtText in template %s", DataResource::getName())); return DefaultStringId; } else { - DEBUG_FATAL(base == NULL, ("Template parameter lookAtText has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter lookAtText has not been defined in template %s!", DataResource::getName())); return base->getLookAtText(); } } const StringId value = m_lookAtText.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -400,33 +400,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSnapToTerrain(true); #endif } if (!m_snapToTerrain.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter snapToTerrain in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter snapToTerrain has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter snapToTerrain has not been defined in template %s!", DataResource::getName())); return base->getSnapToTerrain(); } } bool value = m_snapToTerrain.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -442,33 +442,33 @@ SharedObjectTemplate::ContainerType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getContainerType(true); #endif } if (!m_containerType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter containerType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter containerType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter containerType has not been defined in template %s!", DataResource::getName())); return base->getContainerType(); } } ContainerType value = static_cast(m_containerType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -484,26 +484,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getContainerVolumeLimit(true); #endif } if (!m_containerVolumeLimit.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter containerVolumeLimit in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); return base->getContainerVolumeLimit(); } } @@ -513,9 +513,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getContainerVolumeLimit(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -532,7 +532,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -548,26 +548,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getContainerVolumeLimitMin(true); #endif } if (!m_containerVolumeLimit.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter containerVolumeLimit in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); return base->getContainerVolumeLimitMin(); } } @@ -577,9 +577,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getContainerVolumeLimitMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -596,7 +596,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -612,26 +612,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getContainerVolumeLimitMax(true); #endif } if (!m_containerVolumeLimit.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter containerVolumeLimit in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter containerVolumeLimit has not been defined in template %s!", DataResource::getName())); return base->getContainerVolumeLimitMax(); } } @@ -641,9 +641,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getContainerVolumeLimitMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -660,7 +660,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -676,33 +676,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTintPalette(true); #endif } if (!m_tintPalette.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter tintPalette in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter tintPalette has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter tintPalette has not been defined in template %s!", DataResource::getName())); return base->getTintPalette(); } } const std::string & value = m_tintPalette.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -718,33 +718,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlotDescriptorFilename(true); #endif } if (!m_slotDescriptorFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slotDescriptorFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slotDescriptorFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slotDescriptorFilename has not been defined in template %s!", DataResource::getName())); return base->getSlotDescriptorFilename(); } } const std::string & value = m_slotDescriptorFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -760,33 +760,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getArrangementDescriptorFilename(true); #endif } if (!m_arrangementDescriptorFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter arrangementDescriptorFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter arrangementDescriptorFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter arrangementDescriptorFilename has not been defined in template %s!", DataResource::getName())); return base->getArrangementDescriptorFilename(); } } const std::string & value = m_arrangementDescriptorFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -802,33 +802,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAppearanceFilename(true); #endif } if (!m_appearanceFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter appearanceFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter appearanceFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter appearanceFilename has not been defined in template %s!", DataResource::getName())); return base->getAppearanceFilename(); } } const std::string & value = m_appearanceFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -844,33 +844,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPortalLayoutFilename(true); #endif } if (!m_portalLayoutFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter portalLayoutFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter portalLayoutFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter portalLayoutFilename has not been defined in template %s!", DataResource::getName())); return base->getPortalLayoutFilename(); } } const std::string & value = m_portalLayoutFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -886,33 +886,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClientDataFile(true); #endif } if (!m_clientDataFile.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clientDataFile in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter clientDataFile has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clientDataFile has not been defined in template %s!", DataResource::getName())); return base->getClientDataFile(); } } const std::string & value = m_clientDataFile.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -928,26 +928,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScale(true); #endif } if (!m_scale.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scale in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); return base->getScale(); } } @@ -957,9 +957,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScale(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -976,7 +976,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -992,26 +992,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScaleMin(true); #endif } if (!m_scale.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scale in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); return base->getScaleMin(); } } @@ -1021,9 +1021,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScaleMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1040,7 +1040,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1056,26 +1056,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScaleMax(true); #endif } if (!m_scale.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scale in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scale has not been defined in template %s!", DataResource::getName())); return base->getScaleMax(); } } @@ -1085,9 +1085,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScaleMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1104,7 +1104,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1120,33 +1120,33 @@ SharedObjectTemplate::GameObjectType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getGameObjectType(true); #endif } if (!m_gameObjectType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter gameObjectType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter gameObjectType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter gameObjectType has not been defined in template %s!", DataResource::getName())); return base->getGameObjectType(); } } GameObjectType value = static_cast(m_gameObjectType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1162,33 +1162,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSendToClient(true); #endif } if (!m_sendToClient.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter sendToClient in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter sendToClient has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter sendToClient has not been defined in template %s!", DataResource::getName())); return base->getSendToClient(); } } bool value = m_sendToClient.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1204,26 +1204,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScaleThresholdBeforeExtentTest(true); #endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scaleThresholdBeforeExtentTest in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); return base->getScaleThresholdBeforeExtentTest(); } } @@ -1233,9 +1233,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScaleThresholdBeforeExtentTest(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1252,7 +1252,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1268,26 +1268,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScaleThresholdBeforeExtentTestMin(true); #endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scaleThresholdBeforeExtentTest in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); return base->getScaleThresholdBeforeExtentTestMin(); } } @@ -1297,9 +1297,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScaleThresholdBeforeExtentTestMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1316,7 +1316,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1332,26 +1332,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getScaleThresholdBeforeExtentTestMax(true); #endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter scaleThresholdBeforeExtentTest in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter scaleThresholdBeforeExtentTest has not been defined in template %s!", DataResource::getName())); return base->getScaleThresholdBeforeExtentTestMax(); } } @@ -1361,9 +1361,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getScaleThresholdBeforeExtentTestMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1380,7 +1380,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1396,26 +1396,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClearFloraRadius(true); #endif } if (!m_clearFloraRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clearFloraRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); return base->getClearFloraRadius(); } } @@ -1425,9 +1425,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getClearFloraRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1444,7 +1444,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1460,26 +1460,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClearFloraRadiusMin(true); #endif } if (!m_clearFloraRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clearFloraRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); return base->getClearFloraRadiusMin(); } } @@ -1489,9 +1489,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getClearFloraRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1508,7 +1508,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1524,26 +1524,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClearFloraRadiusMax(true); #endif } if (!m_clearFloraRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clearFloraRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clearFloraRadius has not been defined in template %s!", DataResource::getName())); return base->getClearFloraRadiusMax(); } } @@ -1553,9 +1553,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getClearFloraRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1572,7 +1572,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1588,33 +1588,33 @@ SharedObjectTemplate::SurfaceType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSurfaceType(true); #endif } if (!m_surfaceType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter surfaceType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter surfaceType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter surfaceType has not been defined in template %s!", DataResource::getName())); return base->getSurfaceType(); } } SurfaceType value = static_cast(m_surfaceType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1630,26 +1630,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNoBuildRadius(true); #endif } if (!m_noBuildRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter noBuildRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); return base->getNoBuildRadius(); } } @@ -1659,9 +1659,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNoBuildRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1678,7 +1678,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1694,26 +1694,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNoBuildRadiusMin(true); #endif } if (!m_noBuildRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter noBuildRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); return base->getNoBuildRadiusMin(); } } @@ -1723,9 +1723,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNoBuildRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1742,7 +1742,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1758,26 +1758,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getNoBuildRadiusMax(true); #endif } if (!m_noBuildRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter noBuildRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter noBuildRadius has not been defined in template %s!", DataResource::getName())); return base->getNoBuildRadiusMax(); } } @@ -1787,9 +1787,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getNoBuildRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1806,7 +1806,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1822,33 +1822,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getOnlyVisibleInTools(true); #endif } if (!m_onlyVisibleInTools.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter onlyVisibleInTools in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter onlyVisibleInTools has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter onlyVisibleInTools has not been defined in template %s!", DataResource::getName())); return base->getOnlyVisibleInTools(); } } bool value = m_onlyVisibleInTools.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1864,26 +1864,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLocationReservationRadius(true); #endif } if (!m_locationReservationRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter locationReservationRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); return base->getLocationReservationRadius(); } } @@ -1893,9 +1893,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLocationReservationRadius(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1912,7 +1912,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1928,26 +1928,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLocationReservationRadiusMin(true); #endif } if (!m_locationReservationRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter locationReservationRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); return base->getLocationReservationRadiusMin(); } } @@ -1957,9 +1957,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLocationReservationRadiusMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1976,7 +1976,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1992,26 +1992,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getLocationReservationRadiusMax(true); #endif } if (!m_locationReservationRadius.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter locationReservationRadius in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter locationReservationRadius has not been defined in template %s!", DataResource::getName())); return base->getLocationReservationRadiusMax(); } } @@ -2021,9 +2021,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getLocationReservationRadiusMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2040,7 +2040,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2056,33 +2056,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getForceNoCollision(true); #endif } if (!m_forceNoCollision.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter forceNoCollision in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter forceNoCollision has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter forceNoCollision has not been defined in template %s!", DataResource::getName())); return base->getForceNoCollision(); } } bool value = m_forceNoCollision.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2153,12 +2153,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp index 03213f9f..7d020a59 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag SharedPlayerObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerObjectTemplate::getHighestTemplateVersion @@ -141,12 +141,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp index c475f753..26380963 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag SharedPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerQuestObjectTemplate::getHighestTemplateVersion @@ -141,12 +141,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp index 9eb6e580..dbb0635d 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag SharedResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedResourceContainerObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp index 8dce0c07..e374302c 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -101,10 +101,10 @@ Tag SharedShipObjectTemplate::getTemplateVersion(void) const */ Tag SharedShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedShipObjectTemplate::getHighestTemplateVersion @@ -155,33 +155,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedShipObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedShipObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCockpitFilename(true); #endif } if (!m_cockpitFilename.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cockpitFilename in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cockpitFilename has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cockpitFilename has not been defined in template %s!", DataResource::getName())); return base->getCockpitFilename(); } } const std::string & value = m_cockpitFilename.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -197,33 +197,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedShipObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedShipObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getHasWings(true); #endif } if (!m_hasWings.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter hasWings in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter hasWings has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter hasWings has not been defined in template %s!", DataResource::getName())); return base->getHasWings(); } } bool value = m_hasWings.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -239,33 +239,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedShipObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedShipObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPlayerControlled(true); #endif } if (!m_playerControlled.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter playerControlled in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter playerControlled has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter playerControlled has not been defined in template %s!", DataResource::getName())); return base->getPlayerControlled(); } } bool value = m_playerControlled.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -281,33 +281,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedShipObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedShipObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getInteriorLayoutFileName(true); #endif } if (!m_interiorLayoutFileName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter interiorLayoutFileName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter interiorLayoutFileName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter interiorLayoutFileName has not been defined in template %s!", DataResource::getName())); return base->getInteriorLayoutFileName(); } } const std::string & value = m_interiorLayoutFileName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -356,12 +356,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp index 597d379a..3de71cf2 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedStaticObjectTemplate::getTemplateVersion(void) const */ Tag SharedStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedStaticObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp index 57f841e2..95742f60 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp @@ -73,7 +73,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_paletteColorCustomizationVariables.clear(); } @@ -82,7 +82,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_rangedIntCustomizationVariables.begin(); iter != m_rangedIntCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_rangedIntCustomizationVariables.clear(); } @@ -91,7 +91,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_constStringCustomizationVariables.begin(); iter != m_constStringCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_constStringCustomizationVariables.clear(); } @@ -100,7 +100,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_socketDestinations.begin(); iter != m_socketDestinations.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_socketDestinations.clear(); } @@ -109,7 +109,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_certificationsRequired.begin(); iter != m_certificationsRequired.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_certificationsRequired.clear(); } @@ -118,7 +118,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_customizationVariableMapping.begin(); iter != m_customizationVariableMapping.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_customizationVariableMapping.clear(); } @@ -176,10 +176,10 @@ Tag SharedTangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTangibleObjectTemplate::getHighestTemplateVersion @@ -355,28 +355,28 @@ void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec //@BEGIN TFD void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariables(PaletteColorCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_paletteColorCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getPaletteColorCustomizationVariables(data, index); return; } } - if (m_paletteColorCustomizationVariablesAppend && base != NULL) + if (m_paletteColorCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) @@ -399,28 +399,28 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariables(Palette void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMin(PaletteColorCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_paletteColorCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getPaletteColorCustomizationVariablesMin(data, index); return; } } - if (m_paletteColorCustomizationVariablesAppend && base != NULL) + if (m_paletteColorCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) @@ -443,28 +443,28 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMin(Pale void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMax(PaletteColorCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_paletteColorCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter paletteColorCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getPaletteColorCustomizationVariablesMax(data, index); return; } } - if (m_paletteColorCustomizationVariablesAppend && base != NULL) + if (m_paletteColorCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) @@ -489,20 +489,20 @@ size_t SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesCount( { if (!m_paletteColorCustomizationVariablesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getPaletteColorCustomizationVariablesCount(); } size_t count = m_paletteColorCustomizationVariables.size(); // if we are extending our base template, add it's count - if (m_paletteColorCustomizationVariablesAppend && m_baseData != NULL) + if (m_paletteColorCustomizationVariablesAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getPaletteColorCustomizationVariablesCount(); } @@ -511,28 +511,28 @@ size_t SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesCount( void SharedTangibleObjectTemplate::getRangedIntCustomizationVariables(RangedIntCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_rangedIntCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getRangedIntCustomizationVariables(data, index); return; } } - if (m_rangedIntCustomizationVariablesAppend && base != NULL) + if (m_rangedIntCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) @@ -556,28 +556,28 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariables(RangedIntC void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMin(RangedIntCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_rangedIntCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getRangedIntCustomizationVariablesMin(data, index); return; } } - if (m_rangedIntCustomizationVariablesAppend && base != NULL) + if (m_rangedIntCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) @@ -601,28 +601,28 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMin(RangedI void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMax(RangedIntCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_rangedIntCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter rangedIntCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getRangedIntCustomizationVariablesMax(data, index); return; } } - if (m_rangedIntCustomizationVariablesAppend && base != NULL) + if (m_rangedIntCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) @@ -648,20 +648,20 @@ size_t SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesCount(voi { if (!m_rangedIntCustomizationVariablesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getRangedIntCustomizationVariablesCount(); } size_t count = m_rangedIntCustomizationVariables.size(); // if we are extending our base template, add it's count - if (m_rangedIntCustomizationVariablesAppend && m_baseData != NULL) + if (m_rangedIntCustomizationVariablesAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getRangedIntCustomizationVariablesCount(); } @@ -670,28 +670,28 @@ size_t SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesCount(voi void SharedTangibleObjectTemplate::getConstStringCustomizationVariables(ConstStringCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_constStringCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getConstStringCustomizationVariables(data, index); return; } } - if (m_constStringCustomizationVariablesAppend && base != NULL) + if (m_constStringCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) @@ -713,28 +713,28 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariables(ConstStr void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMin(ConstStringCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_constStringCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getConstStringCustomizationVariablesMin(data, index); return; } } - if (m_constStringCustomizationVariablesAppend && base != NULL) + if (m_constStringCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) @@ -756,28 +756,28 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMin(Const void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMax(ConstStringCustomizationVariable &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_constStringCustomizationVariablesLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter constStringCustomizationVariables has not been defined in template %s!", DataResource::getName())); base->getConstStringCustomizationVariablesMax(data, index); return; } } - if (m_constStringCustomizationVariablesAppend && base != NULL) + if (m_constStringCustomizationVariablesAppend && base != nullptr) { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) @@ -801,20 +801,20 @@ size_t SharedTangibleObjectTemplate::getConstStringCustomizationVariablesCount(v { if (!m_constStringCustomizationVariablesLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getConstStringCustomizationVariablesCount(); } size_t count = m_constStringCustomizationVariables.size(); // if we are extending our base template, add it's count - if (m_constStringCustomizationVariablesAppend && m_baseData != NULL) + if (m_constStringCustomizationVariablesAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getConstStringCustomizationVariablesCount(); } @@ -823,27 +823,27 @@ size_t SharedTangibleObjectTemplate::getConstStringCustomizationVariablesCount(v SharedTangibleObjectTemplate::GameObjectType SharedTangibleObjectTemplate::getSocketDestinations(int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_socketDestinationsLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter socketDestinations in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter socketDestinations has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter socketDestinations has not been defined in template %s!", DataResource::getName())); return base->getSocketDestinations(index); } } - if (m_socketDestinationsAppend && base != NULL) + if (m_socketDestinationsAppend && base != nullptr) { int baseCount = base->getSocketDestinationsCount(); if (index < baseCount) @@ -859,20 +859,20 @@ size_t SharedTangibleObjectTemplate::getSocketDestinationsCount(void) const { if (!m_socketDestinationsLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getSocketDestinationsCount(); } size_t count = m_socketDestinations.size(); // if we are extending our base template, add it's count - if (m_socketDestinationsAppend && m_baseData != NULL) + if (m_socketDestinationsAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getSocketDestinationsCount(); } @@ -887,33 +887,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getStructureFootprintFileName(true); #endif } if (!m_structureFootprintFileName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter structureFootprintFileName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter structureFootprintFileName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter structureFootprintFileName has not been defined in template %s!", DataResource::getName())); return base->getStructureFootprintFileName(); } } const std::string & value = m_structureFootprintFileName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -929,33 +929,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getUseStructureFootprintOutline(true); #endif } if (!m_useStructureFootprintOutline.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter useStructureFootprintOutline in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter useStructureFootprintOutline has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter useStructureFootprintOutline has not been defined in template %s!", DataResource::getName())); return base->getUseStructureFootprintOutline(); } } bool value = m_useStructureFootprintOutline.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -971,33 +971,33 @@ bool testDataValue = false; UNREF(testData); #endif - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTargetable(true); #endif } if (!m_targetable.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter targetable in template %s", DataResource::getName())); return false; } else { - DEBUG_FATAL(base == NULL, ("Template parameter targetable has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter targetable has not been defined in template %s!", DataResource::getName())); return base->getTargetable(); } } bool value = m_targetable.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1007,27 +1007,27 @@ UNREF(testData); const std::string & SharedTangibleObjectTemplate::getCertificationsRequired(int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_certificationsRequiredLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter certificationsRequired in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter certificationsRequired has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter certificationsRequired has not been defined in template %s!", DataResource::getName())); return base->getCertificationsRequired(index); } } - if (m_certificationsRequiredAppend && base != NULL) + if (m_certificationsRequiredAppend && base != nullptr) { int baseCount = base->getCertificationsRequiredCount(); if (index < baseCount) @@ -1044,20 +1044,20 @@ size_t SharedTangibleObjectTemplate::getCertificationsRequiredCount(void) const { if (!m_certificationsRequiredLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getCertificationsRequiredCount(); } size_t count = m_certificationsRequired.size(); // if we are extending our base template, add it's count - if (m_certificationsRequiredAppend && m_baseData != NULL) + if (m_certificationsRequiredAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getCertificationsRequiredCount(); } @@ -1066,28 +1066,28 @@ size_t SharedTangibleObjectTemplate::getCertificationsRequiredCount(void) const void SharedTangibleObjectTemplate::getCustomizationVariableMapping(CustomizationVariableMapping &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_customizationVariableMappingLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); base->getCustomizationVariableMapping(data, index); return; } } - if (m_customizationVariableMappingAppend && base != NULL) + if (m_customizationVariableMappingAppend && base != nullptr) { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) @@ -1109,28 +1109,28 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMapping(Customization void SharedTangibleObjectTemplate::getCustomizationVariableMappingMin(CustomizationVariableMapping &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_customizationVariableMappingLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); base->getCustomizationVariableMappingMin(data, index); return; } } - if (m_customizationVariableMappingAppend && base != NULL) + if (m_customizationVariableMappingAppend && base != nullptr) { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) @@ -1152,28 +1152,28 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMappingMin(Customizat void SharedTangibleObjectTemplate::getCustomizationVariableMappingMax(CustomizationVariableMapping &data, int index) const { - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } if (!m_customizationVariableMappingLoaded) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); return ; } else { - DEBUG_FATAL(base == NULL, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter customizationVariableMapping has not been defined in template %s!", DataResource::getName())); base->getCustomizationVariableMappingMax(data, index); return; } } - if (m_customizationVariableMappingAppend && base != NULL) + if (m_customizationVariableMappingAppend && base != nullptr) { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) @@ -1197,20 +1197,20 @@ size_t SharedTangibleObjectTemplate::getCustomizationVariableMappingCount(void) { if (!m_customizationVariableMappingLoaded) { - if (m_baseData == NULL) + if (m_baseData == nullptr) return 0; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - DEBUG_FATAL(base == NULL, ("base template wrong type")); + DEBUG_FATAL(base == nullptr, ("base template wrong type")); return base->getCustomizationVariableMappingCount(); } size_t count = m_customizationVariableMapping.size(); // if we are extending our base template, add it's count - if (m_customizationVariableMappingAppend && m_baseData != NULL) + if (m_customizationVariableMappingAppend && m_baseData != nullptr) { const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base != NULL) + if (base != nullptr) count += base->getCustomizationVariableMappingCount(); } @@ -1225,33 +1225,33 @@ SharedTangibleObjectTemplate::ClientVisabilityFlags testDataValue = static_cast< UNREF(testData); #endif - const SharedTangibleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getClientVisabilityFlag(true); #endif } if (!m_clientVisabilityFlag.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter clientVisabilityFlag in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter clientVisabilityFlag has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter clientVisabilityFlag has not been defined in template %s!", DataResource::getName())); return base->getClientVisabilityFlag(); } } ClientVisabilityFlags value = static_cast(m_clientVisabilityFlag.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1300,12 +1300,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -1334,7 +1334,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_paletteColorCustomizationVariables.clear(); m_paletteColorCustomizationVariablesAppend = file.read_bool8(); @@ -1353,7 +1353,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_rangedIntCustomizationVariables.begin(); iter != m_rangedIntCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_rangedIntCustomizationVariables.clear(); m_rangedIntCustomizationVariablesAppend = file.read_bool8(); @@ -1372,7 +1372,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_constStringCustomizationVariables.begin(); iter != m_constStringCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_constStringCustomizationVariables.clear(); m_constStringCustomizationVariablesAppend = file.read_bool8(); @@ -1391,7 +1391,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_socketDestinations.begin(); iter != m_socketDestinations.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_socketDestinations.clear(); m_socketDestinationsAppend = file.read_bool8(); @@ -1416,7 +1416,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_certificationsRequired.begin(); iter != m_certificationsRequired.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_certificationsRequired.clear(); m_certificationsRequiredAppend = file.read_bool8(); @@ -1435,7 +1435,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_customizationVariableMapping.begin(); iter != m_customizationVariableMapping.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_customizationVariableMapping.clear(); m_customizationVariableMappingAppend = file.read_bool8(); @@ -1514,33 +1514,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVariableName(true); #endif } if (!m_variableName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter variableName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); return base->getVariableName(versionOk); } } const std::string & value = m_variableName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1556,33 +1556,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getConstValue(true); #endif } if (!m_constValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constValue in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter constValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter constValue has not been defined in template %s!", DataResource::getName())); return base->getConstValue(versionOk); } } const std::string & value = m_constValue.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1687,33 +1687,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSourceVariable(true); #endif } if (!m_sourceVariable.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter sourceVariable in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter sourceVariable has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter sourceVariable has not been defined in template %s!", DataResource::getName())); return base->getSourceVariable(versionOk); } } const std::string & value = m_sourceVariable.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1729,33 +1729,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDependentVariable(true); #endif } if (!m_dependentVariable.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter dependentVariable in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter dependentVariable has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter dependentVariable has not been defined in template %s!", DataResource::getName())); return base->getDependentVariable(versionOk); } } const std::string & value = m_dependentVariable.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1860,33 +1860,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVariableName(true); #endif } if (!m_variableName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter variableName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); return base->getVariableName(versionOk); } } const std::string & value = m_variableName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1902,33 +1902,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getPalettePathName(true); #endif } if (!m_palettePathName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter palettePathName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter palettePathName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter palettePathName has not been defined in template %s!", DataResource::getName())); return base->getPalettePathName(versionOk); } } const std::string & value = m_palettePathName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1944,26 +1944,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultPaletteIndex(true); #endif } if (!m_defaultPaletteIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultPaletteIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); return base->getDefaultPaletteIndex(versionOk); } } @@ -1973,9 +1973,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultPaletteIndex(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1992,7 +1992,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2008,26 +2008,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultPaletteIndexMin(true); #endif } if (!m_defaultPaletteIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultPaletteIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); return base->getDefaultPaletteIndexMin(versionOk); } } @@ -2037,9 +2037,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultPaletteIndexMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2056,7 +2056,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2072,26 +2072,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultPaletteIndexMax(true); #endif } if (!m_defaultPaletteIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultPaletteIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultPaletteIndex has not been defined in template %s!", DataResource::getName())); return base->getDefaultPaletteIndexMax(versionOk); } } @@ -2101,9 +2101,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultPaletteIndexMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2120,7 +2120,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2229,33 +2229,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getVariableName(true); #endif } if (!m_variableName.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter variableName in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter variableName has not been defined in template %s!", DataResource::getName())); return base->getVariableName(versionOk); } } const std::string & value = m_variableName.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2271,26 +2271,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinValueInclusive(true); #endif } if (!m_minValueInclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minValueInclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); return base->getMinValueInclusive(versionOk); } } @@ -2300,9 +2300,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinValueInclusive(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2319,7 +2319,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2335,26 +2335,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinValueInclusiveMin(true); #endif } if (!m_minValueInclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minValueInclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); return base->getMinValueInclusiveMin(versionOk); } } @@ -2364,9 +2364,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinValueInclusiveMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2383,7 +2383,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2399,26 +2399,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMinValueInclusiveMax(true); #endif } if (!m_minValueInclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter minValueInclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter minValueInclusive has not been defined in template %s!", DataResource::getName())); return base->getMinValueInclusiveMax(versionOk); } } @@ -2428,9 +2428,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMinValueInclusiveMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2447,7 +2447,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2463,26 +2463,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultValue(true); #endif } if (!m_defaultValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); return base->getDefaultValue(versionOk); } } @@ -2492,9 +2492,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultValue(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2511,7 +2511,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2527,26 +2527,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultValueMin(true); #endif } if (!m_defaultValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); return base->getDefaultValueMin(versionOk); } } @@ -2556,9 +2556,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultValueMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2575,7 +2575,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2591,26 +2591,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getDefaultValueMax(true); #endif } if (!m_defaultValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter defaultValue in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter defaultValue has not been defined in template %s!", DataResource::getName())); return base->getDefaultValueMax(versionOk); } } @@ -2620,9 +2620,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getDefaultValueMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2639,7 +2639,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2655,26 +2655,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxValueExclusive(true); #endif } if (!m_maxValueExclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxValueExclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); return base->getMaxValueExclusive(versionOk); } } @@ -2684,9 +2684,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxValueExclusive(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2703,7 +2703,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2719,26 +2719,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxValueExclusiveMin(true); #endif } if (!m_maxValueExclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxValueExclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); return base->getMaxValueExclusiveMin(versionOk); } } @@ -2748,9 +2748,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxValueExclusiveMin(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2767,7 +2767,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -2783,26 +2783,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = NULL; - if (m_baseData != NULL) + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxValueExclusiveMax(true); #endif } if (!m_maxValueExclusive.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxValueExclusive in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxValueExclusive has not been defined in template %s!", DataResource::getName())); return base->getMaxValueExclusiveMax(versionOk); } } @@ -2812,9 +2812,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxValueExclusiveMax(versionOk); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -2831,7 +2831,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp index cd2c216b..b518a9f7 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedTerrainSurfaceObjectTemplate::getTemplateVersion(void) const */ Tag SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedTerrainSurfaceObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion @@ -111,26 +111,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedTerrainSurfaceObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTerrainSurfaceObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCover(true); #endif } if (!m_cover.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cover in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); return base->getCover(); } } @@ -140,9 +140,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCover(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -159,7 +159,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { if (testDataValue == value) DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); @@ -177,26 +177,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedTerrainSurfaceObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTerrainSurfaceObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCoverMin(true); #endif } if (!m_cover.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cover in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); return base->getCoverMin(); } } @@ -206,9 +206,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCoverMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -225,7 +225,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { if (testDataValue == value) DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); @@ -243,26 +243,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedTerrainSurfaceObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTerrainSurfaceObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getCoverMax(true); #endif } if (!m_cover.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter cover in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter cover has not been defined in template %s!", DataResource::getName())); return base->getCoverMax(); } } @@ -272,9 +272,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getCoverMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -291,7 +291,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { if (testDataValue == value) DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); @@ -309,33 +309,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedTerrainSurfaceObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedTerrainSurfaceObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSurfaceType(true); #endif } if (!m_surfaceType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter surfaceType in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter surfaceType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter surfaceType has not been defined in template %s!", DataResource::getName())); return base->getSurfaceType(); } } const std::string & value = m_surfaceType.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { if (testDataValue == value) DEBUG_WARNING(true, ("Template %s, parameter surfaceType is returning same value as base template.", DataResource::getName())); @@ -383,12 +383,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp index adf09d85..c6e9b692 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp @@ -95,10 +95,10 @@ Tag SharedUniverseObjectTemplate::getTemplateVersion(void) const */ Tag SharedUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedUniverseObjectTemplate::getHighestTemplateVersion @@ -141,12 +141,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp index ccc2cb77..7467cf59 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedVehicleObjectTemplate::getTemplateVersion(void) const */ Tag SharedVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedVehicleObjectTemplate::getHighestTemplateVersion @@ -105,8 +105,8 @@ Tag SharedVehicleObjectTemplate::getHighestTemplateVersion(void) const //@BEGIN TFD float SharedVehicleObjectTemplate::getSpeed(MovementTypes index) const { - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -114,14 +114,14 @@ float SharedVehicleObjectTemplate::getSpeed(MovementTypes index) const DEBUG_FATAL(index < 0 || index >= 5, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeed(index); } } @@ -131,9 +131,9 @@ float SharedVehicleObjectTemplate::getSpeed(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeed(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -154,8 +154,8 @@ float SharedVehicleObjectTemplate::getSpeed(MovementTypes index) const float SharedVehicleObjectTemplate::getSpeedMin(MovementTypes index) const { - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -163,14 +163,14 @@ float SharedVehicleObjectTemplate::getSpeedMin(MovementTypes index) const DEBUG_FATAL(index < 0 || index >= 5, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeedMin(index); } } @@ -180,9 +180,9 @@ float SharedVehicleObjectTemplate::getSpeedMin(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeedMin(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -203,8 +203,8 @@ float SharedVehicleObjectTemplate::getSpeedMin(MovementTypes index) const float SharedVehicleObjectTemplate::getSpeedMax(MovementTypes index) const { - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); } @@ -212,14 +212,14 @@ float SharedVehicleObjectTemplate::getSpeedMax(MovementTypes index) const DEBUG_FATAL(index < 0 || index >= 5, ("template param index out of range")); if (!m_speed[index].isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter speed in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter speed has not been defined in template %s!", DataResource::getName())); return base->getSpeedMax(index); } } @@ -229,9 +229,9 @@ float SharedVehicleObjectTemplate::getSpeedMax(MovementTypes index) const if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSpeedMax(index); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -258,26 +258,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeAversion(true); #endif } if (!m_slopeAversion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeAversion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); return base->getSlopeAversion(); } } @@ -287,9 +287,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeAversion(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -306,7 +306,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -322,26 +322,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeAversionMin(true); #endif } if (!m_slopeAversion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeAversion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); return base->getSlopeAversionMin(); } } @@ -351,9 +351,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeAversionMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -370,7 +370,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -386,26 +386,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getSlopeAversionMax(true); #endif } if (!m_slopeAversion.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slopeAversion in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter slopeAversion has not been defined in template %s!", DataResource::getName())); return base->getSlopeAversionMax(); } } @@ -415,9 +415,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getSlopeAversionMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -434,7 +434,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -450,26 +450,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getHoverValue(true); #endif } if (!m_hoverValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter hoverValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); return base->getHoverValue(); } } @@ -479,9 +479,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getHoverValue(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -498,7 +498,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -514,26 +514,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getHoverValueMin(true); #endif } if (!m_hoverValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter hoverValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); return base->getHoverValueMin(); } } @@ -543,9 +543,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getHoverValueMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -562,7 +562,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -578,26 +578,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getHoverValueMax(true); #endif } if (!m_hoverValue.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter hoverValue in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter hoverValue has not been defined in template %s!", DataResource::getName())); return base->getHoverValueMax(); } } @@ -607,9 +607,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getHoverValueMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -626,7 +626,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -642,26 +642,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTurnRate(true); #endif } if (!m_turnRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRate(); } } @@ -671,9 +671,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRate(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -690,7 +690,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -706,26 +706,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTurnRateMin(true); #endif } if (!m_turnRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRateMin(); } } @@ -735,9 +735,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRateMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -754,7 +754,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -770,26 +770,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getTurnRateMax(true); #endif } if (!m_turnRate.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter turnRate in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter turnRate has not been defined in template %s!", DataResource::getName())); return base->getTurnRateMax(); } } @@ -799,9 +799,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getTurnRateMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -818,7 +818,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -834,26 +834,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxVelocity(true); #endif } if (!m_maxVelocity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxVelocity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); return base->getMaxVelocity(); } } @@ -863,9 +863,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxVelocity(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -882,7 +882,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -898,26 +898,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxVelocityMin(true); #endif } if (!m_maxVelocity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxVelocity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); return base->getMaxVelocityMin(); } } @@ -927,9 +927,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxVelocityMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -946,7 +946,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -962,26 +962,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getMaxVelocityMax(true); #endif } if (!m_maxVelocity.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter maxVelocity in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter maxVelocity has not been defined in template %s!", DataResource::getName())); return base->getMaxVelocityMax(); } } @@ -991,9 +991,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getMaxVelocityMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1010,7 +1010,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1026,26 +1026,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAcceleration(true); #endif } if (!m_acceleration.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAcceleration(); } } @@ -1055,9 +1055,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAcceleration(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1074,7 +1074,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1090,26 +1090,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAccelerationMin(true); #endif } if (!m_acceleration.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAccelerationMin(); } } @@ -1119,9 +1119,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccelerationMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1138,7 +1138,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1154,26 +1154,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAccelerationMax(true); #endif } if (!m_acceleration.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter acceleration in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter acceleration has not been defined in template %s!", DataResource::getName())); return base->getAccelerationMax(); } } @@ -1183,9 +1183,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getAccelerationMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1202,7 +1202,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1218,26 +1218,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getBraking(true); #endif } if (!m_braking.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter braking in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); return base->getBraking(); } } @@ -1247,9 +1247,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getBraking(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1266,7 +1266,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1282,26 +1282,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getBrakingMin(true); #endif } if (!m_braking.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter braking in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); return base->getBrakingMin(); } } @@ -1311,9 +1311,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getBrakingMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1330,7 +1330,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1346,26 +1346,26 @@ float testDataValue = 0.0f; UNREF(testData); #endif - const SharedVehicleObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedVehicleObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getBrakingMax(true); #endif } if (!m_braking.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter braking in template %s", DataResource::getName())); return 0.0f; } else { - DEBUG_FATAL(base == NULL, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter braking has not been defined in template %s!", DataResource::getName())); return base->getBrakingMax(); } } @@ -1375,9 +1375,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { float baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getBrakingMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -1394,7 +1394,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -1451,12 +1451,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp index 71ef4b39..2d82cd46 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedWaypointObjectTemplate::getTemplateVersion(void) const */ Tag SharedWaypointObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedWaypointObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWaypointObjectTemplate::getHighestTemplateVersion @@ -140,12 +140,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp index 7c9fa977..193d4ac7 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag SharedWeaponObjectTemplate::getTemplateVersion(void) const */ Tag SharedWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWeaponObjectTemplate::getHighestTemplateVersion @@ -111,33 +111,33 @@ std::string testDataValue = DefaultString; UNREF(testData); #endif - const SharedWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWeaponEffect(true); #endif } if (!m_weaponEffect.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter weaponEffect in template %s", DataResource::getName())); return DefaultString; } else { - DEBUG_FATAL(base == NULL, ("Template parameter weaponEffect has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter weaponEffect has not been defined in template %s!", DataResource::getName())); return base->getWeaponEffect(); } } const std::string & value = m_weaponEffect.getValue(); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -153,26 +153,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWeaponEffectIndex(true); #endif } if (!m_weaponEffectIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter weaponEffectIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); return base->getWeaponEffectIndex(); } } @@ -182,9 +182,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWeaponEffectIndex(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -201,7 +201,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -217,26 +217,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWeaponEffectIndexMin(true); #endif } if (!m_weaponEffectIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter weaponEffectIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); return base->getWeaponEffectIndexMin(); } } @@ -246,9 +246,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWeaponEffectIndexMin(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -265,7 +265,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -281,26 +281,26 @@ int testDataValue = 0; UNREF(testData); #endif - const SharedWeaponObjectTemplate * base = NULL; - if (m_baseData != NULL) + const SharedWeaponObjectTemplate * base = nullptr; + if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getWeaponEffectIndexMax(true); #endif } if (!m_weaponEffectIndex.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter weaponEffectIndex in template %s", DataResource::getName())); return 0; } else { - DEBUG_FATAL(base == NULL, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter weaponEffectIndex has not been defined in template %s!", DataResource::getName())); return base->getWeaponEffectIndexMax(); } } @@ -310,9 +310,9 @@ UNREF(testData); if (delta == '+' || delta == '-' || delta == '_' || delta == '=') { int baseValue = 0; - if (m_baseData != NULL) + if (m_baseData != nullptr) { - if (base != NULL) + if (base != nullptr) baseValue = base->getWeaponEffectIndexMax(); else if (ms_allowDefaultTemplateParams) DEBUG_WARNING(true, ("No base template for delta, using 0")); @@ -329,7 +329,7 @@ UNREF(testData); value = baseValue - static_cast(baseValue * (value / 100.0f)); } #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -345,33 +345,33 @@ SharedWeaponObjectTemplate::AttackType testDataValue = static_cast(m_baseData); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) testDataValue = base->getAttackType(true); #endif } if (!m_attackType.isLoaded()) { - if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL) + if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attackType in template %s", DataResource::getName())); return static_cast(0); } else { - DEBUG_FATAL(base == NULL, ("Template parameter attackType has not been defined in template %s!", DataResource::getName())); + DEBUG_FATAL(base == nullptr, ("Template parameter attackType has not been defined in template %s!", DataResource::getName())); return base->getAttackType(); } } AttackType value = static_cast(m_attackType.getValue()); #ifdef _DEBUG - if (testData && base != NULL) + if (testData && base != nullptr) { } #endif @@ -420,12 +420,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedGame/src/shared/quest/Quest.cpp b/engine/shared/library/sharedGame/src/shared/quest/Quest.cpp index 7cfaccef..14d2fcab 100755 --- a/engine/shared/library/sharedGame/src/shared/quest/Quest.cpp +++ b/engine/shared/library/sharedGame/src/shared/quest/Quest.cpp @@ -358,7 +358,7 @@ int Quest::getNumberOfTasks() const QuestTask const * Quest::getTask(int const taskId) const { if (taskId < 0 || taskId >= getNumberOfTasks()) - return NULL; + return nullptr; return (*m_tasks)[static_cast(taskId)]; } diff --git a/engine/shared/library/sharedGame/src/shared/quest/QuestManager.cpp b/engine/shared/library/sharedGame/src/shared/quest/QuestManager.cpp index ef210b43..3ba36a15 100755 --- a/engine/shared/library/sharedGame/src/shared/quest/QuestManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/quest/QuestManager.cpp @@ -192,7 +192,7 @@ void QuestManager::remove() Quest const * QuestManager::getQuest(CrcString const & fileName) { Quest const * const quest = getQuest(fileName.getCrc()); - DEBUG_WARNING(quest == NULL, ("QuestManager::getQuest(%s): FAILED - testquest not found", fileName.getString())); + DEBUG_WARNING(quest == nullptr, ("QuestManager::getQuest(%s): FAILED - testquest not found", fileName.getString())); return quest; } @@ -200,7 +200,7 @@ Quest const * QuestManager::getQuest(CrcString const & fileName) Quest const * QuestManager::getQuest(uint32 const questCrc) { - Quest * quest = NULL; + Quest * quest = nullptr; //-- Look for the quest in the quest map QuestMap::iterator const iter = s_quests.find(questCrc); @@ -223,7 +223,7 @@ Quest const * QuestManager::getQuest(uint32 const questCrc) } } - DEBUG_WARNING(quest == NULL, ("QuestManager::getQuest: FAILED - testquest not found")); + DEBUG_WARNING(quest == nullptr, ("QuestManager::getQuest: FAILED - testquest not found")); return quest; } @@ -234,7 +234,7 @@ Quest const * QuestManager::getQuest(std::string const & questName) { TemporaryCrcString const fileName(questName.c_str(), true); Quest const * const quest = getQuest(fileName); - DEBUG_WARNING(quest == NULL, ("QuestManager::getQuest(%s): FAILED - testquest not found", questName.c_str())); + DEBUG_WARNING(quest == nullptr, ("QuestManager::getQuest(%s): FAILED - testquest not found", questName.c_str())); return quest; } diff --git a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp index 26b912b2..2fabba5e 100755 --- a/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp @@ -79,7 +79,7 @@ void AsteroidGenerationManager::install() DEBUG_FATAL(s_installed, ("AsteroidGenerationManager already installed")); s_installed = true; - ms_getRadiusFunction = NULL; + ms_getRadiusFunction = nullptr; ExitChain::add(AsteroidGenerationManager::remove, "AsteroidGenerationManager::remove"); } @@ -88,7 +88,7 @@ void AsteroidGenerationManager::install() void AsteroidGenerationManager::remove() { - ms_getRadiusFunction = NULL; + ms_getRadiusFunction = nullptr; clearStaticFieldData(); clearInstantiatedData(); @@ -381,7 +381,7 @@ bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldDat s_randomGenerator.setSeed(fieldData.seed); - WaveForm3D * splineWaveform = NULL; + WaveForm3D * splineWaveform = nullptr; if (fieldData.fieldType == AsteroidFieldData::FT_spline) { splineWaveform = new WaveForm3D; @@ -403,7 +403,7 @@ bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldDat { bool valid = false; std::vector collisionResult; - Sphere * s = NULL; + Sphere * s = nullptr; while(!valid) { //create asteroid locations until we find one that doesn't penetrate any existing objects @@ -444,11 +444,11 @@ bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldDat { DEBUG_REPORT_LOG_PRINT(ConfigSharedGame::getSpamAsteroidGenerationData(), ("Asteroid creation collision at [%f, %f, %f], radius [%f], trying again...\n", newAsteroid.position.x, newAsteroid.position.y, newAsteroid.position.z, s->getRadius())); delete s; - s = NULL; + s = nullptr; } } - NOT_NULL(s); //lint !e644 // s could be uninitialized (not true -- initialized to NULL above, should be set to a value during the while loop) + NOT_NULL(s); //lint !e644 // s could be uninitialized (not true -- initialized to nullptr above, should be set to a value during the while loop) SpatialSubdivisionHandle* handle = ms_collisionSphereTree.addObject(s); if(handle) diff --git a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp index 803c5a76..e48dc276 100755 --- a/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp @@ -52,7 +52,7 @@ namespace NebulaManagerNamespace }; typedef SphereTree NebulaSphereTree; - NebulaSphereTree * s_collisionSphereTree = NULL; + NebulaSphereTree * s_collisionSphereTree = nullptr; enum DatatableColumns { @@ -110,7 +110,7 @@ namespace NebulaManagerNamespace //---------------------------------------------------------------------- - NebulaManager::ImplementationClearFunction s_clearFunction = NULL; + NebulaManager::ImplementationClearFunction s_clearFunction = nullptr; } using namespace NebulaManagerNamespace; @@ -158,10 +158,10 @@ void NebulaManager::clear() s_nebulaMap.clear(); - if (s_collisionSphereTree != NULL) + if (s_collisionSphereTree != nullptr) { delete s_collisionSphereTree; - s_collisionSphereTree = NULL; + s_collisionSphereTree = nullptr; } //-- Remove nebulas for the current scene from the scene map @@ -178,7 +178,7 @@ void NebulaManager::clear() s_currentSceneId.clear(); - if (s_clearFunction != NULL) + if (s_clearFunction != nullptr) s_clearFunction(); } @@ -319,11 +319,11 @@ void NebulaManager::getNebulasInSphere(Vector const & pos, float const radius, N Nebula const * NebulaManager::getClosestNebula(Vector const & pos, float const maxDistance, float & outMinDistance, float & outMaxDistance) { - Nebula const * nebula = NULL; + Nebula const * nebula = nullptr; if (NON_NULL(s_collisionSphereTree)->findClosest(pos, maxDistance, nebula, outMinDistance, outMaxDistance)) return nebula; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -334,7 +334,7 @@ Nebula const * NebulaManager::getNebulaById(int const id) if (it != s_nebulaMap.end()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp index ab3b0672..6d014f13 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp @@ -211,7 +211,7 @@ bool ShipChassis::save(std::string const & filename) ShipChassisSlot const * const chassisSlot = shipChassis->getSlot(static_cast(chassisSlotType)); - if (NULL == chassisSlot) + if (nullptr == chassisSlot) { tabStr += "\t\t"; continue; @@ -249,7 +249,7 @@ bool ShipChassis::save(std::string const & filename) StdioFileFactory sff; AbstractFile * const af = sff.createFile(filename.c_str(), "wb"); - if (NULL != af && af->isOpen()) + if (nullptr != af && af->isOpen()) { int const bytesWritten = af->write(static_cast(tabStr.size()), tabStr.c_str()); retval = (bytesWritten == static_cast(tabStr.size())); @@ -317,7 +317,7 @@ ShipChassis const * ShipChassis::findShipChassisByName (CrcString const & if (it != s_nameChassisMap->end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -330,7 +330,7 @@ ShipChassis const * ShipChassis::findShipChassisByCrc (uint32 chassis if (it != s_crcChassisMap.end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -365,7 +365,7 @@ void ShipChassis::setSlotTargetable(int const chassisSlotType, bool targetable) { if (targetable) { - if (NULL == getSlot(static_cast(chassisSlotType))) + if (nullptr == getSlot(static_cast(chassisSlotType))) { WARNING(true, ("ShipChassis cannot set non existant slot [%d] targetable", chassisSlotType)); return; @@ -398,7 +398,7 @@ ShipChassisSlot * ShipChassis::getSlot(ShipChassisSlotType::Type shipChassisSlot return &slot; } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -582,7 +582,7 @@ void ShipChassis::setUseWritableChassis(bool onlyUseThisForTools) bool ShipChassis::addChassis(bool doSort) { - if (doSort && NULL != findShipChassisByCrc(getCrc())) + if (doSort && nullptr != findShipChassisByCrc(getCrc())) { WARNING(true, ("ShipChassis attempt to add multiple [%s] chassis", getName().getString())); return false; @@ -628,7 +628,7 @@ bool ShipChassis::removeChassis() bool ShipChassis::setName(CrcString const & name) { ShipChassis const * const dupeNameShipChassis = findShipChassisByName(name); - if (NULL != dupeNameShipChassis) + if (nullptr != dupeNameShipChassis) { WARNING(true, ("ShipChassis attempt to set name [%s] already exists", name.getString())); return false; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp index dec4fd3e..0830d52c 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp @@ -78,7 +78,7 @@ ShipChassisSlot::~ShipChassisSlot () std::for_each(m_compatibilities->begin(), m_compatibilities->end(), PointerDeleter()); m_compatibilities->clear(); delete m_compatibilities; - m_compatibilities = NULL; + m_compatibilities = nullptr; } //---------------------------------------------------------------------- @@ -145,7 +145,7 @@ bool ShipChassisSlot::canAcceptComponentType (int shipComponentType) const bool ShipChassisSlot::canAcceptCompatibility (CrcString const & compatibility) const { - //-- null compatibility components are universally accepted + //-- nullptr compatibility components are universally accepted if (compatibility.isEmpty ()) return true; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisWritable.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassisWritable.cpp index cfc58a90..b4f2c22a 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisWritable.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisWritable.cpp @@ -51,7 +51,7 @@ bool ShipChassisWritable::setName(CrcString const & name) { if (ShipChassis::setName(name)) { - if (NULL != findShipChassisByCrc(name.getCrc())) + if (nullptr != findShipChassisByCrc(name.getCrc())) Transceivers::chassisListChanged.emitMessage(true); return true; } @@ -72,7 +72,7 @@ void ShipChassisWritable::setSlotTargetable(int chassisSlotType, bool targetable { ShipChassisSlot * const chassisSlot = getSlot(static_cast(chassisSlotType)); - if (NULL == chassisSlot) + if (nullptr == chassisSlot) { WARNING(true, ("ShipChassisWritable::setSlotTargetable() invalid slot")); } diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp index 14897909..3a8dbd52 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp @@ -164,7 +164,7 @@ void ShipComponentAttachmentManager::load() ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName (TemporaryCrcString (componentName.c_str (), true)); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { WARNING (true, ("ShipComponentAttachmentManager chassis [%s] specified invalid component [%s] at row [%d] in file [%s]", name.getString (), componentName.c_str (), row, chassis_filename.c_str())); continue; @@ -266,7 +266,7 @@ bool ShipComponentAttachmentManager::save(std::string const & dsrcPath, std::str bool ShipComponentAttachmentManager::saveChassisInfo(std::string const & chassisName, std::string const & filenameTab, std::string const & filenameIff) { ShipChassis const * const chassis = ShipChassis::findShipChassisByName(ConstCharCrcString(chassisName.c_str())); - if (NULL == chassis) + if (nullptr == chassis) return false; uint32 const chassisCrc = chassis->getCrc(); @@ -283,7 +283,7 @@ bool ShipComponentAttachmentManager::saveChassisInfo(std::string const & chassis std::string const & componentName = *it; ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName(ConstCharCrcString(componentName.c_str())); - if (NULL == shipComponentDescriptor) + if (nullptr == shipComponentDescriptor) return false; uint32 const componentCrc = shipComponentDescriptor->getCrc(); @@ -333,7 +333,7 @@ bool ShipComponentAttachmentManager::saveChassisInfo(std::string const & chassis std::string const & componentName = *it; ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName(ConstCharCrcString(componentName.c_str())); - if (NULL == shipComponentDescriptor) + if (nullptr == shipComponentDescriptor) return false; uint32 const componentCrc = shipComponentDescriptor->getCrc(); @@ -427,7 +427,7 @@ bool ShipComponentAttachmentManager::saveChassisInfo(std::string const & chassis StdioFileFactory sff; AbstractFile * const af = sff.createFile(filenameTab.c_str(), "wb"); - if (NULL != af && af->isOpen()) + if (nullptr != af && af->isOpen()) { int const bytesWritten = af->write(static_cast(tabStr.size()), tabStr.c_str()); retval = (bytesWritten == static_cast(tabStr.size())); @@ -484,7 +484,7 @@ bool ShipComponentAttachmentManager::getAttachmentsForShip(uint32 chassisCrc, ui TemplateHardpointPairVector const & thpv = (*it).second; if (thpv.empty()) { - thpVectors[i] = NULL; + thpVectors[i] = nullptr; } else { @@ -493,7 +493,7 @@ bool ShipComponentAttachmentManager::getAttachmentsForShip(uint32 chassisCrc, ui } } else - thpVectors[i] = NULL; + thpVectors[i] = nullptr; } return found; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.cpp index 78a26512..ae4882b5 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentData.cpp @@ -53,7 +53,7 @@ ShipComponentData::~ShipComponentData () void ShipComponentData::printDebugString (Unicode::String & result, Unicode::String const & padding) const { - if (m_descriptor == NULL) + if (m_descriptor == nullptr) return; char buf [2048]; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp index 5c3560f0..b9e021b4 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp @@ -115,7 +115,7 @@ void ShipComponentDescriptor::load() DEBUG_WARNING(!sharedTemplateName.empty() && sharedCrcString.isEmpty(), ("Data error: in ship_components.tab - Component [%s] Shared template [%s] not found for row [%d]", name.c_str(), sharedTemplateName.c_str(), row)); #endif - ShipComponentDescriptor * componentDescriptor = NULL; + ShipComponentDescriptor * componentDescriptor = nullptr; if (s_useWritableComponentDescriptor) componentDescriptor = new ShipComponentDescriptorWritable (TemporaryCrcString (name.c_str (), true), type, TemporaryCrcString (compatibility.c_str (), true), serverObjectTemplateName, sharedTemplateName); @@ -174,7 +174,7 @@ bool ShipComponentDescriptor::save(std::string const & filename) StdioFileFactory sff; AbstractFile * const af = sff.createFile(filename.c_str(), "wb"); - if (NULL != af && af->isOpen()) + if (nullptr != af && af->isOpen()) { int const bytesWritten = af->write(static_cast(tabStr.size()), tabStr.c_str()); retval = (bytesWritten == static_cast(tabStr.size())); @@ -285,7 +285,7 @@ ShipComponentDescriptor const * ShipComponentDescriptor::findShipComponentDescri if (it != s_crcComponentMap.end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -297,7 +297,7 @@ ShipComponentDescriptor const * ShipComponentDescriptor::findShipComponentDescri if (it != s_nameComponentMap->end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -309,7 +309,7 @@ ShipComponentDescriptor const * ShipComponentDescriptor::findShipComponentDescri if (it != s_objectTemplateCrcComponentMap.end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -321,7 +321,7 @@ ShipComponentDescriptor const * ShipComponentDescriptor::findShipComponentDescri if (it != s_sharedObjectTemplateCrcComponentMap.end ()) return (*it).second; - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -348,7 +348,7 @@ ShipComponentDescriptor::StringVector ShipComponentDescriptor::getComponentDescr bool ShipComponentDescriptor::setName(std::string const & name) { ShipComponentDescriptor const * const dupeNameShipComponentDescriptor = findShipComponentDescriptorByName(ConstCharCrcString(name.c_str())); - if (NULL != dupeNameShipComponentDescriptor) + if (nullptr != dupeNameShipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor attempt to set name [%s] already exists", name.c_str())); return false; @@ -379,14 +379,14 @@ bool ShipComponentDescriptor::setName(std::string const & name) bool ShipComponentDescriptor::setObjectTemplateCrcs(uint32 crc, uint32 sharedCrc) { ShipComponentDescriptor const * const dupeTemplateShipComponentDescriptor = findShipComponentDescriptorByObjectTemplate(crc); - if (NULL != dupeTemplateShipComponentDescriptor && this != dupeTemplateShipComponentDescriptor) + if (nullptr != dupeTemplateShipComponentDescriptor && this != dupeTemplateShipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor attempt to set ot crc [%s] already exists", dupeTemplateShipComponentDescriptor->getName().getString())); return false; } ShipComponentDescriptor const * const dupeSharedTemplateShipComponentDescriptor = findShipComponentDescriptorBySharedObjectTemplate(crc); - if (NULL != dupeSharedTemplateShipComponentDescriptor && this != dupeSharedTemplateShipComponentDescriptor) + if (nullptr != dupeSharedTemplateShipComponentDescriptor && this != dupeSharedTemplateShipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor attempt to set shared ot crc [%s] already exists", dupeSharedTemplateShipComponentDescriptor->getName().getString())); return false; @@ -432,7 +432,7 @@ bool ShipComponentDescriptor::addShipComponentDescriptor(bool checkValidity, boo { { ShipComponentDescriptor const * const shipComponentDescriptor = findShipComponentDescriptorByName(m_name); - if (NULL != shipComponentDescriptor) + if (nullptr != shipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor::addShipComponentDescriptor name [%s] is already in map", m_name.getString())); return false; @@ -441,7 +441,7 @@ bool ShipComponentDescriptor::addShipComponentDescriptor(bool checkValidity, boo { ShipComponentDescriptor const * const shipComponentDescriptor = findShipComponentDescriptorByCrc(getCrc()); - if (NULL != shipComponentDescriptor) + if (nullptr != shipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor::addShipComponentDescriptor [%s] crc [0x%x] is already in map via [%s]", m_name.getString(), static_cast(getCrc()), shipComponentDescriptor->getName().getString())); return false; @@ -453,7 +453,7 @@ bool ShipComponentDescriptor::addShipComponentDescriptor(bool checkValidity, boo if (0 != objectTemplateCrc) { ShipComponentDescriptor const * const shipComponentDescriptor = findShipComponentDescriptorByObjectTemplate(objectTemplateCrc); - if (NULL != shipComponentDescriptor) + if (nullptr != shipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor::addShipComponentDescriptor [%s] server template [%s] [0x%x] is already in map via [%s]", m_name.getString(), getObjectTemplateName().c_str(), static_cast(getObjectTemplateCrc()), shipComponentDescriptor->getName().getString())); if (strict) @@ -467,7 +467,7 @@ bool ShipComponentDescriptor::addShipComponentDescriptor(bool checkValidity, boo if (0 != sharedObjectTemplateCrc) { ShipComponentDescriptor const * const shipComponentDescriptor = findShipComponentDescriptorBySharedObjectTemplate(sharedObjectTemplateCrc); - if (NULL != shipComponentDescriptor) + if (nullptr != shipComponentDescriptor) { WARNING(true, ("ShipComponentDescriptor::addShipComponentDescriptor [%s] shared template [%s] [0x%x] is already in map via [%s]", m_name.getString(), getSharedTemplateName().c_str(), static_cast(getSharedObjectTemplateCrc()), shipComponentDescriptor->getName().getString())); if (strict) diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptorWritable.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptorWritable.cpp index 8e3cf0fb..aa3e25a3 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptorWritable.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptorWritable.cpp @@ -85,7 +85,7 @@ bool ShipComponentDescriptorWritable::setName(std::string const & name) { if (ShipComponentDescriptor::setName(name)) { - if (NULL != ShipComponentDescriptor::findShipComponentDescriptorByCrc(Crc::normalizeAndCalculate(name.c_str()))) + if (nullptr != ShipComponentDescriptor::findShipComponentDescriptorByCrc(Crc::normalizeAndCalculate(name.c_str()))) { notifyChanged(); Transceivers::componentListChanged.emitMessage(true); diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp index 4e6559c7..f929434c 100755 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp @@ -76,7 +76,7 @@ void ShipComponentWeaponManager::install() DataTable * const dt = DataTableManager::getTable(filename, true); - if (dt == NULL) + if (dt == nullptr) { WARNING(true, ("ShipComponentWeaponManager no such datatable [%s]", filename.c_str())); return; @@ -90,7 +90,7 @@ void ShipComponentWeaponManager::install() ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName(TemporaryCrcString(componentName.c_str(), true)); - if (shipComponentDescriptor == NULL) + if (shipComponentDescriptor == nullptr) { WARNING(true, ("getComponentType datatable specified invalid component [%s]", componentName.c_str())); continue; diff --git a/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.cpp b/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.cpp index c0941d98..92c8403c 100755 --- a/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.cpp +++ b/engine/shared/library/sharedGame/src/shared/sui/SuiPageData.cpp @@ -93,7 +93,7 @@ bool SuiPageData::addCommand(SuiCommand const & command) SuiCommand const * const oldCommand = findSubscribeToEventCommand(eventType, targetWidget); - if (oldCommand != NULL) + if (oldCommand != nullptr) { WARNING(true, ("SuiPageData::addCommand attempt to add duplicate SCT_subscribeToEvent command. Type=[%d], target=[%s]", eventType, targetWidget.c_str())); return false; @@ -130,7 +130,7 @@ void SuiPageData::subscribeToPropertyForEvent(int eventType, std::string const & { SuiCommand * const command = findSubscribeToEventCommand(eventType, eventWidgetName); - if (command == NULL) + if (command == nullptr) { SuiCommand newCommand(SuiCommand::SCT_subscribeToEvent, eventWidgetName); newCommand.initSubscribeToEvent(eventType, std::string()); @@ -148,7 +148,7 @@ bool SuiPageData::subscribeToEvent(int eventType, std::string const & eventWidge { SuiCommand * const command = findSubscribeToEventCommand(eventType, eventWidgetName); - if (command == NULL) + if (command == nullptr) { SuiCommand newCommand(SuiCommand::SCT_subscribeToEvent, eventWidgetName); newCommand.initSubscribeToEvent(eventType, callback); @@ -182,7 +182,7 @@ SuiCommand * SuiPageData::findSubscribeToEventCommand(int const eventType, std:: } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- @@ -203,7 +203,7 @@ SuiCommand * SuiPageData::findSubscribeToEventCommandByIndex(int const index) } } - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp index 3957c9ab..e8f6f545 100755 --- a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp +++ b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp @@ -224,7 +224,7 @@ bool TargaFormat::loadImage(const char *filename, Image **image) const if (!image) { - REPORT_LOG(true, ("TargaFormat::loadImage(): null image pointer\n")); + REPORT_LOG(true, ("TargaFormat::loadImage(): nullptr image pointer\n")); return false; } *image = 0; @@ -257,7 +257,7 @@ bool TargaFormat::loadImageReformat(const char *filename, Image **image, Image:: if (!image) { - REPORT_LOG(true, ("TargaFormat::loadImage(): null image pointer\n")); + REPORT_LOG(true, ("TargaFormat::loadImage(): nullptr image pointer\n")); return false; } *image = 0; diff --git a/engine/shared/library/sharedIoWin/src/shared/IoWin.cpp b/engine/shared/library/sharedIoWin/src/shared/IoWin.cpp index 2d4eff3e..3cb565b1 100755 --- a/engine/shared/library/sharedIoWin/src/shared/IoWin.cpp +++ b/engine/shared/library/sharedIoWin/src/shared/IoWin.cpp @@ -22,7 +22,7 @@ IoWin::IoWin( const char *debugName // Name used for debugging purposes ) : ioDebugName(DuplicateString(debugName)), - ioNext(NULL) + ioNext(nullptr) { } @@ -37,9 +37,9 @@ IoWin::IoWin( IoWin::~IoWin(void) { delete [] ioDebugName; - ioDebugName = NULL; + ioDebugName = nullptr; - ioNext = NULL; + ioNext = nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedIoWin/src/shared/IoWinManager.cpp b/engine/shared/library/sharedIoWin/src/shared/IoWinManager.cpp index 5fc8ea5e..11da17d5 100755 --- a/engine/shared/library/sharedIoWin/src/shared/IoWinManager.cpp +++ b/engine/shared/library/sharedIoWin/src/shared/IoWinManager.cpp @@ -35,7 +35,7 @@ namespace IoWinManagerNamespace // Inactivity timer. float const s_defaultInactivityTimeSeconds = 15.0f * 60.0f; - IoWinManager::InactivityCallback s_inactivityCallback = NULL; + IoWinManager::InactivityCallback s_inactivityCallback = nullptr; Timer s_inactivityTimer(s_defaultInactivityTimeSeconds); bool s_isInactive = true; @@ -76,7 +76,7 @@ void IoWinManagerNamespace::triggerInactive(bool inactive) { if (!boolEqual(s_isInactive, inactive)) { - if (s_inactivityCallback != NULL) + if (s_inactivityCallback != nullptr) { (*s_inactivityCallback)(inactive); } @@ -105,7 +105,7 @@ IoEvent *IoWinManager::firstEvent; IoEvent *IoWinManager::lastEvent; MemoryBlockManager *IoWinManager::eventBlockManager; -IoWinManager::IMEFunctionPointer IoWinManager::imeFunction = NULL; +IoWinManager::IMEFunctionPointer IoWinManager::imeFunction = nullptr; // ====================================================================== // Install the IoWinManager @@ -122,8 +122,8 @@ IoWinManager::IMEFunctionPointer IoWinManager::imeFunction = NULL; void IoWinManager::install() { DEBUG_FATAL(installed, ("double install")); - top = NULL; - captured = NULL; + top = nullptr; + captured = nullptr; ExitChain::add(IoWinManager::remove, "IoWinManager::remove"); eventBlockManager = new MemoryBlockManager("IoWinManager eventBlockManager", true, sizeof(IoEvent), 0, 0, 0); installed = true; @@ -162,9 +162,9 @@ void IoWinManager::remove(void) IoResult result; IoEvent *event; - Os::setQueueCharacterHookFunction(NULL); - Os::setSetSystemMouseCursorPositionHookFunction(NULL); - Os::setQueueKeyDownHookFunction(NULL); + Os::setQueueCharacterHookFunction(nullptr); + Os::setSetSystemMouseCursorPositionHookFunction(nullptr); + Os::setQueueKeyDownHookFunction(nullptr); DEBUG_FATAL(!installed, ("not installed")); installed = false; @@ -191,7 +191,7 @@ void IoWinManager::remove(void) delete eventBlockManager; // Remove the inactivity timer. - registerInactivityCallback(NULL, 0.0f); + registerInactivityCallback(nullptr, 0.0f); } // ---------------------------------------------------------------------- @@ -229,10 +229,10 @@ void IoWinManager::debugReport() void IoWinManager::processEvents(float elapsedTime) { - IoWin * w = NULL; - IoWin * next = NULL; - IoEvent * queue = NULL; - IoEvent * event = NULL; + IoWin * w = nullptr; + IoWin * next = nullptr; + IoEvent * queue = nullptr; + IoEvent * event = nullptr; IoResult result; @@ -244,8 +244,8 @@ void IoWinManager::processEvents(float elapsedTime) queue->next = firstEvent; // the event list is now empty - firstEvent = NULL; - lastEvent = NULL; + firstEvent = nullptr; + lastEvent = nullptr; // Update the activity timer. if (!s_isInactive) @@ -267,7 +267,7 @@ void IoWinManager::processEvents(float elapsedTime) queue = queue->next; // keep people from peeking ahead in the event queue - event->next = NULL; + event->next = nullptr; // Check to see if the event resets @@ -310,7 +310,7 @@ void IoWinManager::processEvents(float elapsedTime) if (debugReportEvents) { - const char *name = NULL; + const char *name = nullptr; switch (event->type) { @@ -434,7 +434,7 @@ void IoWinManager::open(IoWin *window) // validate the arguments if (!window) { - DEBUG_FATAL(true, ("null window")); + DEBUG_FATAL(true, ("nullptr window")); return; //lint !e527 // Warning -- Unreachable } @@ -511,13 +511,13 @@ void IoWinManager::close(IoWin *window, bool allowDelete) // validate the arguments if (!window) { - DEBUG_FATAL(true, ("null window")); + DEBUG_FATAL(true, ("nullptr window")); return; //lint !e527 // Warning -- Unreachable } // linked list traversal with a back pointer IoWin *back, *front; - for (back = NULL, front = top; front && front != window; back = front, front = front->ioNext) + for (back = nullptr, front = top; front && front != window; back = front, front = front->ioNext) ; // verify the window was found @@ -528,7 +528,7 @@ void IoWinManager::close(IoWin *window, bool allowDelete) } // -qq- lint hack - DEBUG_FATAL(!window, ("null window")); + DEBUG_FATAL(!window, ("nullptr window")); // remove it from the singly linked list if (back) @@ -566,7 +566,7 @@ IoEvent *IoWinManager::newEvent(IoEventType eventType, int arg1, int arg2, real IoEvent * const event = reinterpret_cast(eventBlockManager->allocate()); // fill out the event data - event->next = NULL; + event->next = nullptr; event->type = eventType; event->arg1 = arg1; event->arg2 = arg2; diff --git a/engine/shared/library/sharedIoWin/src/shared/IoWinManager.h b/engine/shared/library/sharedIoWin/src/shared/IoWinManager.h index d0b90b2b..6965393d 100755 --- a/engine/shared/library/sharedIoWin/src/shared/IoWinManager.h +++ b/engine/shared/library/sharedIoWin/src/shared/IoWinManager.h @@ -131,7 +131,7 @@ public: inline bool IoWinManager::haveWindow(void) { - return (top != NULL); + return (top != nullptr); } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp b/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp index 0b77b2ec..92241997 100755 --- a/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp +++ b/engine/shared/library/sharedMath/src/shared/MxCifQuadTree.cpp @@ -32,10 +32,10 @@ MxCifQuadTree::MxCifQuadTree(float minX, float minY, float maxX, float maxY, int m_centerX((m_maxX - m_minX) / 2.0f + m_minX), m_centerY((m_maxY - m_minY) / 2.0f + m_minY), m_maxDepth(maxDepth), - m_urTree(NULL), - m_ulTree(NULL), - m_llTree(NULL), - m_lrTree(NULL), + m_urTree(nullptr), + m_ulTree(nullptr), + m_llTree(nullptr), + m_lrTree(nullptr), m_xAxisTree(minX, maxX, maxDepth), m_yAxisTree(minY, maxY, maxDepth) { @@ -49,13 +49,13 @@ MxCifQuadTree::MxCifQuadTree(float minX, float minY, float maxX, float maxY, int MxCifQuadTree::~MxCifQuadTree() { delete m_urTree; - m_urTree = NULL; + m_urTree = nullptr; delete m_ulTree; - m_ulTree = NULL; + m_ulTree = nullptr; delete m_llTree; - m_llTree = NULL; + m_llTree = nullptr; delete m_lrTree; - m_lrTree = NULL; + m_lrTree = nullptr; } // MxCifQuadTree::~MxCifQuadTree //------------------------------------------------------------------------------ @@ -99,7 +99,7 @@ bool MxCifQuadTree::addObject(const MxCifQuadTreeBounds & object) // try putting the object in a child node if (m_maxDepth > 1) { - if (m_urTree == NULL) + if (m_urTree == nullptr) { if (!split()) return false; @@ -158,7 +158,7 @@ bool MxCifQuadTree::removeObject(const MxCifQuadTreeBounds & object) { if (m_maxDepth > 1) { - if (m_urTree != NULL) + if (m_urTree != nullptr) { // check if the object is in a sub-node if (m_urTree->removeObject(object) || @@ -212,7 +212,7 @@ void MxCifQuadTree::getObjectsAt(float x, float y, y >= m_minY) { // if we have sub-trees, pass the point to the tree that contains it - if (m_urTree != NULL) + if (m_urTree != nullptr) { if (x >= m_centerX && y >= m_centerY) m_urTree->getObjectsAt(x, y, objects); @@ -239,7 +239,7 @@ void MxCifQuadTree::getObjectsAt(float x, float y, void MxCifQuadTree::getAllObjects(std::vector & objects) const { // if we have sub-trees, pass the point to the tree that contains it - if (m_urTree != NULL) + if (m_urTree != nullptr) { m_urTree->getAllObjects(objects); m_ulTree->getAllObjects(objects); @@ -265,8 +265,8 @@ MxCifQuadTree::MxCifBinTree::MxCifBinTree(float min, float max, int maxDepth) : m_max(max), m_center((max - min) / 2.0f + min), m_maxDepth(maxDepth), - m_left(NULL), - m_right(NULL), + m_left(nullptr), + m_right(nullptr), m_objects() { } // MxCifBinTree::MxCifBinTree @@ -277,9 +277,9 @@ MxCifQuadTree::MxCifBinTree::MxCifBinTree(float min, float max, int maxDepth) : MxCifQuadTree::MxCifBinTree::~MxCifBinTree() { delete m_left; - m_left = NULL; + m_left = nullptr; delete m_right; - m_right = NULL; + m_right = nullptr; m_objects.clear(); } // MxCifBinTree::~MxCifBinTree @@ -315,7 +315,7 @@ bool MxCifQuadTree::MxCifBinTree::addObject(const MxCifQuadTreeBounds & object) // try putting the object in a child node if (m_maxDepth > 1) { - if (m_left == NULL) + if (m_left == nullptr) { if (!split()) return false; @@ -348,7 +348,7 @@ bool MxCifQuadTree::MxCifBinTree::removeObject(const MxCifQuadTreeBounds & objec { if (m_maxDepth > 1) { - if (m_left != NULL) + if (m_left != nullptr) { // check if the object is in a sub-node if (m_left->removeObject(object) || @@ -379,7 +379,7 @@ void MxCifQuadTree::MxCifBinTree::getAllObjects( std::vector & objects) const { // if we have sub-trees, pass the point to the tree that contains it - if (m_left != NULL) + if (m_left != nullptr) { m_right->getAllObjects(objects); m_left->getAllObjects(objects); @@ -435,7 +435,7 @@ void MxCifQuadTree::MxCifXBinTree::getObjectsAt(float x, float y, x >= m_min) { // if we have sub-trees, pass the point to the tree that contains it - if (m_left != NULL) + if (m_left != nullptr) { if (x >= m_center) m_right->getObjectsAt(x, y, objects); @@ -498,7 +498,7 @@ void MxCifQuadTree::MxCifYBinTree::getObjectsAt(float x, float y, y >= m_min) { // if we have sub-trees, pass the point to the tree that contains it - if (m_left != NULL) + if (m_left != nullptr) { if (y >= m_center) m_right->getObjectsAt(x, y, objects); diff --git a/engine/shared/library/sharedMath/src/shared/MxCifQuadTreeBounds.h b/engine/shared/library/sharedMath/src/shared/MxCifQuadTreeBounds.h index 27006c07..3362c65a 100755 --- a/engine/shared/library/sharedMath/src/shared/MxCifQuadTreeBounds.h +++ b/engine/shared/library/sharedMath/src/shared/MxCifQuadTreeBounds.h @@ -19,7 +19,7 @@ class MxCifQuadTreeBounds { public: - MxCifQuadTreeBounds(float minX, float minY, float maxX, float maxY, void * data = NULL); + MxCifQuadTreeBounds(float minX, float minY, float maxX, float maxY, void * data = nullptr); virtual ~MxCifQuadTreeBounds(){}; const float getMinX(void) const; @@ -87,7 +87,7 @@ inline void * MxCifQuadTreeBounds::getData(void) const class MxCifQuadTreeCircleBounds : public MxCifQuadTreeBounds { public: - MxCifQuadTreeCircleBounds(float centerX, float centerY, float radius, void * data = NULL); + MxCifQuadTreeCircleBounds(float centerX, float centerY, float radius, void * data = nullptr); float getCenterX() const; float getCenterY() const; diff --git a/engine/shared/library/sharedMath/src/shared/Plane.cpp b/engine/shared/library/sharedMath/src/shared/Plane.cpp index de9e491f..716055b6 100755 --- a/engine/shared/library/sharedMath/src/shared/Plane.cpp +++ b/engine/shared/library/sharedMath/src/shared/Plane.cpp @@ -63,7 +63,7 @@ void Plane::set(const Vector &point0, const Vector &point1, const Vector &point2 * Find the intersection between a line segment and the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment @@ -85,7 +85,7 @@ bool Plane::findIntersection(const Vector &point0, const Vector &point1) const * Find the intersection between a line segment and the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment @@ -120,7 +120,7 @@ bool Plane::findIntersection(const Vector &point0, const Vector &point1, Vector * Find the intersection between a line segment and the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment @@ -159,7 +159,7 @@ bool Plane::findIntersection(const Vector &point0, const Vector &point1, Vector * Find the intersection between a line segment and the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment @@ -198,7 +198,7 @@ bool Plane::findIntersection(const Vector &point0, const Vector &point1, float & * back side of the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment @@ -224,12 +224,12 @@ bool Plane::findDirectedIntersection(const Vector &point0, const Vector &point1) * back side of the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment * @param point1 [IN] End of the line segment - * @param intersection [OUT] Intersection of the point and the plane (may be NULL) + * @param intersection [OUT] Intersection of the point and the plane (may be nullptr) * @param t [OUT] parameterized t from 0..1 * @return True if the line segment intersects the plane from front-to-rear, otherwise false. */ @@ -265,12 +265,12 @@ bool Plane::findDirectedIntersection(const Vector &point0, const Vector &point1, * back side of the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment * @param point1 [IN] End of the line segment - * @param intersection [OUT] Intersection of the point and the plane (may be NULL) + * @param intersection [OUT] Intersection of the point and the plane (may be nullptr) * @param t [OUT] parameterized t from 0..1 * @return True if the line segment intersects the plane from front-to-rear, otherwise false. */ @@ -308,12 +308,12 @@ bool Plane::findDirectedIntersection(const Vector &point0, const Vector &point1, * back side of the plane. * * If the line segment does intersect the plane, and the intersection - * pointer is non-NULL, then intersection will be set to the point on + * pointer is non-nullptr, then intersection will be set to the point on * the line segment that crosses the plane. * * @param point0 [IN] Start of the line segment * @param point1 [IN] End of the line segment - * @param intersection [OUT] Intersection of the point and the plane (may be NULL) + * @param intersection [OUT] Intersection of the point and the plane (may be nullptr) * @param t [OUT] parameterized t from 0..1 * @return True if the line segment intersects the plane from front-to-rear, otherwise false. */ diff --git a/engine/shared/library/sharedMath/src/shared/Quaternion.cpp b/engine/shared/library/sharedMath/src/shared/Quaternion.cpp index 38ce35b6..15b349a5 100755 --- a/engine/shared/library/sharedMath/src/shared/Quaternion.cpp +++ b/engine/shared/library/sharedMath/src/shared/Quaternion.cpp @@ -138,7 +138,7 @@ void Quaternion::getTransform(Transform *transform) const void Quaternion::getTransformPreserveTranslation(Transform *transform) const { - DEBUG_FATAL(!transform, ("null transform arg")); + DEBUG_FATAL(!transform, ("nullptr transform arg")); if ((w + s_quatEqualityEpsilon) < 1.f) { diff --git a/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h b/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h index 706f846d..3d630b82 100755 --- a/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h +++ b/engine/shared/library/sharedMath/src/shared/SphereTreeNode.h @@ -71,7 +71,7 @@ VectorPointerPool::~VectorPointerPool() } delete v; - v = NULL; + v = nullptr; } } @@ -209,7 +209,7 @@ public: node->move(this); else { - WARNING_STRICT_FATAL(true, ("SphereTree::move was invoked for an object, but the real sphere tree node it refers to is null.")); + WARNING_STRICT_FATAL(true, ("SphereTree::move was invoked for an object, but the real sphere tree node it refers to is nullptr.")); } }; @@ -292,7 +292,7 @@ inline SpatialSubdivisionHandle * SphereTreeNode::ad if(!isValidSphere(sphere)) { WARNING_STRICT_FATAL(true, ("SphereTreeNode::addObject - sphere for the object being added is invalid")); - return NULL; + return nullptr; } SphereTreeNode * candidateNode = 0; diff --git a/engine/shared/library/sharedMath/src/shared/Transform.cpp b/engine/shared/library/sharedMath/src/shared/Transform.cpp index 9cc8c181..ef35b3d0 100755 --- a/engine/shared/library/sharedMath/src/shared/Transform.cpp +++ b/engine/shared/library/sharedMath/src/shared/Transform.cpp @@ -493,7 +493,7 @@ void Transform::reorthonormalize(void) /** * Send this transform to the DebugPrint system. * - * The header parameter may be NULL. + * The header parameter may be nullptr. * * @param header Header for the transform */ @@ -524,8 +524,8 @@ void Transform::debugPrint(const char *header) const void Transform::rotate_l2p(const Vector *source, Vector *result, int count) const { - DEBUG_FATAL(!source, ("source array is NULL")); - DEBUG_FATAL(!result, ("result array is NULL")); + DEBUG_FATAL(!source, ("source array is nullptr")); + DEBUG_FATAL(!result, ("result array is nullptr")); DEBUG_FATAL(source == result, ("source and result array can not be the same")); NOT_NULL(source); @@ -559,8 +559,8 @@ void Transform::rotate_l2p(const Vector *source, Vector *result, int count) cons void Transform::rotateTranslate_l2p(const Vector *source, Vector *result, int count) const { - DEBUG_FATAL(!source, ("source array is NULL")); - DEBUG_FATAL(!result, ("result array is NULL")); + DEBUG_FATAL(!source, ("source array is nullptr")); + DEBUG_FATAL(!result, ("result array is nullptr")); NOT_NULL(source); NOT_NULL(result); @@ -594,8 +594,8 @@ void Transform::rotateTranslate_l2p(const Vector *source, Vector *result, int co void Transform::rotate_p2l(const Vector *source, Vector *result, int count) const { - DEBUG_FATAL(!source, ("source array is NULL")); - DEBUG_FATAL(!result, ("result array is NULL")); + DEBUG_FATAL(!source, ("source array is nullptr")); + DEBUG_FATAL(!result, ("result array is nullptr")); NOT_NULL(source); NOT_NULL(result); @@ -629,8 +629,8 @@ void Transform::rotate_p2l(const Vector *source, Vector *result, int count) cons void Transform::rotateTranslate_p2l(const Vector *source, Vector *result, int count) const { - DEBUG_FATAL(!source, ("source array is NULL")); - DEBUG_FATAL(!result, ("result array is NULL")); + DEBUG_FATAL(!source, ("source array is nullptr")); + DEBUG_FATAL(!result, ("result array is nullptr")); NOT_NULL(source); NOT_NULL(result); diff --git a/engine/shared/library/sharedMath/src/shared/Vector.cpp b/engine/shared/library/sharedMath/src/shared/Vector.cpp index 8f3ee55d..a694ccdd 100755 --- a/engine/shared/library/sharedMath/src/shared/Vector.cpp +++ b/engine/shared/library/sharedMath/src/shared/Vector.cpp @@ -115,7 +115,7 @@ bool Vector::isNormalized(void) const const Vector Vector::findClosestPointOnLine(const Vector &line0, const Vector &line1, real *t) const { - DEBUG_FATAL(!t, ("t arg is null")); + DEBUG_FATAL(!t, ("t arg is nullptr")); NOT_NULL(t); @@ -189,7 +189,7 @@ real Vector::distanceToLineSegment(const Vector &line0, const Vector &line1) con /** * Send this vector to the DebugPrint system. * - * The header parameter may be NULL. + * The header parameter may be nullptr. * * @param header Header for the vector */ diff --git a/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.cpp b/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.cpp index 3e4c8d34..4b0dc1ac 100755 --- a/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.cpp +++ b/engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.cpp @@ -10,7 +10,7 @@ #include "sharedMath/Transform.h" -static DebugShapeRenderer::DebugShapeRendererFactory * gs_factory = NULL; +static DebugShapeRenderer::DebugShapeRendererFactory * gs_factory = nullptr; // ---------------------------------------------------------------------- @@ -145,8 +145,8 @@ void DebugShapeRenderer::setFactory ( DebugShapeRenderer::DebugShapeRendererFact DebugShapeRenderer * DebugShapeRenderer::create ( Object const * object ) { - if(gs_factory == NULL) - return NULL; + if(gs_factory == nullptr) + return nullptr; return gs_factory(object); } diff --git a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index 411b5f3c..b6e10567 100755 --- a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -327,7 +327,7 @@ using namespace MemoryManagerNamespace; SystemAllocation::SystemAllocation(int size) : m_size(size), - m_next(NULL), + m_next(nullptr), m_pad1(0), m_pad2(0) { @@ -343,7 +343,7 @@ SystemAllocation::SystemAllocation(int size) Block * lastMemoryBlock = getLastMemoryBlock(); // set up the prefix sentinel block - firstMemoryBlock->setPrevious(NULL); + firstMemoryBlock->setPrevious(nullptr); firstMemoryBlock->setNext(firstFreeBlock); firstMemoryBlock->setFree(false); @@ -353,7 +353,7 @@ SystemAllocation::SystemAllocation(int size) // set up the suffix sentinel block lastMemoryBlock->setPrevious(firstFreeBlock); - lastMemoryBlock->setNext(NULL); + lastMemoryBlock->setNext(nullptr); lastMemoryBlock->setFree(false); // put the first block on the free list @@ -748,7 +748,7 @@ void MemoryManagerNamespace::allocateSystemMemory(int megabytes) ms_systemMemoryAllocatedMegabytes += megabytes; // insert the memory into the sorted linked list of system allocations - SystemAllocation * back = NULL; + SystemAllocation * back = nullptr; SystemAllocation * front = ms_firstSystemAllocation; for ( ; front && front->getFirstMemoryBlock() < systemAllocation->getFirstMemoryBlock(); back = front, front = front->getNext()) {} @@ -967,7 +967,7 @@ void MemoryManagerNamespace::addToFreeList(Block * block) FreeBlock * freeBlock = static_cast(block); int const freeBlockSize = freeBlock->getSize(); - FreeBlock * parent = NULL; + FreeBlock * parent = nullptr; FreeBlock * * next = &ms_firstFreeBlock; FreeBlock * same = 0; @@ -991,7 +991,7 @@ void MemoryManagerNamespace::addToFreeList(Block * block) { freeBlock->m_smallerFreeBlock = same->m_smallerFreeBlock; - same->m_smallerFreeBlock = NULL; + same->m_smallerFreeBlock = nullptr; if (freeBlock->m_smallerFreeBlock) freeBlock->m_smallerFreeBlock->m_parentFreeBlock = freeBlock; @@ -999,7 +999,7 @@ void MemoryManagerNamespace::addToFreeList(Block * block) same->m_parentFreeBlock = freeBlock; freeBlock->m_largerFreeBlock = same->m_largerFreeBlock; - same->m_largerFreeBlock = NULL; + same->m_largerFreeBlock = nullptr; if (freeBlock->m_largerFreeBlock) freeBlock->m_largerFreeBlock->m_parentFreeBlock = freeBlock; @@ -1009,9 +1009,9 @@ void MemoryManagerNamespace::addToFreeList(Block * block) else { *next = freeBlock; - freeBlock->m_smallerFreeBlock = NULL; - freeBlock->m_sameFreeBlock = NULL; - freeBlock->m_largerFreeBlock = NULL; + freeBlock->m_smallerFreeBlock = nullptr; + freeBlock->m_sameFreeBlock = nullptr; + freeBlock->m_largerFreeBlock = nullptr; freeBlock->m_parentFreeBlock = parent; } @@ -1042,7 +1042,7 @@ void MemoryManagerNamespace::removeFromFreeList(FreeBlock * block) NOT_NULL(block); // find the pointer that points to block - FreeBlock * * parentPointer = NULL; + FreeBlock * * parentPointer = nullptr; FreeBlock * parent = block->m_parentFreeBlock; if (parent) { @@ -1088,7 +1088,7 @@ void MemoryManagerNamespace::removeFromFreeList(FreeBlock * block) { // this is the worst case. this free block has smaller and larger children, but not any same sized children // we're going to take the smallest block off the larger list and use that to replace the current node - FreeBlock * back = NULL; + FreeBlock * back = nullptr; FreeBlock * replacement = block->m_largerFreeBlock; while (replacement->m_smallerFreeBlock) { @@ -1133,16 +1133,16 @@ void MemoryManagerNamespace::removeFromFreeList(FreeBlock * block) else { // this block has no children - *parentPointer = NULL; + *parentPointer = nullptr; } } } // remove all the pointers the block may have had - block->m_smallerFreeBlock = NULL; - block->m_sameFreeBlock = NULL; - block->m_largerFreeBlock = NULL; - block->m_parentFreeBlock = NULL; + block->m_smallerFreeBlock = nullptr; + block->m_sameFreeBlock = nullptr; + block->m_largerFreeBlock = nullptr; + block->m_parentFreeBlock = nullptr; --ms_freeBlocks; } @@ -1151,7 +1151,7 @@ void MemoryManagerNamespace::removeFromFreeList(FreeBlock * block) FreeBlock *MemoryManagerNamespace::searchFreeList(int blockSize) { - FreeBlock * result = NULL; + FreeBlock * result = nullptr; FreeBlock * current = ms_firstFreeBlock; while (current) { @@ -1239,7 +1239,7 @@ void * MemoryManager::allocate(size_t size, uint32 owner, bool array, bool leakT // get the size of the allocation int allocSize = (cms_allocatedBlockSize + cms_guardBandSize + (size ? static_cast(size) : 1) + cms_guardBandSize + 15) & ~15; - FreeBlock * bestFreeBlock = NULL; + FreeBlock * bestFreeBlock = nullptr; for (int tries = 0; !bestFreeBlock && tries < 2; ++tries) { bestFreeBlock = searchFreeList(allocSize); @@ -1396,7 +1396,7 @@ void *MemoryManager::reallocate(void *userPointer, size_t newSize) { MemoryManager::free(userPointer, array); -// DEBUG_REPORT_LOG(ms_logEachAlloc, ("MemoryManager::reallocate() new_requested_size=%d, org ptr=%p, new ptr=NULL\n", newSize, userPointer)); +// DEBUG_REPORT_LOG(ms_logEachAlloc, ("MemoryManager::reallocate() new_requested_size=%d, org ptr=%p, new ptr=nullptr\n", newSize, userPointer)); return 0; } @@ -1440,7 +1440,7 @@ void *MemoryManager::reallocate(void *userPointer, size_t newSize) * Users should not call this routine directly. It should only be called * by operator delete. * - * This routine should not be called with the NULL pointer. + * This routine should not be called with the nullptr pointer. * * @param userPointer Pointer to the memory * @param array True if the array form of operator new was used, false if the scalar form was used diff --git a/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp b/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp index 8d161e58..b8c97860 100755 --- a/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp +++ b/engine/shared/library/sharedMessageDispatch/src/shared/Emitter.cpp @@ -31,7 +31,7 @@ struct Emitter::ReceiverList Emitter::Emitter() : receiverList(new ReceiverList) { - assert (receiverList != NULL); + assert (receiverList != nullptr); } //--------------------------------------------------------------------- diff --git a/engine/shared/library/sharedMessageDispatch/src/shared/Receiver.cpp b/engine/shared/library/sharedMessageDispatch/src/shared/Receiver.cpp index ff929dc2..bc8fc3b3 100755 --- a/engine/shared/library/sharedMessageDispatch/src/shared/Receiver.cpp +++ b/engine/shared/library/sharedMessageDispatch/src/shared/Receiver.cpp @@ -33,7 +33,7 @@ Receiver::Receiver() : emitterTargets(new EmitterTargets), hasTargets(false) { - assert(emitterTargets != NULL); + assert(emitterTargets != nullptr); } //--------------------------------------------------------------------- diff --git a/engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp b/engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp index 8dfa1605..8acf1289 100755 --- a/engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp +++ b/engine/shared/library/sharedNetwork/src/linux/TcpClient.cpp @@ -494,7 +494,7 @@ void TcpClient::update() // disconnected so we can handle cleanup. if (pollResult) { - if (m_recvBuffer == NULL) + if (m_recvBuffer == nullptr) { m_recvBufferLength = 1500; m_recvBuffer = new unsigned char [m_recvBufferLength]; @@ -533,7 +533,7 @@ void TcpClient::update() } else { - LOG("Network", ("(null connection object) Read zero bytes on a successful poll (POLLIN|POLLHUP). Closing socket since we think it is closed.")); + LOG("Network", ("(nullptr connection object) Read zero bytes on a successful poll (POLLIN|POLLHUP). Closing socket since we think it is closed.")); } onConnectionClosed(); } diff --git a/engine/shared/library/sharedNetwork/src/shared/Service.cpp b/engine/shared/library/sharedNetwork/src/shared/Service.cpp index 84ec3dd8..9e0f0c8f 100755 --- a/engine/shared/library/sharedNetwork/src/shared/Service.cpp +++ b/engine/shared/library/sharedNetwork/src/shared/Service.cpp @@ -186,8 +186,8 @@ Service::~Service() delete m_callback; connections.clear(); - connectionAllocator = NULL; - m_callback = NULL; + connectionAllocator = nullptr; + m_callback = nullptr; delete m_tcpServer; } diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp index e92dd770..134b7a9b 100755 --- a/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp @@ -137,7 +137,7 @@ namespace SetupSharedNetworkMessagesNamespace MessageQueue::Data* unpackNothing(Archive::ReadIterator &) { - return NULL; + return nullptr; } void packGenericShipDamageMessage(const MessageQueue::Data * data, Archive::ByteStream & target) diff --git a/engine/shared/library/sharedObject/src/shared/ObjectWatcherList.cpp b/engine/shared/library/sharedObject/src/shared/ObjectWatcherList.cpp index a2cb6e67..fdfb4afa 100755 --- a/engine/shared/library/sharedObject/src/shared/ObjectWatcherList.cpp +++ b/engine/shared/library/sharedObject/src/shared/ObjectWatcherList.cpp @@ -23,7 +23,7 @@ namespace ObjectWatcherListNamespace { void setRegionOfInfluenceEnabled(Object const * const object, bool const enabled, bool skipCell) { - if (skipCell && NULL != object->getCellProperty()) + if (skipCell && nullptr != object->getCellProperty()) return; object->setRegionOfInfluenceEnabled(enabled); @@ -67,7 +67,7 @@ ObjectWatcherList::~ObjectWatcherList(void) /** * Add an Object to the ObjectWatcherList. * - * This routine will call Fatal in debug compiles if it is passed a NULL + * This routine will call Fatal in debug compiles if it is passed a nullptr * object. * * This routine will call Fatal in debug compiles if the object list @@ -85,7 +85,7 @@ void ObjectWatcherList::addObject(Object & objectToAdd) /** * Remove an Object from the ObjectWatcherList. * - * This routine will call Fatal in debug compiles if it is passed a NULL + * This routine will call Fatal in debug compiles if it is passed a nullptr * object. * * @param objectToRemove Pointer to the object to remove @@ -112,13 +112,13 @@ void ObjectWatcherList::removeObjectByIndex (const Object & object, int index) // Remove the last item in the vector. m_objectVector->pop_back(); - // NULL the object from the alter-safe object list. + // nullptr the object from the alter-safe object list. uint size = m_alterSafeObjectVector->size(); for (uint i = 0; i < size; ++i) { if ((*m_alterSafeObjectVector)[i] == &object) { - (*m_alterSafeObjectVector)[i] = NULL; + (*m_alterSafeObjectVector)[i] = nullptr; return; } } @@ -232,7 +232,7 @@ void ObjectWatcherList::alter(real time) // Make sure the object is still in the object list before removing it - if ((*m_alterSafeObjectVector)[i] != NULL) + if ((*m_alterSafeObjectVector)[i] != nullptr) { removeObject(*obj); } diff --git a/engine/shared/library/sharedObject/src/shared/appearance/Appearance.cpp b/engine/shared/library/sharedObject/src/shared/appearance/Appearance.cpp index e1acba39..f899e042 100755 --- a/engine/shared/library/sharedObject/src/shared/appearance/Appearance.cpp +++ b/engine/shared/library/sharedObject/src/shared/appearance/Appearance.cpp @@ -80,8 +80,8 @@ void Appearance::setRenderHardpointFunction(RenderHardpointFunction renderHardpo Appearance::Appearance(const AppearanceTemplate *newAppearanceTemplate) : m_appearanceTemplate(AppearanceTemplateList::fetch(newAppearanceTemplate)), - m_extent(m_appearanceTemplate ? ExtentList::fetch(m_appearanceTemplate->getExtent()) : NULL), - m_owner(NULL), + m_extent(m_appearanceTemplate ? ExtentList::fetch(m_appearanceTemplate->getExtent()) : nullptr), + m_owner(nullptr), m_renderedFrameNumber(0), m_scale(Vector::xyz111), m_keepAlive(false), @@ -100,15 +100,15 @@ Appearance::Appearance(const AppearanceTemplate *newAppearanceTemplate) : Appearance::~Appearance() { ExtentList::release(m_extent); - m_extent = NULL; + m_extent = nullptr; if (m_appearanceTemplate) { AppearanceTemplateList::release(m_appearanceTemplate); - m_appearanceTemplate = NULL; + m_appearanceTemplate = nullptr; } - m_owner = NULL; + m_owner = nullptr; } // ---------------------------------------------------------------------- @@ -269,7 +269,7 @@ void Appearance::render() const void Appearance::objectListCameraRenderDescend(Object const & obj) { //-- don't descend through cells - if (NULL != obj.getCellProperty()) + if (nullptr != obj.getCellProperty()) return; int const childCount = obj.getNumberOfChildObjects(); @@ -378,7 +378,7 @@ bool Appearance::implementsCollide() const * CustomizationDataProperty. If there is such a property, this * function will invoke Appearance::setCustomizationData() with the * appropriate value. If the property doesn't exist, this function - * will invoke Appearance::setCustomizationData() with NULL. Note if + * will invoke Appearance::setCustomizationData() with nullptr. Note if * the caller sets the CustomizationDataProperty for an Object after * associating the Object instance with the appearance, the caller is * responsible for calling Appearance::setCustomizationData(). @@ -457,7 +457,7 @@ const char * Appearance::getFloorName () const if (m_appearanceTemplate) return m_appearanceTemplate->getFloorName(); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -607,7 +607,7 @@ const char * Appearance::getAppearanceTemplateName () const DPVS::Object *Appearance::getDpvsObject() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -748,14 +748,14 @@ SkeletalAppearance2 const * Appearance::asSkeletalAppearance2() const ComponentAppearance * Appearance::asComponentAppearance() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- ComponentAppearance const * Appearance::asComponentAppearance() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -783,14 +783,14 @@ void Appearance::onEvent(LabelHash::Id /* eventId */) int Appearance::getHardpointCount() const { - return m_appearanceTemplate != NULL ? m_appearanceTemplate->getHardpointCount() : 0; + return m_appearanceTemplate != nullptr ? m_appearanceTemplate->getHardpointCount() : 0; } // ---------------------------------------------------------------------- int Appearance::getHardpointIndex(CrcString const &hardpointName, bool optional) const { - return m_appearanceTemplate != NULL ? m_appearanceTemplate->getHardpointIndex(hardpointName, optional) : -1; + return m_appearanceTemplate != nullptr ? m_appearanceTemplate->getHardpointIndex(hardpointName, optional) : -1; } // ---------------------------------------------------------------------- @@ -855,42 +855,42 @@ bool Appearance::usesRenderEffectsFlag() const ParticleEffectAppearance * Appearance::asParticleEffectAppearance() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- ParticleEffectAppearance const * Appearance::asParticleEffectAppearance() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- SwooshAppearance * Appearance::asSwooshAppearance() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- SwooshAppearance const * Appearance::asSwooshAppearance() const { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- LightningAppearance * Appearance::asLightningAppearance() { - return NULL; + return nullptr; } // ---------------------------------------------------------------------- LightningAppearance const * Appearance::asLightningAppearance() const { - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h b/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h index 13b49530..4a7bd5cf 100755 --- a/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h +++ b/engine/shared/library/sharedObject/src/shared/appearance/Appearance.h @@ -206,7 +206,7 @@ private: /** * Get the AppearanceTemplate for this Appearance. * - * The AppearanceTemplate may be NULL. + * The AppearanceTemplate may be nullptr. * * AppearanceTemplates may be shared by multiple Appearances. * diff --git a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplate.cpp b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplate.cpp index 89f44831..0975380d 100755 --- a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplate.cpp +++ b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplate.cpp @@ -97,14 +97,14 @@ AppearanceTemplate::PreloadManager::~PreloadManager () AppearanceTemplate::AppearanceTemplate(const char *newName) : m_referenceCount(0), m_crcName(new CrcLowerString(newName)), - m_extent(NULL), - m_collisionExtent(NULL), - m_hardpoints(NULL), - m_floorName(NULL), + m_extent(nullptr), + m_collisionExtent(nullptr), + m_hardpoints(nullptr), + m_floorName(nullptr), m_preloadManager (0) { //-- Save info on most recently constructed appearance template. - IGNORE_RETURN(snprintf(ms_crashReportInfo, sizeof(ms_crashReportInfo) - 1, "AppearanceTemplate: %s\n", newName ? newName : "")); + IGNORE_RETURN(snprintf(ms_crashReportInfo, sizeof(ms_crashReportInfo) - 1, "AppearanceTemplate: %s\n", newName ? newName : "")); ms_crashReportInfo[sizeof(ms_crashReportInfo) - 1] = '\0'; } @@ -118,10 +118,10 @@ AppearanceTemplate::~AppearanceTemplate(void) delete m_crcName; ExtentList::release(m_extent); - m_extent = NULL; + m_extent = nullptr; ExtentList::release(m_collisionExtent); - m_collisionExtent = NULL; + m_collisionExtent = nullptr; if (m_hardpoints) { @@ -482,7 +482,7 @@ const CrcLowerString &AppearanceTemplate::getCrcName() const /** *Get the name of this AppearanceTemplate. * - *This routine may return NULL. + *This routine may return nullptr. */ const char *AppearanceTemplate::getName() const diff --git a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp index 37439f23..d2afe802 100755 --- a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp +++ b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp @@ -219,7 +219,7 @@ const AppearanceTemplate *AppearanceTemplateList::fetch(const char *const fileNa char const * actualFileName = fileName; if (!fileName) { - DEBUG_WARNING(true, ("AppearanceTemplateList::fetch passed NULL fileName, using default")); + DEBUG_WARNING(true, ("AppearanceTemplateList::fetch passed nullptr fileName, using default")); actualFileName = getDefaultAppearanceTemplateName(); } else if (!*fileName) @@ -246,14 +246,14 @@ const AppearanceTemplate *AppearanceTemplateList::fetch(const char *const fileNa DEBUG_WARNING(true, ("AppearanceTemplateList::fetch actualFileName fetch for %s failed.", actualFileName)); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- /** * Add a reference to the specified Appearance. * - * This routine will do nothing if passed in NULL. Otherwise, it will + * This routine will do nothing if passed in nullptr. Otherwise, it will * increase the reference count of the specified AppearanceTemplate * by one. * @@ -297,7 +297,7 @@ const AppearanceTemplate *AppearanceTemplateList::fetch(Iff *const iff) return 0; //lint !e527 // unreachable } - AppearanceTemplate *const appearanceTemplate = (*iter).second(NULL, iff); + AppearanceTemplate *const appearanceTemplate = (*iter).second(nullptr, iff); NOT_NULL(appearanceTemplate); addAnonymousAppearanceTemplate(appearanceTemplate); @@ -351,7 +351,7 @@ const AppearanceTemplate *AppearanceTemplateList::fetchNew(AppearanceTemplate *c /** * Remove a reference to the specified AppearanceTemplate. * - * This routine will do nothing if passed in NULL. + * This routine will do nothing if passed in nullptr. * * If the reference count drops to 0, the AppearanceTemplate will be deleted. * @@ -404,9 +404,9 @@ Appearance *AppearanceTemplateList::createAppearance(const char *const fileName) #endif //probably should modify the macro sometime to just be quiet if this isn't defined - if (appearanceTemplate == NULL){ + if (appearanceTemplate == nullptr){ DEBUG_WARNING(true, ("FIX ME: Appearance template for %s could not be fetched - is it missing?", fileName)); - return NULL; // Cekis: TODO: Figure out why the template can't be fetched. DarthArgus: always is due to a missing file or one of the redirectors having a bad path + return nullptr; // Cekis: TODO: Figure out why the template can't be fetched. DarthArgus: always is due to a missing file or one of the redirectors having a bad path } //-- creating the appearance will increment the reference count @@ -581,7 +581,7 @@ AppearanceTemplate *AppearanceTemplateListNamespace::create(const char *const fi // DEBUG_REPORT_LOG_PRINT(true, ("Loading mesh %s\n", actualFileName.getString())); TagBindingMap::iterator iter = ms_tagBindingMap.find(TAG_MESH); if (iter != ms_tagBindingMap.end()) - appearanceTemplate = iter->second(actualFileName.getString(), NULL); + appearanceTemplate = iter->second(actualFileName.getString(), nullptr); } //-- we now need to create the appearance from disk diff --git a/engine/shared/library/sharedObject/src/shared/container/ArrangementDescriptorList.cpp b/engine/shared/library/sharedObject/src/shared/container/ArrangementDescriptorList.cpp index 31de898d..ddc27d42 100755 --- a/engine/shared/library/sharedObject/src/shared/container/ArrangementDescriptorList.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/ArrangementDescriptorList.cpp @@ -69,7 +69,7 @@ const ArrangementDescriptor *ArrangementDescriptorList::fetch(const CrcLowerStri } else { - WARNING(true, ("default ArrangementDescriptor [%s] could not be loaded, returning NULL ArrangementDescriptor", filename.getString())); + WARNING(true, ("default ArrangementDescriptor [%s] could not be loaded, returning nullptr ArrangementDescriptor", filename.getString())); return 0; } } diff --git a/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.cpp b/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.cpp index 1a25f0cd..74494ba9 100755 --- a/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/ContainedByProperty.cpp @@ -49,7 +49,7 @@ ContainedByProperty::~ContainedByProperty() * property. * * @return Pointer to the object that contains the object with this - * ContainedByProperty. Returns NULL if the object isn't + * ContainedByProperty. Returns nullptr if the object isn't * contained by anything at the moment. */ diff --git a/engine/shared/library/sharedObject/src/shared/container/Container.cpp b/engine/shared/library/sharedObject/src/shared/container/Container.cpp index b85e8f1f..66e9e9f4 100755 --- a/engine/shared/library/sharedObject/src/shared/container/Container.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/Container.cpp @@ -21,13 +21,13 @@ // ====================================================================== //Lint suppressions. -//lint -esym(613, ContainerIterator::m_iterator) // (Warning -- Possible use of null pointer 'ContainerIterator::m_iterator' ) // This is an opaque data type to us. We can only check against a container::end(). +//lint -esym(613, ContainerIterator::m_iterator) // (Warning -- Possible use of nullptr pointer 'ContainerIterator::m_iterator' ) // This is an opaque data type to us. We can only check against a container::end(). //lint -esym(1540, ContainerIterator::m_iterator) // (Warning -- Pointer member 'ContainerIterator::m_iterator' neither freed nor zero'ed by destructor -- Effective C++ #6) // It's okay, the iterator type is opaque to us, we have no idea it's a pointer. //lint -esym(1554, ContainerIterator::m_iterator) // (Warning -- Direct copy of pointer 'ContainerIterator::m_iterator'. // It's okay, the iterator type is opaque to us, we have no idea it's a pointer. //lint -esym(1555, ContainerIterator::m_iterator) // (Warning -- Direct pointer copy of member 'ContainerIterator::m_iterator' within copy assignment operator: 'ContainerIterator::operator=(const ContainerIterator &) // Opaque type, we don't know its a pointer. //lint -esym(1555, ContainerIterator::m_owner) // (Warning -- Direct pointer copy of member 'ContainerIterator::m_owner' within copy assignment operator: 'ContainerIterator::operator=(const ContainerIterator &) // We do not own this memory, so it's okay to overwrite the pointer. We can't leak it. -//lint -esym(613, ContainerConstIterator::m_iterator) // (Warning -- Possible use of null pointer 'ContainerConstIterator::m_iterator' ) // This is an opaque data type to us. We can only check against a container::end(). +//lint -esym(613, ContainerConstIterator::m_iterator) // (Warning -- Possible use of nullptr pointer 'ContainerConstIterator::m_iterator' ) // This is an opaque data type to us. We can only check against a container::end(). //lint -esym(1540, ContainerConstIterator::m_iterator) // (Warning -- Pointer member 'ContainerConstIterator::m_iterator' neither freed nor zero'ed by destructor -- Effective C++ #6) // It's okay, the iterator type is opaque to us, we have no idea it's a pointer. //lint -esym(1554, ContainerConstIterator::m_iterator) // (Warning -- Direct copy of pointer 'ContainerConstIterator::m_iterator'. // It's okay, the iterator type is opaque to us, we have no idea it's a pointer. //lint -esym(1555, ContainerConstIterator::m_iterator) // (Warning -- Direct pointer copy of member 'ContainerConstIterator::m_iterator' within copy assignment operator: 'ContainerConstIterator::operator=(const ContainerConstIterator &) // Opaque type, we don't know its a pointer. @@ -108,7 +108,7 @@ ContainerIterator & ContainerIterator::operator= (const ContainerIterator & rhs) CachedNetworkId & ContainerIterator::operator*() { // @todo fix this interface -- it is broken. It is possible to - // construct a ContainerIterator with a NULL m_iterator, but there is + // construct a ContainerIterator with a nullptr m_iterator, but there is // no way to gracefully exit from this function since it requires a non-const // reference. Otherwise I would return CachedNetworkId::cms_cachedIvalid. NOT_NULL(m_owner); @@ -197,7 +197,7 @@ ContainerConstIterator & ContainerConstIterator::operator= (const ContainerConst const CachedNetworkId & ContainerConstIterator::operator*() const { // @todo fix this interface -- it is broken. It is possible to - // construct a ContainerIterator with a NULL m_iterator, but there is + // construct a ContainerIterator with a nullptr m_iterator, but there is // no way to gracefully exit from this function since it requires a non-const // reference. Otherwise I would return CachedNetworkId::cms_cachedIvalid. NOT_NULL(m_owner); @@ -677,7 +677,7 @@ void Container::debugPrint(std::string &buffer) const { Object const *const object = it->getObject(); - sprintf(tempBuffer, "\tindex [%d]: object id [%s], template [%s]\n", index, it->getValueString().c_str(), object ? object->getObjectTemplateName() : ""); + sprintf(tempBuffer, "\tindex [%d]: object id [%s], template [%s]\n", index, it->getValueString().c_str(), object ? object->getObjectTemplateName() : ""); buffer += tempBuffer; } @@ -699,7 +699,7 @@ void Container::debugLog() const for (Contents::const_iterator it = m_contents.begin(); it != endIt; ++it, ++index) { Object const *const object = it->getObject(); - DEBUG_REPORT_LOG(true, ("\tindex [%d]: object id [%s], template [%s]\n", index, it->getValueString().c_str(), object ? object->getObjectTemplateName() : "")); + DEBUG_REPORT_LOG(true, ("\tindex [%d]: object id [%s], template [%s]\n", index, it->getValueString().c_str(), object ? object->getObjectTemplateName() : "")); } DEBUG_REPORT_LOG(true, ("====[END: container]====\n")); diff --git a/engine/shared/library/sharedObject/src/shared/container/SlotIdManager.cpp b/engine/shared/library/sharedObject/src/shared/container/SlotIdManager.cpp index 9aea59ef..70b6b34d 100755 --- a/engine/shared/library/sharedObject/src/shared/container/SlotIdManager.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/SlotIdManager.cpp @@ -351,7 +351,7 @@ bool SlotIdManager::isSlotPlayerModifiable(const SlotId &slotId) * * If the slot can have something put in it that directly affects what you * see on the client, this will return true. If this returns false, - * getSlotHardpointName() will return a NULL string. + * getSlotHardpointName() will return a nullptr string. * * @param slotId a SlotId instance for the slot under question. * @@ -381,9 +381,9 @@ bool SlotIdManager::isSlotAppearanceRelated(const SlotId &slotId) * * The caller should check the result of isSlotAppearanceRelated() before * calling this function. If the slot is not appearance related, this function - * will always return NULL. Also, if the SlotIdManager is installed such that + * will always return nullptr. Also, if the SlotIdManager is installed such that * hardpoint names are not loaded (currently the server is loaded this way), - * the specified hardpoint name will return NULL. + * the specified hardpoint name will return nullptr. * * @param slotId a SlotId instance for the slot under question. * diff --git a/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp b/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp index b97b1a24..98b85e82 100755 --- a/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/SlottedContainer.cpp @@ -49,7 +49,7 @@ SlottedContainer::~SlottedContainer() if (m_slotMap) { delete m_slotMap; - m_slotMap = NULL; + m_slotMap = nullptr; } } diff --git a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp index 02433163..fe716109 100755 --- a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp @@ -36,7 +36,7 @@ namespace VolumeContainerNamespace return parent->getVolumeContainerProperty(); } } - return NULL; + return nullptr; } const VolumeContainer* getVolumeContainerParent(const VolumeContainer& self) @@ -51,7 +51,7 @@ namespace VolumeContainerNamespace return parent->getVolumeContainerProperty(); } } - return NULL; + return nullptr; } const unsigned int serverHolocronCrc = CrcLowerString::calculateCrc("object/player_quest/pgc_quest_holocron.iff"); diff --git a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.h b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.h index 922154f7..f99766dc 100755 --- a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.h +++ b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.h @@ -69,8 +69,8 @@ public: private: bool checkVolume(const VolumeContainmentProperty &item) const; - bool internalRemove(const Object & item, const VolumeContainmentProperty *itemProp = NULL); - void insertNewItem(const Object & item, const VolumeContainmentProperty *itemProp = NULL); + bool internalRemove(const Object & item, const VolumeContainmentProperty *itemProp = nullptr); + void insertNewItem(const Object & item, const VolumeContainmentProperty *itemProp = nullptr); void childVolumeChanged(int volume, bool updateParent); diff --git a/engine/shared/library/sharedObject/src/shared/controller/Controller.cpp b/engine/shared/library/sharedObject/src/shared/controller/Controller.cpp index 66572a6a..2483e64b 100755 --- a/engine/shared/library/sharedObject/src/shared/controller/Controller.cpp +++ b/engine/shared/library/sharedObject/src/shared/controller/Controller.cpp @@ -88,7 +88,7 @@ MessageQueue::Data* Controller::peekHeldMessage( int message, float *value, uint { HeldMessageMap::iterator iter = m_heldMessages.find( message ); if ( iter == m_heldMessages.end() ) - return NULL; + return nullptr; if ( value ) *value = iter->second.value; if ( flags ) @@ -216,42 +216,42 @@ MessageQueue * Controller::getMessageQueue() TangibleController * Controller::asTangibleController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- TangibleController const * Controller::asTangibleController() const { - return NULL; + return nullptr; } //---------------------------------------------------------------------- CreatureController * Controller::asCreatureController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- CreatureController const * Controller::asCreatureController() const { - return NULL; + return nullptr; } //---------------------------------------------------------------------- ShipController * Controller::asShipController() { - return NULL; + return nullptr; } //---------------------------------------------------------------------- ShipController const * Controller::asShipController() const { - return NULL; + return nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.cpp b/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.cpp index 69799beb..d25d9be1 100755 --- a/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.cpp +++ b/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.cpp @@ -55,7 +55,7 @@ SetupSharedObject::Data::Data() customizationIdManagerFilename(0), objectsAlterChildrenAndContents(true), loadObjectTemplateCrcStringTable(true), - pobEjectionTransformFilename(NULL) + pobEjectionTransformFilename(nullptr) { } diff --git a/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.h b/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.h index dd38e215..ce43740e 100755 --- a/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.h +++ b/engine/shared/library/sharedObject/src/shared/core/SetupSharedObject.h @@ -70,7 +70,7 @@ public: // Specifies whether or not ObjectTemplateList should load the object template crc table bool loadObjectTemplateCrcStringTable; - // Specifies the name of the POB ejection point transform override filename to use; use NULL (default) if no ejection point support. + // Specifies the name of the POB ejection point transform override filename to use; use nullptr (default) if no ejection point support. char const *pobEjectionTransformFilename; private: diff --git a/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp b/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp index e27808f2..a05ed186 100755 --- a/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp +++ b/engine/shared/library/sharedObject/src/shared/customization/CustomizationData.cpp @@ -277,10 +277,10 @@ CustomizationData::CustomizationData(Object &owner) : void CustomizationData::addVariableTakeOwnership(const std::string &fullVariablePathName, CustomizationVariable *variable) { - //-- check for null variable + //-- check for nullptr variable if (!variable) { - WARNING(true, ("addVariableTakeOwnership() called with null variable.\n")); + WARNING(true, ("addVariableTakeOwnership() called with nullptr variable.\n")); return; } @@ -591,7 +591,7 @@ std::string CustomizationData::writeLocalDataToString() const saveToByteVector(binaryData); - //-- Convert binary data to string. We're escaping the 0 for the database so this is a non-null string. + //-- Convert binary data to string. We're escaping the 0 for the database so this is a non-nullptr string. // We translate 0x00 => 0xff 0x01 // 0xff => 0xff 0x02 std::string returnValue; @@ -1139,7 +1139,7 @@ void CustomizationData::notifyPendingRemoteDestruction(const CustomizationData * //-- validate arg if (!customizationData) { - DEBUG_WARNING(true, ("notifyPendingRemoteDestruction(): customizationData arg is null")); + DEBUG_WARNING(true, ("notifyPendingRemoteDestruction(): customizationData arg is nullptr")); return; } diff --git a/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.cpp b/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.cpp index 3a8422cb..1a12a2fd 100755 --- a/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.cpp +++ b/engine/shared/library/sharedObject/src/shared/customization/CustomizationData_LocalDirectory.cpp @@ -95,7 +95,7 @@ bool CustomizationData::LocalDirectory::resolvePathNameToDirectory(const std::st //-- ensure we've got a directory if (!subdir) { - WARNING(true, ("resolvePathNameToDirectory(): logic failure, subdir is null")); + WARNING(true, ("resolvePathNameToDirectory(): logic failure, subdir is nullptr")); return false; } @@ -110,7 +110,7 @@ bool CustomizationData::LocalDirectory::addVariableTakeOwnership(const std::stri //-- ensure caller passed in valid customizationVariable if (!variable) { - WARNING(true, ("addVariableTakeOwnership(): caller passed in NULL variable")); + WARNING(true, ("addVariableTakeOwnership(): caller passed in nullptr variable")); return false; } @@ -210,10 +210,10 @@ CustomizationData::Directory *CustomizationData::LocalDirectory::findDirectory(c void CustomizationData::LocalDirectory::deleteDirectory(Directory *childDirectory) { - //-- check for null directory + //-- check for nullptr directory if (!childDirectory) { - WARNING(true, ("deleteDirectory(): NULL childDirectory arg")); + WARNING(true, ("deleteDirectory(): nullptr childDirectory arg")); return; } @@ -255,10 +255,10 @@ void CustomizationData::LocalDirectory::iterateOverConstVariables(const std::str const DirectoryMap::const_iterator endIt = m_directories.end(); for (DirectoryMap::const_iterator it = m_directories.begin(); it != endIt; ++it) { - //-- check for null directory pointer (shouldn't happen but shouldn't FATAL) + //-- check for nullptr directory pointer (shouldn't happen but shouldn't FATAL) if (!it->second) { - WARNING(true, ("iterateOverConstVariables(): directory 0x%08x has null child directory for [%s].", this, it->first.getString())); + WARNING(true, ("iterateOverConstVariables(): directory 0x%08x has nullptr child directory for [%s].", this, it->first.getString())); return; } @@ -292,10 +292,10 @@ void CustomizationData::LocalDirectory::iterateOverVariables(const std::string & const DirectoryMap::iterator endIt = m_directories.end(); for (DirectoryMap::iterator it = m_directories.begin(); it != endIt; ++it) { - //-- check for null directory pointer (shouldn't happen but shouldn't FATAL) + //-- check for nullptr directory pointer (shouldn't happen but shouldn't FATAL) if (!it->second) { - WARNING(true, ("iterateOverConstVariables(): directory 0x%08x has null child directory for [%s].", this, it->first.getString())); + WARNING(true, ("iterateOverConstVariables(): directory 0x%08x has nullptr child directory for [%s].", this, it->first.getString())); return; } @@ -314,10 +314,10 @@ void CustomizationData::LocalDirectory::iterateOverVariables(const std::string & void CustomizationData::LocalDirectory::replaceOrAddDirectory(const std::string &directoryPathName, int directoryNameStartIndex, Directory *directory) { - //-- ensure attached directory is not null + //-- ensure attached directory is not nullptr if (!directory) { - WARNING(true, ("replaceOrAddDirectory(): directory arg is NULL")); + WARNING(true, ("replaceOrAddDirectory(): directory arg is nullptr")); return; } @@ -411,7 +411,7 @@ std::string CustomizationData::LocalDirectory::writeLocalDirectoryToString() con const CustomizationVariableMap::const_iterator endIt = m_variables.end(); for (CustomizationVariableMap::const_iterator it = m_variables.begin(); it != endIt; ++it) { - //-- verify it's a non-null variable + //-- verify it's a non-nullptr variable const CustomizationVariable *const variable = it->second; if (variable && variable->doesVariablePersist()) { @@ -430,11 +430,11 @@ std::string CustomizationData::LocalDirectory::writeLocalDirectoryToString() con const CustomizationVariableMap::const_iterator endIt = m_variables.end(); for (CustomizationVariableMap::const_iterator it = m_variables.begin(); it != endIt; ++it) { - //-- verify it's a non-null variable + //-- verify it's a non-nullptr variable const CustomizationVariable *const variable = it->second; if (!variable) { - WARNING(true, ("writeLocalDirectoryToString: NULL variable for [%s], skipping variable writing.")); + WARNING(true, ("writeLocalDirectoryToString: nullptr variable for [%s], skipping variable writing.")); continue; } diff --git a/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp b/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp index 32208e24..b21696d4 100755 --- a/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp +++ b/engine/shared/library/sharedObject/src/shared/customization/CustomizationIdManager.cpp @@ -189,7 +189,7 @@ bool CustomizationIdManager::mapIdToString(int id, char *variableName, int buffe NOT_NULL(variableName); DEBUG_FATAL(bufferLength < 1, ("CustomizationIdManager: bufferLength of [%d] too small to hold anything.", bufferLength)); - //-- Copy variable name to user buffer, ensure it gets NULL terminated. + //-- Copy variable name to user buffer, ensure it gets nullptr terminated. strncpy(variableName, NON_NULL(s_idToVariableName[static_cast(id)])->getString(), static_cast(bufferLength - 1)); variableName[bufferLength - 1] = '\0'; diff --git a/engine/shared/library/sharedObject/src/shared/customization/ObjectTemplateCustomizationDataWriter.cpp b/engine/shared/library/sharedObject/src/shared/customization/ObjectTemplateCustomizationDataWriter.cpp index a02bf9d0..3e18e9a9 100755 --- a/engine/shared/library/sharedObject/src/shared/customization/ObjectTemplateCustomizationDataWriter.cpp +++ b/engine/shared/library/sharedObject/src/shared/customization/ObjectTemplateCustomizationDataWriter.cpp @@ -149,7 +149,7 @@ bool ObjectTemplateCustomizationDataWriter::writeToFile(const std::string &pathN if (!allowOverwrite) { FILE *const testFile = fopen(pathName.c_str(), "r"); - if (testFile != NULL) + if (testFile != nullptr) { fclose(testFile); DEBUG_REPORT_LOG(true, ("writeToFile(): overwrite attempt: skipped writing [%s] because it already exists and allowOverwrite == false.\n", pathName.c_str())); diff --git a/engine/shared/library/sharedObject/src/shared/lot/LotManager.cpp b/engine/shared/library/sharedObject/src/shared/lot/LotManager.cpp index eb5ee6bf..6d379528 100755 --- a/engine/shared/library/sharedObject/src/shared/lot/LotManager.cpp +++ b/engine/shared/library/sharedObject/src/shared/lot/LotManager.cpp @@ -129,7 +129,7 @@ void LotManager::addNoBuildEntry (Object const & object, float const noBuildRadi bool const result = m_noBuildEntryMap->insert (std::make_pair (&object, noBuildEntry)).second; UNREF (result); DEBUG_FATAL (!result, ("LotManager::addNoBuildEntry - entry already exists")); - DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: added no build entry for object %s [%s] at <%1.2f, %1.2f>\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "null", position_w.x, position_w.z)); + DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: added no build entry for object %s [%s] at <%1.2f, %1.2f>\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "nullptr", position_w.x, position_w.z)); } //------------------------------------------------------------------- @@ -150,7 +150,7 @@ void LotManager::removeNoBuildEntry (const Object& object) else DEBUG_FATAL (true, ("LotManager::removeNoBuildEntry - entry not found")); - DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: removed no build entry for object %s [%s]\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "null")); + DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: removed no build entry for object %s [%s]\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "nullptr")); } //------------------------------------------------------------------- @@ -177,7 +177,7 @@ void LotManager::addStructureFootprintEntry (const Object& object, const Structu UNREF (result); DEBUG_FATAL (!result, ("LotManager::addStructureFootprintEntry - entry already exists")); - DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: added structure footprint entry for object %s [%s] at <%1.2f, %1.2f>\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "null", x * m_chunkWidthInMeters + m_chunkWidthInMeters * 0.5f, z * m_chunkWidthInMeters + m_chunkWidthInMeters * 0.5f)); + DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: added structure footprint entry for object %s [%s] at <%1.2f, %1.2f>\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "nullptr", x * m_chunkWidthInMeters + m_chunkWidthInMeters * 0.5f, z * m_chunkWidthInMeters + m_chunkWidthInMeters * 0.5f)); } //------------------------------------------------------------------- @@ -191,7 +191,7 @@ void LotManager::removeStructureFootprintEntry (const Object& object) else DEBUG_FATAL (true, ("LotManager::removeStructureFootprintEntry - entry not found")); - DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: removed structure footprint entry for object %s [%s]\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "null")); + DEBUG_REPORT_LOG (ms_logEntries, ("LotManager: removed structure footprint entry for object %s [%s]\n", object.getNetworkId ().getValueString ().c_str (), object.getObjectTemplateName () ? object.getObjectTemplateName () : "nullptr")); } //------------------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp b/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp index e09b9c37..dc2a932c 100755 --- a/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp @@ -277,13 +277,13 @@ void AlterSchedulerNamespace::reportPrint() // ---------------------------------------------------------------------- /** - * NULL objects are not considered valid by this function. Do not call this on a NULL + * nullptr objects are not considered valid by this function. Do not call this on a nullptr * object if that happens to be valid in the context in which this function is used. */ void AlterSchedulerNamespace::validateObject(Object const *object) { - FATAL(!object, ("validateObject(): alter scheduler found NULL object.")); + FATAL(!object, ("validateObject(): alter scheduler found nullptr object.")); DO_ON_VALIDATE_OBJECTS(bool isInvalid = false); @@ -331,7 +331,7 @@ void AlterSchedulerNamespace::validateObject(Object const *object) if (isInvalid) { //-- Print out object info for the invalid object if we have it. - ObjectInfo *objectInfo = NULL; + ObjectInfo *objectInfo = nullptr; if (s_trackObjectInfo) { ObjectInfoMap::iterator findIt = s_objectInfoMap.find(const_cast(object)); @@ -352,7 +352,7 @@ void AlterSchedulerNamespace::validateObject(Object const *object) // ---------------------------------------------------------------------- /** - * Return true if two strings are the same (or are both NULL); otherwise, return false. + * Return true if two strings are the same (or are both nullptr); otherwise, return false. */ static bool SafeStringEqual(char const *string1, char const *string2) @@ -682,7 +682,7 @@ void AlterScheduler::alter(float elapsedTime) DO_ON_DEBUG(if (s_suspendExecution) return); PROFILER_AUTO_BLOCK_DEFINE("AlterScheduler::alter"); - doAlterAndConcludeForAllObjects(elapsedTime, CS_none, NULL); + doAlterAndConcludeForAllObjects(elapsedTime, CS_none, nullptr); } // ---------------------------------------------------------------------- @@ -702,7 +702,7 @@ void AlterScheduler::alterAndConclude(float elapsedTime) DO_ON_DEBUG(if (s_suspendExecution) return); PROFILER_AUTO_BLOCK_DEFINE("AlterScheduler::alterAndConclude"); - doAlterAndConcludeForAllObjects(elapsedTime, CS_all, NULL); + doAlterAndConcludeForAllObjects(elapsedTime, CS_all, nullptr); } // ---------------------------------------------------------------------- @@ -724,7 +724,7 @@ void AlterScheduler::initializeScheduleTimeMapIterator(Object &object) bool AlterScheduler::isIteratorInScheduleTimeMap(void const *iterator) { - DEBUG_FATAL(!iterator, ("AlterScheduler::isIteratorInScheduleTimeMap(): iterator pointer is NULL.")); + DEBUG_FATAL(!iterator, ("AlterScheduler::isIteratorInScheduleTimeMap(): iterator pointer is nullptr.")); return (*static_cast(iterator) != s_scheduleMap.end()); } @@ -734,7 +734,7 @@ bool AlterScheduler::findObjectInAlterNowList(Object const *object) { DO_ON_HARDCORE_VALIDATION(validateAlterNowList()); - for (Object *searchObject = s_alterNowListFirst->getNextFromAlterNowList(); searchObject != NULL; searchObject = searchObject->getNextFromAlterNowList()) + for (Object *searchObject = s_alterNowListFirst->getNextFromAlterNowList(); searchObject != nullptr; searchObject = searchObject->getNextFromAlterNowList()) { if (searchObject == object) return true; @@ -751,7 +751,7 @@ bool AlterScheduler::findObjectInAlterNextFrameLists(Object const *object) for (int phaseIndex = 0; phaseIndex < AS_MAX_SCHEDULE_PHASE_COUNT; ++phaseIndex) { - for (Object *searchObject = s_alterNextFrameListFirst[phaseIndex]->getNextFromAlterNextFrameList(); searchObject != NULL; searchObject = searchObject->getNextFromAlterNextFrameList()) + for (Object *searchObject = s_alterNextFrameListFirst[phaseIndex]->getNextFromAlterNextFrameList(); searchObject != nullptr; searchObject = searchObject->getNextFromAlterNextFrameList()) { if (searchObject == object) return true; @@ -767,7 +767,7 @@ bool AlterScheduler::findObjectInConcludeList(Object const *object) { DO_ON_HARDCORE_VALIDATION(validateConcludeList()); - for (Object *searchObject = s_concludeListFirst->getNextFromConcludeList(); searchObject != NULL; searchObject = searchObject->getNextFromConcludeList()) + for (Object *searchObject = s_concludeListFirst->getNextFromConcludeList(); searchObject != nullptr; searchObject = searchObject->getNextFromConcludeList()) { if (searchObject == object) return true; @@ -817,7 +817,7 @@ void AlterScheduler::validateAlterNowList() //-- Add each object to the set and list. { - for (Object *object = s_alterNowListFirst->getNextFromAlterNowList(); object != NULL; object = object->getNextFromAlterNowList()) + for (Object *object = s_alterNowListFirst->getNextFromAlterNowList(); object != nullptr; object = object->getNextFromAlterNowList()) { DO_ON_VALIDATE_OBJECTS(validateObject(object)); @@ -836,7 +836,7 @@ void AlterScheduler::validateAlterNowList() { ObjectList::iterator const endIt = objectList.end(); Object *object = s_alterNowListFirst->getNextFromAlterNowList(); - for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != NULL); object = object->getNextFromAlterNowList(), ++it) + for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != nullptr); object = object->getNextFromAlterNowList(), ++it) { lastObject = object; DEBUG_WARNING(object != *it, ("validateAlterNowList(): forward linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); @@ -848,7 +848,7 @@ void AlterScheduler::validateAlterNowList() { ObjectList::reverse_iterator const endIt = objectList.rend(); Object *object = lastObject; - for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != NULL); object = object->getPreviousFromAlterNowList(), ++it) + for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != nullptr); object = object->getPreviousFromAlterNowList(), ++it) { DEBUG_WARNING(object != *it, ("validateAlterNowList(): reverse linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); DEBUG_FATAL(object != *it, ("validateAlterNowList(): reverse linkage check failed, alter scheduler list: pointer=[%p], object id=[%s], object template=[%s].", object, object->getNetworkId().getValueString().c_str(), object->getObjectTemplateName())); @@ -867,7 +867,7 @@ void AlterScheduler::validateAlterNextFrameLists() { //-- Add each object to the set and list. { - for (Object *object = s_alterNextFrameListFirst[phaseIndex]->getNextFromAlterNextFrameList(); object != NULL; object = object->getNextFromAlterNextFrameList()) + for (Object *object = s_alterNextFrameListFirst[phaseIndex]->getNextFromAlterNextFrameList(); object != nullptr; object = object->getNextFromAlterNextFrameList()) { DO_ON_VALIDATE_OBJECTS(validateObject(object)); @@ -886,7 +886,7 @@ void AlterScheduler::validateAlterNextFrameLists() { ObjectList::iterator const endIt = objectList.end(); Object *object = s_alterNextFrameListFirst[phaseIndex]->getNextFromAlterNextFrameList(); - for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != NULL); object = object->getNextFromAlterNextFrameList(), ++it) + for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != nullptr); object = object->getNextFromAlterNextFrameList(), ++it) { lastObject = object; DEBUG_WARNING(object != *it, ("validateAlterNextFrameList(): forward linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); @@ -898,7 +898,7 @@ void AlterScheduler::validateAlterNextFrameLists() { ObjectList::reverse_iterator const endIt = objectList.rend(); Object *object = lastObject; - for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != NULL); object = object->getPreviousFromAlterNextFrameList(), ++it) + for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != nullptr); object = object->getPreviousFromAlterNextFrameList(), ++it) { DEBUG_WARNING(object != *it, ("validateAlterNextFrameList(): reverse linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); DEBUG_FATAL(object != *it, ("validateAlterNextFrameList(): reverse linkage check failed, alter scheduler list: pointer=[%p], object id=[%s], object template=[%s].", object, object->getNetworkId().getValueString().c_str(), object->getObjectTemplateName())); @@ -919,7 +919,7 @@ void AlterScheduler::validateConcludeList() //-- Add each object to the set and list. { - for (Object *object = s_concludeListFirst->getNextFromConcludeList(); object != NULL; object = object->getNextFromConcludeList()) + for (Object *object = s_concludeListFirst->getNextFromConcludeList(); object != nullptr; object = object->getNextFromConcludeList()) { DO_ON_VALIDATE_OBJECTS(validateObject(object)); @@ -938,7 +938,7 @@ void AlterScheduler::validateConcludeList() { ObjectList::iterator const endIt = objectList.end(); Object *object = s_concludeListFirst->getNextFromConcludeList(); - for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != NULL); object = object->getNextFromConcludeList(), ++it) + for (ObjectList::iterator it = objectList.begin(); (it != endIt) && (object != nullptr); object = object->getNextFromConcludeList(), ++it) { lastObject = object; DEBUG_WARNING(object != *it, ("validateConcludeList(): forward linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); @@ -950,7 +950,7 @@ void AlterScheduler::validateConcludeList() { ObjectList::reverse_iterator const endIt = objectList.rend(); Object *object = lastObject; - for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != NULL); object = object->getPreviousFromConcludeList(), ++it) + for (ObjectList::reverse_iterator it = objectList.rbegin(); (it != endIt) && (object != nullptr); object = object->getPreviousFromConcludeList(), ++it) { DEBUG_WARNING(object != *it, ("validateConcludeList(): reverse linkage check failed, stl list: pointer=[%p], object id=[%s], object template=[%s].", *it, (*it)->getNetworkId().getValueString().c_str(), (*it)->getObjectTemplateName())); DEBUG_FATAL(object != *it, ("validateConcludeList(): reverse linkage check failed, alter scheduler list: pointer=[%p], object id=[%s], object template=[%s].", object, object->getNetworkId().getValueString().c_str(), object->getObjectTemplateName())); @@ -1184,8 +1184,8 @@ void AlterScheduler::moveObjectsFromAlterNextFrameListToAlterNowList(int schedul { PROFILER_AUTO_BLOCK_DEFINE("copy next frame"); - //if (s_alterNextFrameListFirst != NULL) { - for (Object *object = s_alterNextFrameListFirst[schedulePhaseIndex]->getNextFromAlterNextFrameList(); object != NULL; ) + //if (s_alterNextFrameListFirst != nullptr) { + for (Object *object = s_alterNextFrameListFirst[schedulePhaseIndex]->getNextFromAlterNextFrameList(); object != nullptr; ) { //-- Add object to alter now list. This removes the object from the alter next frame list. DO_ON_VALIDATE_OBJECTS(validateObject(object)); @@ -1222,7 +1222,7 @@ void AlterScheduler::alterSingleObject(Object *object, ConcludeStyle concludeSty DO_ON_DEBUG(s_currentlyAlteringObject = object); #if defined(_WIN32) && defined(_DEBUG) - char const * const typeName = s_profileAlterByType ? typeid(*object).name() : NULL; + char const * const typeName = s_profileAlterByType ? typeid(*object).name() : nullptr; PROFILER_BLOCK_DEFINE(profilerBlock, typeName); if (typeName) PROFILER_BLOCK_ENTER(profilerBlock); @@ -1245,7 +1245,7 @@ void AlterScheduler::alterSingleObject(Object *object, ConcludeStyle concludeSty PROFILER_BLOCK_LEAVE(profilerBlock); #endif - DO_ON_DEBUG(s_currentlyAlteringObject = NULL); + DO_ON_DEBUG(s_currentlyAlteringObject = nullptr); DO_ON_VALIDATE_OBJECTS(validateObject(object)); } @@ -1254,7 +1254,7 @@ void AlterScheduler::alterSingleObject(Object *object, ConcludeStyle concludeSty nextObject = object->getNextFromAlterNowList(); #if VALIDATE_OBJECTS - if (nextObject != NULL) + if (nextObject != nullptr) { DO_ON_HARDCORE_VALIDATION(DEBUG_FATAL(!findObjectInAlterNowList(nextObject), ("didn't find object in alter now list, unexpected."))); validateObject(nextObject); @@ -1343,7 +1343,7 @@ void AlterScheduler::alterSingleObject(Object *object, ConcludeStyle concludeSty ScheduleTime const absoluteScheduleTime = s_currentTime + dt; // Add it to the schedule list for the specified scheduler time. - // If this object is NULL, it means it returned an AlterResult that indicated it should still be alive but it somehow got killed. + // If this object is nullptr, it means it returned an AlterResult that indicated it should still be alive but it somehow got killed. //DEBUG_REPORT_LOG(object->getNetworkId() != NetworkId::cms_invalid, ("[aitest] scheduling %s to alter at %lu (%lu + %lu)\n", // object->getNetworkId().getValueString().c_str(), // static_cast(absoluteScheduleTime), @@ -1363,7 +1363,7 @@ void AlterScheduler::concludeAndRemoveAllConcludeEntries() PROFILER_AUTO_BLOCK_DEFINE("conclude"); Object *nextObject; - for (Object *object = s_concludeListFirst->getNextFromConcludeList(); object != NULL; object = nextObject) + for (Object *object = s_concludeListFirst->getNextFromConcludeList(); object != nullptr; object = nextObject) { //-- Conclude the object. DO_ON_VALIDATE_OBJECTS(validateObject(object)); @@ -1400,7 +1400,7 @@ void AlterScheduler::doAlterAndConcludeForAllObjects(float schedulerElapsedTime, DO_ON_HARDCORE_VALIDATION(validateAllContainers()); Object *nextObject; - for (Object *object = s_alterNowListFirst->getNextFromAlterNowList(); object != NULL; object = nextObject) + for (Object *object = s_alterNowListFirst->getNextFromAlterNowList(); object != nullptr; object = nextObject) alterSingleObject(object, concludeStyle, nextObject); } diff --git a/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.cpp b/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.cpp index 47c87004..ea766f6e 100755 --- a/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/CachedNetworkId.cpp @@ -32,7 +32,7 @@ void CachedNetworkId::checkValidity() const CachedNetworkId::CachedNetworkId() : m_id(cms_invalid), -m_object(NULL) +m_object(nullptr) { } @@ -40,7 +40,7 @@ m_object(NULL) CachedNetworkId::CachedNetworkId(const NetworkId& id) : m_id(id), -m_object(NULL) +m_object(nullptr) { } @@ -48,7 +48,7 @@ m_object(NULL) CachedNetworkId::CachedNetworkId(NetworkId::NetworkIdType value) : m_id(value), -m_object(NULL) +m_object(nullptr) { } @@ -66,7 +66,7 @@ m_object(const_cast(&object)) CachedNetworkId::CachedNetworkId(const std::string &value) : m_id(value), -m_object(NULL) +m_object(nullptr) { } @@ -98,7 +98,7 @@ CachedNetworkId& CachedNetworkId::operator= (const CachedNetworkId& rhs) CachedNetworkId& CachedNetworkId::operator= (const NetworkId& rhs) { m_id = rhs; - m_object = NULL; + m_object = nullptr; return *this; } // ---------------------------------------------------------- @@ -178,7 +178,7 @@ Object* CachedNetworkId::getObject() const return m_object; } - return NULL; + return nullptr; } // ---------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/object/Object.cpp b/engine/shared/library/sharedObject/src/shared/object/Object.cpp index 73273e36..2cad0571 100755 --- a/engine/shared/library/sharedObject/src/shared/object/Object.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/Object.cpp @@ -515,7 +515,7 @@ void ObjectNamespace::remove() #endif delete ms_transformMemoryBlockManager; - ms_transformMemoryBlockManager = NULL; + ms_transformMemoryBlockManager = nullptr; DEBUG_WARNING(static_cast(ms_freeDpvsObjectsList.size()) != ms_allocatedDpvsObjects, ("Leaked %d DpvsObjects lists", ms_allocatedDpvsObjects - static_cast(ms_freeDpvsObjectsList.size()))); while (!ms_systemAllocatedDpvsObjectsList.empty()) @@ -570,11 +570,11 @@ void ObjectNamespace::validatePosition(Object const & object, Vector const & pos object.getNetworkId().getValueString().c_str(), object.getObjectTemplateName(), &object, - object.getAppearance() ? object.getAppearance()->getAppearanceTemplateName() : NULL, - parent ? parent->getNetworkId().getValueString().c_str() : NULL, - parent ? parent->getObjectTemplateName() : NULL, - parent ? parent : NULL, - parent && parent->getAppearance() ? parent->getAppearance()->getAppearanceTemplateName() : NULL)); + object.getAppearance() ? object.getAppearance()->getAppearanceTemplateName() : nullptr, + parent ? parent->getNetworkId().getValueString().c_str() : nullptr, + parent ? parent->getObjectTemplateName() : nullptr, + parent ? parent : nullptr, + parent && parent->getAppearance() ? parent->getAppearance()->getAppearanceTemplateName() : nullptr)); } } @@ -703,30 +703,30 @@ Object::Object(): #if OBJECT_SUPPORTS_IS_ALTERING_FLAG m_isAltering(false), #endif - m_objectTemplate(NULL), + m_objectTemplate(nullptr), m_notificationList(NotificationListManager::getEmptyNotificationList()), - m_debugName(NULL), + m_debugName(nullptr), m_networkId(NetworkId::cms_invalid), - m_appearance(NULL), - m_controller(NULL), - m_dynamics(NULL), - m_attachedToObject(NULL), - m_attachedObjects(NULL), - m_dpvsObjects(NULL), + m_appearance(nullptr), + m_controller(nullptr), + m_dynamics(nullptr), + m_attachedToObject(nullptr), + m_attachedObjects(nullptr), + m_dpvsObjects(nullptr), m_rotations(0), m_scale(Vector::xyz111), m_objectToParent(), - m_objectToWorld(NULL), + m_objectToWorld(nullptr), m_watchedByList(), - m_containerProperty(NULL), - m_collisionProperty(NULL), + m_containerProperty(nullptr), + m_collisionProperty(nullptr), m_spatialSubdivisionHandle (0), m_useAlterScheduler(true), - m_scheduleData(NULL), + m_scheduleData(nullptr), m_shouldBakeIntoMesh(true), - m_defaultAppearance(NULL), - m_alternateAppearance(NULL), - m_containedBy(NULL) + m_defaultAppearance(nullptr), + m_alternateAppearance(nullptr), + m_containedBy(nullptr) { m_defaultAppearance = m_appearance; } @@ -752,25 +752,25 @@ Object::Object(const ObjectTemplate *objectTemplate, const NetworkId &networkId) m_debugName(0), m_networkId(networkId), m_appearance(0), - m_controller(NULL), - m_dynamics(NULL), - m_attachedToObject(NULL), - m_attachedObjects(NULL), - m_dpvsObjects(NULL), + m_controller(nullptr), + m_dynamics(nullptr), + m_attachedToObject(nullptr), + m_attachedObjects(nullptr), + m_dpvsObjects(nullptr), m_rotations(0), m_scale(Vector::xyz111), m_objectToParent(), - m_objectToWorld(NULL), + m_objectToWorld(nullptr), m_watchedByList(), - m_containerProperty(NULL), - m_collisionProperty(NULL), + m_containerProperty(nullptr), + m_collisionProperty(nullptr), m_spatialSubdivisionHandle (0), m_useAlterScheduler(true), - m_scheduleData(NULL), + m_scheduleData(nullptr), m_shouldBakeIntoMesh(true), - m_defaultAppearance(NULL), - m_alternateAppearance(NULL), - m_containedBy(NULL) + m_defaultAppearance(nullptr), + m_alternateAppearance(nullptr), + m_containedBy(nullptr) { objectTemplate->addReference(); NetworkIdManager::addObject(*this); @@ -799,25 +799,25 @@ Object::Object(const ObjectTemplate *objectTemplate, InitializeFlag): m_debugName(0), m_networkId(NetworkId::cms_invalid), m_appearance(0), - m_controller(NULL), - m_dynamics(NULL), - m_attachedToObject(NULL), - m_attachedObjects(NULL), - m_dpvsObjects(NULL), + m_controller(nullptr), + m_dynamics(nullptr), + m_attachedToObject(nullptr), + m_attachedObjects(nullptr), + m_dpvsObjects(nullptr), m_rotations(0), m_scale(Vector::xyz111), m_objectToParent(), - m_objectToWorld(NULL), + m_objectToWorld(nullptr), m_watchedByList(), - m_containerProperty(NULL), - m_collisionProperty(NULL), + m_containerProperty(nullptr), + m_collisionProperty(nullptr), m_spatialSubdivisionHandle (0), m_useAlterScheduler(true), - m_scheduleData(NULL), + m_scheduleData(nullptr), m_shouldBakeIntoMesh(true), - m_defaultAppearance(NULL), - m_alternateAppearance(NULL), - m_containedBy(NULL) + m_defaultAppearance(nullptr), + m_alternateAppearance(nullptr), + m_containedBy(nullptr) { objectTemplate->addReference(); NetworkIdManager::addObject(*this); @@ -836,7 +836,7 @@ Object::~Object(void) IGNORE_RETURN(snprintf(ms_crashReportInfo, sizeof(ms_crashReportInfo) - 1, "~Object: name=[%s] template=[%s]\n", getDebugName(), getObjectTemplateName())); ms_crashReportInfo[sizeof(ms_crashReportInfo) - 1] = '\0'; - DEBUG_REPORT_LOG(ms_logObjectDelete, ("Deleting object id=[%s], template=[%s], pointer=[%p], appearance=[%s], parent id=[%s], template=[%s], pointer=[%p], appearance=[%s]\n", getNetworkId().getValueString().c_str(), getObjectTemplateName(), this, getAppearance() ? getAppearance()->getAppearanceTemplateName() : NULL, m_attachedToObject ? m_attachedToObject->getNetworkId().getValueString().c_str() : NULL, m_attachedToObject ? m_attachedToObject->getObjectTemplateName() : NULL, m_attachedToObject ? m_attachedToObject : NULL, m_attachedToObject && m_attachedToObject->getAppearance() ? m_attachedToObject->getAppearance()->getAppearanceTemplateName() : NULL)); + DEBUG_REPORT_LOG(ms_logObjectDelete, ("Deleting object id=[%s], template=[%s], pointer=[%p], appearance=[%s], parent id=[%s], template=[%s], pointer=[%p], appearance=[%s]\n", getNetworkId().getValueString().c_str(), getObjectTemplateName(), this, getAppearance() ? getAppearance()->getAppearanceTemplateName() : nullptr, m_attachedToObject ? m_attachedToObject->getNetworkId().getValueString().c_str() : nullptr, m_attachedToObject ? m_attachedToObject->getObjectTemplateName() : nullptr, m_attachedToObject ? m_attachedToObject : nullptr, m_attachedToObject && m_attachedToObject->getAppearance() ? m_attachedToObject->getAppearance()->getAppearanceTemplateName() : nullptr)); FATAL(ConfigSharedObject::getAllowDisallowObjectDelete() && ms_disallowObjectDelete, ("Object id=[%s], template=[%s], pointer=[%p] is deleting itself when delete is not allowed", getNetworkId().getValueString().c_str(), getObjectTemplateName(), this)); #if OBJECT_SUPPORTS_IS_ALTERING_FLAG @@ -905,7 +905,7 @@ Object::~Object(void) } deleteAttachedObjects(m_attachedObjects); - m_attachedObjects = NULL; + m_attachedObjects = nullptr; } if (m_objectToWorld) @@ -914,9 +914,9 @@ Object::~Object(void) m_objectToWorld = 0; } - if (m_objectTemplate != NULL) + if (m_objectTemplate != nullptr) m_objectTemplate->releaseReference(); - m_objectTemplate = NULL; + m_objectTemplate = nullptr; m_notificationList = 0; @@ -1139,7 +1139,7 @@ void Object::removeFromWorld() { if (attached->isInWorld()) { - DEBUG_WARNING(true, ("Removing an object [id=%s template=%s] from the world with non-child attached objects [id=%s ptr=0x%08x template=%s name=%s]", getNetworkId ().getValueString ().c_str (), getObjectTemplateName () ? getObjectTemplateName () : "null", attached->getNetworkId ().getValueString ().c_str (), attached, attached->getObjectTemplateName () ? attached->getObjectTemplateName () : "null", attached->getDebugName())); + DEBUG_WARNING(true, ("Removing an object [id=%s template=%s] from the world with non-child attached objects [id=%s ptr=0x%08x template=%s name=%s]", getNetworkId ().getValueString ().c_str (), getObjectTemplateName () ? getObjectTemplateName () : "nullptr", attached->getNetworkId ().getValueString ().c_str (), attached, attached->getObjectTemplateName () ? attached->getObjectTemplateName () : "nullptr", attached->getDebugName())); attached->detachFromObject(DF_parent); } } @@ -1369,7 +1369,7 @@ bool Object::isInWorldCell() const CellProperty *Object::getParentCell() const { - Property *cell = NULL; + Property *cell = nullptr; for (Object *o = const_cast(getAttachedTo()); o && !cell; o = o->getAttachedTo()) cell = o->getCellProperty(); @@ -1580,7 +1580,7 @@ void Object::setAppearance(Appearance *newAppearance) * Steal the Appearance from this object. * * This routine will return the current appearance of this object, and - * then reset its appearance to NULL. + * then reset its appearance to nullptr. * * @return The current appearance of this object */ @@ -1590,18 +1590,18 @@ Appearance *Object::stealAppearance(void) Appearance *oldAppearance = m_appearance; if(m_appearance == m_defaultAppearance) - m_defaultAppearance = NULL; + m_defaultAppearance = nullptr; else if (m_appearance == m_alternateAppearance) - m_alternateAppearance = NULL; + m_alternateAppearance = nullptr; - m_appearance = NULL; + m_appearance = nullptr; if (oldAppearance) { if (isInWorld()) oldAppearance->removeFromWorld(); - oldAppearance->setOwner(NULL); + oldAppearance->setOwner(nullptr); } return oldAppearance; @@ -1999,7 +1999,7 @@ void Object::detachFromObject(DetachFlags const detachFlags) bool const shouldAttach = (!toParentCell || noCell) ? false : m_attachedToObject != &cellProperty->getOwner(); m_objectToParent = shouldAttach ? getTransform_o2c() : getTransform_o2w(); deleteLocalTransform(m_objectToWorld); - m_objectToWorld = NULL; + m_objectToWorld = nullptr; setObjectToWorldDirty(true); // remove from the attached objects list @@ -2010,7 +2010,7 @@ void Object::detachFromObject(DetachFlags const detachFlags) attachedObjects->pop_back(); // set as unattached - m_attachedToObject = NULL; + m_attachedToObject = nullptr; bool const wasChildObject = isChildObject(); bool const wasInWorld = isInWorld(); @@ -2102,7 +2102,7 @@ void Object::removeChildObject(Object * childObjectToRemove, DetachFlags detachF Object *Object::getRootParent(void) { - DEBUG_FATAL(m_childObject && m_attachedToObject == NULL, ("am a child but attached to is NULL")); + DEBUG_FATAL(m_childObject && m_attachedToObject == nullptr, ("am a child but attached to is nullptr")); return m_childObject ? NON_NULL(m_attachedToObject)->getRootParent() : this; } @@ -2116,7 +2116,7 @@ Object *Object::getRootParent(void) const Object *Object::getRootParent(void) const { - DEBUG_FATAL(m_childObject && m_attachedToObject == NULL, ("am a child but attached to is NULL")); + DEBUG_FATAL(m_childObject && m_attachedToObject == nullptr, ("am a child but attached to is nullptr")); return m_childObject ? NON_NULL(m_attachedToObject)->getRootParent() : this; } @@ -2231,7 +2231,7 @@ void Object::setRecursiveScale(Vector const & scale) Controller* Object::stealController(void) { Controller* returnValue = m_controller; - m_controller = NULL; + m_controller = nullptr; return returnValue; } @@ -2362,7 +2362,7 @@ Property const *Object::getProperty(PropertyId const &id) const if ((*i)->getPropertyId() == id) return *i; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2376,7 +2376,7 @@ Property *Object::getProperty(PropertyId const &id) if ((*i)->getPropertyId() == id) return *i; - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2399,13 +2399,13 @@ void Object::removeProperty(PropertyId const &id) } if (id == CellProperty::getClassPropertyId() || id == PortalProperty::getClassPropertyId() || id == SlottedContainer::getClassPropertyId() || id == VolumeContainer::getClassPropertyId()) - m_containerProperty = NULL; + m_containerProperty = nullptr; else if (id == ContainedByProperty::getClassPropertyId()) - m_containedBy = NULL; + m_containedBy = nullptr; else if (id == CollisionProperty::getClassPropertyId()) - m_collisionProperty = NULL; + m_collisionProperty = nullptr; } // ---------------------------------------------------------------------- @@ -2453,7 +2453,7 @@ void Object::lookAt_o (const Vector &position_o, const Vector &j_o) void Object::setAppearanceByName(char const *path) { - if (path != NULL) + if (path != nullptr) { if (TreeFile::exists(path)) { @@ -2461,7 +2461,7 @@ void Object::setAppearanceByName(char const *path) Appearance *appearance = AppearanceTemplateList::createAppearance(path); - if (appearance != NULL) + if (appearance != nullptr) { setAppearance(appearance); } else { @@ -2475,7 +2475,7 @@ void Object::setAppearanceByName(char const *path) } else { - DEBUG_WARNING(true, ("Object::setAppearanceByName() - NULL appearance path specified for object: %s", (getObjectTemplateName() == NULL) ? "" : getObjectTemplateName())); + DEBUG_WARNING(true, ("Object::setAppearanceByName() - nullptr appearance path specified for object: %s", (getObjectTemplateName() == nullptr) ? "" : getObjectTemplateName())); } } @@ -2539,7 +2539,7 @@ SlottedContainer * Object::getSlottedContainerProperty() Container *container = getContainerProperty(); if (container && container->getPropertyId() == SlottedContainer::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2549,7 +2549,7 @@ SlottedContainer const * Object::getSlottedContainerProperty() const Container const *container = getContainerProperty(); if (container && container->getPropertyId() == SlottedContainer::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2559,7 +2559,7 @@ VolumeContainer * Object::getVolumeContainerProperty() Container *container = getContainerProperty(); if (container && container->getPropertyId() == VolumeContainer::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2569,7 +2569,7 @@ VolumeContainer const * Object::getVolumeContainerProperty() const Container const *container = getContainerProperty(); if (container && container->getPropertyId() == VolumeContainer::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2579,7 +2579,7 @@ CellProperty * Object::getCellProperty() Container *container = getContainerProperty(); if (container && container->getPropertyId() == CellProperty::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2589,7 +2589,7 @@ CellProperty const * Object::getCellProperty() const Container const *container = getContainerProperty(); if (container && container->getPropertyId() == CellProperty::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2599,7 +2599,7 @@ PortalProperty * Object::getPortalProperty() Container *container = getContainerProperty(); if (container && container->getPropertyId() == PortalProperty::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2609,7 +2609,7 @@ PortalProperty const * Object::getPortalProperty() const Container const *container = getContainerProperty(); if (container && container->getPropertyId() == PortalProperty::getClassPropertyId()) return safe_cast(container); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -2658,7 +2658,7 @@ ServerObject const * Object::asServerObject() const bool Object::hasScheduleData() const { - return (m_scheduleData != NULL); + return (m_scheduleData != nullptr); } // ---------------------------------------------------------------------- @@ -2697,7 +2697,7 @@ void Object::setMostRecentAlterTime(ScheduleTime mostRecentAlterTime) bool Object::isInAlterNextFrameList() const { - return (m_scheduleData == NULL) ? false : (m_scheduleData->getAlterNextFrameNext() != NULL) || (m_scheduleData->getAlterNextFramePrevious() != NULL); + return (m_scheduleData == nullptr) ? false : (m_scheduleData->getAlterNextFrameNext() != nullptr) || (m_scheduleData->getAlterNextFramePrevious() != nullptr); } // ---------------------------------------------------------------------- @@ -2708,7 +2708,7 @@ void Object::insertIntoAlterNextFrameList(Object *afterThisObject) DEBUG_FATAL(isInAlterNextFrameList(), ("insertIntoAlterNextFrameList(): object id=[%s],template=[%s] already in AlterNextFrame list.", getNetworkId().getValueString().c_str(), getObjectTemplateName())); NOT_NULL(afterThisObject); NOT_NULL(afterThisObject->m_scheduleData); - DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNextFrameNext() && !afterThisObject->m_scheduleData->getAlterNextFrameNext()->m_scheduleData, ("Non-NULL forward link does not have schedule data.")); + DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNextFrameNext() && !afterThisObject->m_scheduleData->getAlterNextFrameNext()->m_scheduleData, ("Non-nullptr forward link does not have schedule data.")); DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNextFrameNext() && (afterThisObject->m_scheduleData->getAlterNextFrameNext()->m_scheduleData->getAlterNextFramePrevious() != afterThisObject), ("List corruption: alter next frame.")); //-- Get new next and previous object for the list. @@ -2745,13 +2745,13 @@ void Object::removeFromAlterNextFrameList() DEBUG_FATAL(newNext && !newNext->m_scheduleData, ("Next node missing schedule data.")); //-- Handle previous. - m_scheduleData->setAlterNextFramePrevious(NULL); + m_scheduleData->setAlterNextFramePrevious(nullptr); if (newPrevious) newPrevious->m_scheduleData->setAlterNextFrameNext(newNext); //-- Handle next. - m_scheduleData->setAlterNextFrameNext(NULL); + m_scheduleData->setAlterNextFrameNext(nullptr); if (newNext) newNext->m_scheduleData->setAlterNextFramePrevious(newPrevious); @@ -2766,7 +2766,7 @@ void Object::removeFromAlterNextFrameList() int Object::getAlterSchedulePhase() const { - DEBUG_FATAL(m_scheduleData == NULL, ("calling Object::getAlterSchedulePhase() when Object has no schedule data: id=[%s], template=[%s]", getNetworkId().getValueString().c_str(), getObjectTemplateName())); + DEBUG_FATAL(m_scheduleData == nullptr, ("calling Object::getAlterSchedulePhase() when Object has no schedule data: id=[%s], template=[%s]", getNetworkId().getValueString().c_str(), getObjectTemplateName())); return m_scheduleData->getSchedulePhase(); } @@ -2774,7 +2774,7 @@ int Object::getAlterSchedulePhase() const void Object::setAlterSchedulePhase(int schedulePhaseIndex) { - DEBUG_FATAL(m_scheduleData == NULL, ("calling Object::setAlterSchedulePhase() when Object has no schedule data: id=[%s], template=[%s]", getNetworkId().getValueString().c_str(), getObjectTemplateName())); + DEBUG_FATAL(m_scheduleData == nullptr, ("calling Object::setAlterSchedulePhase() when Object has no schedule data: id=[%s], template=[%s]", getNetworkId().getValueString().c_str(), getObjectTemplateName())); m_scheduleData->setSchedulePhase(schedulePhaseIndex); } @@ -2782,7 +2782,7 @@ void Object::setAlterSchedulePhase(int schedulePhaseIndex) bool Object::isInAlterNowList() const { - return (m_scheduleData == NULL) ? false : (m_scheduleData->getAlterNowNext() != NULL) || (m_scheduleData->getAlterNowPrevious() != NULL); + return (m_scheduleData == nullptr) ? false : (m_scheduleData->getAlterNowNext() != nullptr) || (m_scheduleData->getAlterNowPrevious() != nullptr); } // ---------------------------------------------------------------------- @@ -2793,7 +2793,7 @@ void Object::insertIntoAlterNowList(Object *afterThisObject) DEBUG_FATAL(isInAlterNowList(), ("insertIntoAlterNowList(): object id=[%s],template=[%s] already in AlterNow list.", getNetworkId().getValueString().c_str(), getObjectTemplateName())); NOT_NULL(afterThisObject); NOT_NULL(afterThisObject->m_scheduleData); - DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNowNext() && !afterThisObject->m_scheduleData->getAlterNowNext()->m_scheduleData, ("Non-NULL forward link does not have schedule data.")); + DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNowNext() && !afterThisObject->m_scheduleData->getAlterNowNext()->m_scheduleData, ("Non-nullptr forward link does not have schedule data.")); DEBUG_FATAL(afterThisObject->m_scheduleData->getAlterNowNext() && (afterThisObject->m_scheduleData->getAlterNowNext()->m_scheduleData->getAlterNowPrevious() != afterThisObject), ("List corruption: alter now.")); //-- Get new next and previous object for the list. @@ -2830,12 +2830,12 @@ void Object::removeFromAlterNowList() DEBUG_FATAL(newNext && !newNext->m_scheduleData, ("Next node missing schedule data.")); //-- Handle previous. - m_scheduleData->setAlterNowPrevious(NULL); + m_scheduleData->setAlterNowPrevious(nullptr); if (newPrevious) newPrevious->m_scheduleData->setAlterNowNext(newNext); //-- Handle next. - m_scheduleData->setAlterNowNext(NULL); + m_scheduleData->setAlterNowNext(nullptr); if (newNext) newNext->m_scheduleData->setAlterNowPrevious(newPrevious); @@ -2849,7 +2849,7 @@ void Object::removeFromAlterNowList() bool Object::isInConcludeList() const { - return (m_scheduleData == NULL) ? false : (m_scheduleData->getConcludeNext() != NULL) || (m_scheduleData->getConcludePrevious() != NULL); + return (m_scheduleData == nullptr) ? false : (m_scheduleData->getConcludeNext() != nullptr) || (m_scheduleData->getConcludePrevious() != nullptr); } // ---------------------------------------------------------------------- @@ -2860,7 +2860,7 @@ void Object::insertIntoConcludeList(Object *afterThisObject) DEBUG_FATAL(isInConcludeList(), ("insertIntoConcludeList(): object id=[%s],template=[%s] already in Conclude list.", getNetworkId().getValueString().c_str(), getObjectTemplateName())); NOT_NULL(afterThisObject); NOT_NULL(afterThisObject->m_scheduleData); - DEBUG_FATAL(afterThisObject->m_scheduleData->getConcludeNext() && !afterThisObject->m_scheduleData->getConcludeNext()->m_scheduleData, ("Non-NULL forward link does not have schedule data.")); + DEBUG_FATAL(afterThisObject->m_scheduleData->getConcludeNext() && !afterThisObject->m_scheduleData->getConcludeNext()->m_scheduleData, ("Non-nullptr forward link does not have schedule data.")); DEBUG_FATAL(afterThisObject->m_scheduleData->getConcludeNext() && (afterThisObject->m_scheduleData->getConcludeNext()->m_scheduleData->getConcludePrevious() != afterThisObject), ("List corruption: alter now.")); //-- Get new next and previous object for the list. @@ -2897,12 +2897,12 @@ void Object::removeFromConcludeList() DEBUG_FATAL(newNext && !newNext->m_scheduleData, ("Next node missing schedule data.")); //-- Handle previous. - m_scheduleData->setConcludePrevious(NULL); + m_scheduleData->setConcludePrevious(nullptr); if (newPrevious) newPrevious->m_scheduleData->setConcludeNext(newNext); //-- Handle next. - m_scheduleData->setConcludeNext(NULL); + m_scheduleData->setConcludeNext(nullptr); if (newNext) newNext->m_scheduleData->setConcludePrevious(newPrevious); @@ -3015,7 +3015,7 @@ void Object::scheduleForAlter_scheduleTopmostWorldParent() do { //-- Traverse parent links until there is no more parent. - for (Object *parentObject = alterObject->getParent(); parentObject != NULL; parentObject = alterObject->getParent()) + for (Object *parentObject = alterObject->getParent(); parentObject != nullptr; parentObject = alterObject->getParent()) alterObject = parentObject; //-- Traverse container until we're at a container object that is in the world. @@ -3035,7 +3035,7 @@ void Object::scheduleForAlter_scheduleTopmostWorldParent() if (alterObject->isInWorld()) { // We're done searching. - containedByProperty = NULL; + containedByProperty = nullptr; } else { @@ -3052,7 +3052,7 @@ void Object::scheduleForAlter_scheduleTopmostWorldParent() // New container might be a child object, make sure we test for a parent again. // If a parent exists, we need to run through the loop again to find the parent object. - } while (alterObject->getParent() != NULL); + } while (alterObject->getParent() != nullptr); NOT_NULL(alterObject); if (alterObject->isInitialized()) @@ -3270,13 +3270,13 @@ void Object::setAlternateAppearance(const char * path) if(!path) return; - Appearance *alternateAppearance = NULL; + Appearance *alternateAppearance = nullptr; if (TreeFile::exists(path)) { alternateAppearance = AppearanceTemplateList::createAppearance(path); - if (alternateAppearance == NULL) { + if (alternateAppearance == nullptr) { DEBUG_WARNING(true, ("Object::setAlternateAppearance() - Unable to change the object's appearance because the file does not exist: %s", path)); return; } @@ -3313,7 +3313,7 @@ void Object::setAlternateAppearance(const char * path) delete m_alternateAppearance; - m_alternateAppearance = NULL; + m_alternateAppearance = nullptr; } else { diff --git a/engine/shared/library/sharedObject/src/shared/object/Object.h b/engine/shared/library/sharedObject/src/shared/object/Object.h index 7ac8cfe1..9059b52d 100755 --- a/engine/shared/library/sharedObject/src/shared/object/Object.h +++ b/engine/shared/library/sharedObject/src/shared/object/Object.h @@ -495,7 +495,7 @@ inline const ObjectTemplate *Object::getObjectTemplate() const // // Remarks: // -// This return may return NULL. +// This return may return nullptr. inline const char *Object::getDebugName() const { @@ -518,7 +518,7 @@ inline const Vector &Object::getScale() const /** * Get the controller for an object. * - * The return value may be NULL. + * The return value may be nullptr. * * @return Const pointer to the controller */ @@ -532,7 +532,7 @@ inline const Controller *Object::getController() const /** * Get the controller for an object. * - * The return value may be NULL. + * The return value may be nullptr. * * @return Non-const pointer to the controller */ @@ -546,7 +546,7 @@ inline Controller *Object::getController() /** * Get the dynamics for an object. * - * The return value may be NULL. + * The return value may be nullptr. * * @return Const pointer to the dynamics */ @@ -560,7 +560,7 @@ inline const Dynamics *Object::getDynamics() const /** * Get the dynamics for an object. * - * The return value may be NULL. + * The return value may be nullptr. * * @return Non-const pointer to the dynamics */ @@ -598,24 +598,24 @@ inline Appearance *Object::getAppearance() /** * Get the parent object for this object. * - * This routine will return NULL if the object is not a child object. + * This routine will return nullptr if the object is not a child object. */ inline Object *Object::getParent() { - return m_childObject ? m_attachedToObject : NULL; + return m_childObject ? m_attachedToObject : nullptr; } // ---------------------------------------------------------------------- /** * Get the parent object for this object. * - * This routine will return NULL if the object is not a child object. + * This routine will return nullptr if the object is not a child object. */ inline const Object *Object::getParent() const { - return m_childObject ? m_attachedToObject : NULL; + return m_childObject ? m_attachedToObject : nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/object/ObjectList.cpp b/engine/shared/library/sharedObject/src/shared/object/ObjectList.cpp index 9e72d27d..e74133f8 100755 --- a/engine/shared/library/sharedObject/src/shared/object/ObjectList.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/ObjectList.cpp @@ -63,7 +63,7 @@ ObjectList::~ObjectList() /** * Add an Object to the ObjectList. * - * This routine will call Fatal in debug compiles if it is passed a NULL + * This routine will call Fatal in debug compiles if it is passed a nullptr * object. * * This routine will call Fatal in debug compiles if the object list @@ -85,7 +85,7 @@ void ObjectList::addObject(Object *objectToAdd) /** * Remove an Object from the ObjectList. * - * This routine will call Fatal in debug compiles if it is passed a NULL + * This routine will call Fatal in debug compiles if it is passed a nullptr * object. * * @param objectToRemove Pointer to the object to remove @@ -113,13 +113,13 @@ void ObjectList::removeObjectByIndex(const Object* object, int index) // Remove the last item in the vector. m_objectVector->pop_back(); - // NULL the object from the alter-safe object list. + // nullptr the object from the alter-safe object list. uint size = m_alterSafeObjectVector->size(); for (uint i = 0; i < size; ++i) { if ((*m_alterSafeObjectVector)[i] == object) { - (*m_alterSafeObjectVector)[i] = NULL; + (*m_alterSafeObjectVector)[i] = nullptr; return; } } @@ -224,7 +224,7 @@ float ObjectList::alter(real time) if (alterResult == AlterResult::cms_kill) //lint !e777 // Testing floats for equality // It's okay, we're using constants. { // Make sure the object is still in the object list before removing it - if ((*m_alterSafeObjectVector)[i] != NULL) + if ((*m_alterSafeObjectVector)[i] != nullptr) removeObject(obj); delete obj; } diff --git a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.cpp b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.cpp index 5729afef..789b5d12 100755 --- a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplate.cpp @@ -66,7 +66,7 @@ ObjectTemplate::ObjectTemplate(const std::string & filename) : { //-- Track name of most recently loading object template name to give us more // data to work with when we receive crash info. - IGNORE_RETURN(snprintf(s_crashReportInfoConstructor, sizeof(s_crashReportInfoConstructor) - 1, "ObjectTemplate_Constructor: %s\n", !filename.empty() ? filename.c_str() : "")); + IGNORE_RETURN(snprintf(s_crashReportInfoConstructor, sizeof(s_crashReportInfoConstructor) - 1, "ObjectTemplate_Constructor: %s\n", !filename.empty() ? filename.c_str() : "")); s_crashReportInfoConstructor[sizeof(s_crashReportInfoConstructor) - 1] = '\0'; } @@ -165,7 +165,7 @@ Object *ObjectTemplate::createObject() const */ void ObjectTemplate::addReference() const { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->addReference(); DataResource::addReference(); @@ -178,7 +178,7 @@ void ObjectTemplate::addReference() const */ void ObjectTemplate::releaseReference() const { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); DataResource::releaseReference(); @@ -199,7 +199,7 @@ void ObjectTemplate::loadFromIff(Iff &iff) //-- Track name of most recently loading object template name to give us more // data to work with when we receive crash info. char const *const filename = iff.getFileName(); - IGNORE_RETURN(snprintf(s_crashReportInfoLoadFromIff, sizeof(s_crashReportInfoLoadFromIff) - 1, "ObjectTemplate_Iff: %s\n", (filename && *filename) ? filename : "")); + IGNORE_RETURN(snprintf(s_crashReportInfoLoadFromIff, sizeof(s_crashReportInfoLoadFromIff) - 1, "ObjectTemplate_Iff: %s\n", (filename && *filename) ? filename : "")); s_crashReportInfoLoadFromIff[sizeof(s_crashReportInfoLoadFromIff) - 1] = '\0'; preLoad(); diff --git a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp index 4e45484b..96663b8a 100755 --- a/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/ObjectTemplateList.cpp @@ -24,8 +24,8 @@ typedef DataResourceList ObjectTemplateListDataResourceList; -template <> ObjectTemplateListDataResourceList::CreateDataResourceMap *ObjectTemplateListDataResourceList::ms_bindings = NULL; -template <> ObjectTemplateListDataResourceList::LoadedDataResourceMap *ObjectTemplateListDataResourceList::ms_loaded = NULL; +template <> ObjectTemplateListDataResourceList::CreateDataResourceMap *ObjectTemplateListDataResourceList::ms_bindings = nullptr; +template <> ObjectTemplateListDataResourceList::LoadedDataResourceMap *ObjectTemplateListDataResourceList::ms_loaded = nullptr; namespace ObjectTemplateListNamespace { diff --git a/engine/shared/library/sharedObject/src/shared/object/ScheduleData.cpp b/engine/shared/library/sharedObject/src/shared/object/ScheduleData.cpp index 8de48b15..0b323d4d 100755 --- a/engine/shared/library/sharedObject/src/shared/object/ScheduleData.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/ScheduleData.cpp @@ -20,12 +20,12 @@ MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITH_INSTALL(ScheduleData, true, 0, 0, 0); ScheduleData::ScheduleData(AlterScheduler::ScheduleTime initialMostRecentAlterTime): m_mostRecentAlterTime(initialMostRecentAlterTime), - m_alterNowNext(NULL), - m_alterNowPrevious(NULL), - m_alterNextFrameNext(NULL), - m_alterNextFramePrevious(NULL), - m_concludeNext(NULL), - m_concludePrevious(NULL), + m_alterNowNext(nullptr), + m_alterNowPrevious(nullptr), + m_alterNextFrameNext(nullptr), + m_alterNextFramePrevious(nullptr), + m_concludeNext(nullptr), + m_concludePrevious(nullptr), m_scheduleTimeMapIterator(), m_schedulePhase(0) { diff --git a/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp index d6ae066b..95281e88 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp @@ -70,14 +70,14 @@ namespace CellPropertyNamespace Object *ms_worldCellObject; Notification ms_portalCrossingNotification; bool ms_renderPortals; - CellProperty::CreateDpvsCellHookFunction ms_createDpvsCellHookFunction = NULL; - CellProperty::DestroyDpvsCellHookFunction ms_destroyDpvsCellHookFunction = NULL; - CellProperty::AddToRenderWorldHookFunction ms_addToRenderWorldHook = NULL; + CellProperty::CreateDpvsCellHookFunction ms_createDpvsCellHookFunction = nullptr; + CellProperty::DestroyDpvsCellHookFunction ms_destroyDpvsCellHookFunction = nullptr; + CellProperty::AddToRenderWorldHookFunction ms_addToRenderWorldHook = nullptr; - CellProperty::PolyAppearanceFactory ms_portalBarrierFactory = NULL; - CellProperty::PolyAppearanceFactory ms_forceFieldFactory = NULL; + CellProperty::PolyAppearanceFactory ms_portalBarrierFactory = nullptr; + CellProperty::PolyAppearanceFactory ms_forceFieldFactory = nullptr; - CellProperty::AccessAllowedHookFunction ms_accessAllowedHookFunction = NULL; + CellProperty::AccessAllowedHookFunction ms_accessAllowedHookFunction = nullptr; } using namespace CellPropertyNamespace; @@ -86,9 +86,9 @@ using namespace CellPropertyNamespace; bool CellPropertyNamespace::Notification::ms_enabled = true; CellProperty *CellProperty::ms_worldCellProperty; -CellProperty::TextureFetch CellProperty::ms_textureFetch = NULL; -CellProperty::TextureRelease CellProperty::ms_textureRelease = NULL; -CellProperty::DeleteVisibleCellProperty CellProperty::ms_deleteVisibleCellProperty = NULL; +CellProperty::TextureFetch CellProperty::ms_textureFetch = nullptr; +CellProperty::TextureRelease CellProperty::ms_textureRelease = nullptr; +CellProperty::DeleteVisibleCellProperty CellProperty::ms_deleteVisibleCellProperty = nullptr; // ====================================================================== @@ -148,9 +148,9 @@ bool CellPropertyNamespace::Notification::positionChanged(Object &object, bool c start += objUpW; end += objUpW; - CellProperty *targetCell = NULL; + CellProperty *targetCell = nullptr; - CellProperty *lastCell = NULL; + CellProperty *lastCell = nullptr; CellProperty *currentCell = object.getParentCell(); while(currentCell) @@ -163,7 +163,7 @@ bool CellPropertyNamespace::Notification::positionChanged(Object &object, bool c if(time == 1.0f) break; - if(nextCell == NULL) break; + if(nextCell == nullptr) break; if(nextCell == currentCell) break; if(nextCell == lastCell) break; @@ -235,8 +235,8 @@ void CellProperty::install() void CellProperty::remove() { delete ms_worldCellObject; - ms_worldCellObject = NULL; - ms_worldCellProperty = NULL; + ms_worldCellObject = nullptr; + ms_worldCellProperty = nullptr; } // ---------------------------------------------------------------------- @@ -282,7 +282,7 @@ Appearance *CellProperty::createPortalBarrier(VertexList const & verts, const Ve if (ms_portalBarrierFactory) return ms_portalBarrierFactory(verts,color); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -292,7 +292,7 @@ Appearance *CellProperty::createForceField(VertexList const & verts, const Vecto if (ms_forceFieldFactory) return ms_forceFieldFactory(verts,color); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -342,24 +342,24 @@ void CellProperty::setPortalTransitionsEnabled(bool enabled) CellProperty::CellProperty(Object &owner) : Container(getClassPropertyId(), owner), - m_portalProperty(NULL), + m_portalProperty(nullptr), m_cellIndex(-1), - m_appearanceObject(NULL), + m_appearanceObject(nullptr), m_portalObjectList(new PortalObjectList), m_visible(false), - m_floor(NULL), - m_cellName(NULL), + m_floor(nullptr), + m_cellName(nullptr), m_cellNameCrc(0), - m_dpvsCell(NULL), - m_environmentTexture(NULL), + m_dpvsCell(nullptr), + m_environmentTexture(nullptr), m_fogEnabled(false), m_fogColor(0), m_fogDensity(0.f), m_appliedInteriorLayout(false), - m_preVisibilityTraversalRenderHookFunctionList(NULL), - m_enterRenderHookFunctionList(NULL), - m_preDrawRenderHookFunctionList(NULL), - m_exitRenderHookFunctionList(NULL) + m_preVisibilityTraversalRenderHookFunctionList(nullptr), + m_enterRenderHookFunctionList(nullptr), + m_preDrawRenderHookFunctionList(nullptr), + m_exitRenderHookFunctionList(nullptr) { if (ms_createDpvsCellHookFunction) m_dpvsCell = (*ms_createDpvsCellHookFunction)(this); @@ -379,7 +379,7 @@ CellProperty::~CellProperty() { NOT_NULL(ms_textureRelease); ms_textureRelease(m_environmentTexture); - m_environmentTexture = NULL; + m_environmentTexture = nullptr; } if (!m_portalObjectList->empty()) @@ -391,18 +391,18 @@ CellProperty::~CellProperty() delete portalList; } - m_portalProperty = NULL; + m_portalProperty = nullptr; delete m_appearanceObject; delete m_portalObjectList; delete m_floor; - m_cellName = NULL; + m_cellName = nullptr; m_cellNameCrc = 0; if (m_dpvsCell) { NOT_NULL(ms_destroyDpvsCellHookFunction); (*ms_destroyDpvsCellHookFunction)(m_dpvsCell); - m_dpvsCell = NULL; + m_dpvsCell = nullptr; } delete m_preVisibilityTraversalRenderHookFunctionList; @@ -432,7 +432,7 @@ void CellProperty::initialize(const PortalProperty &portalProperty, int cellInde m_appearanceObject->attachToObject_p(&getOwner(), true); Appearance * const appearance = AppearanceTemplateList::createAppearance(cellTemplate.getAppearanceName()); - if (appearance != NULL) { + if (appearance != nullptr) { appearance->setShadowBlobAllowed(); m_appearanceObject->setAppearance(appearance); @@ -448,7 +448,7 @@ void CellProperty::initialize(const PortalProperty &portalProperty, int cellInde if (cellTemplate.getFloorName()) { - m_floor = FloorManager::createFloor(cellTemplate.getFloorName(),&getOwner(),NULL,false); + m_floor = FloorManager::createFloor(cellTemplate.getFloorName(),&getOwner(),nullptr,false); WARNING(!m_floor, ("Cell %s could not load floor %s", cellTemplate.getAppearanceName(), cellTemplate.getFloorName())); } else @@ -622,8 +622,8 @@ bool CellProperty::areAdjacent(const CellProperty *cellProperty1, const CellProp { bool result = false; - if ( (cellProperty1 != NULL) - && (cellProperty2 != NULL)) + if ( (cellProperty1 != nullptr) + && (cellProperty2 != nullptr)) { if (cellProperty1 == cellProperty2) { @@ -640,8 +640,8 @@ bool CellProperty::areAdjacent(const CellProperty *cellProperty1, const CellProp result = false; } - else if ( (cellProperty1->m_portalObjectList != NULL) - && (cellProperty2->m_portalObjectList != NULL)) + else if ( (cellProperty1->m_portalObjectList != nullptr) + && (cellProperty2->m_portalObjectList != nullptr)) { // Pick the list that is not the world cell property, or the // smallest list @@ -657,7 +657,7 @@ bool CellProperty::areAdjacent(const CellProperty *cellProperty1, const CellProp checkCellProperty = cellProperty1; } - if (portalObjectList != NULL) + if (portalObjectList != nullptr) { //DEBUG_REPORT_LOG((portalObjectList->size() > 1), ("Portal Object List > 1 - size: %d", portalObjectList->size())); @@ -714,7 +714,7 @@ void CellProperty::releaseWorldCellPropertyEnvironmentTexture() * * @param startPosition Starting position, in the space of this cell. * @param endPosition Ending position, in the space of this cell. - * @return The CellProperty that an object traversing the object is in. Will return NULL if remaining in this cell. + * @return The CellProperty that an object traversing the object is in. Will return nullptr if remaining in this cell. */ CellProperty *CellProperty::getDestinationCell(const Vector &startPosition, const Vector &endPosition, float &closestPortalT, bool passableOnly) const @@ -773,8 +773,8 @@ CellProperty *CellProperty::getDestinationCell(const Vector &startPosition, cons CellProperty *CellProperty::getDestinationCell(const Object *object, int portalId) const { - if(portalId < 0) return NULL; - if(object == NULL) return NULL; + if(portalId < 0) return nullptr; + if(object == nullptr) return nullptr; const PortalObjectList::const_iterator iEnd = m_portalObjectList->end(); for (PortalObjectList::const_iterator i = m_portalObjectList->begin(); i != iEnd; ++i) @@ -796,13 +796,13 @@ CellProperty *CellProperty::getDestinationCell(const Object *object, int portalI { DEBUG_WARNING(true,("CellProperty::getDestinationCell(portalId) - tried to get an invalid portal\n")); - return NULL; + return nullptr; } return portalList[static_cast(portalId)]->getNeighbor()->getParentCell(); } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -840,7 +840,7 @@ bool CellProperty::getDestinationCells(const Sphere &sphere, std::vectorgetNeighbor(); - WARNING(neighbor == NULL,("CellProperty::getDestinationCells - Cell %s has a portal without a neighbor\n",getOwner().getNetworkId().getValueString().c_str())); + WARNING(neighbor == nullptr,("CellProperty::getDestinationCells - Cell %s has a portal without a neighbor\n",getOwner().getNetworkId().getValueString().c_str())); if(neighbor) { @@ -864,7 +864,7 @@ bool CellProperty::isAdjacentTo(const CellProperty *cell) const { if(this == cell) return true; - if(cell == NULL) return false; + if(cell == nullptr) return false; // ---------- @@ -964,7 +964,7 @@ const BaseExtent *CellProperty::getCollisionExtent() const } else { - return NULL; + return nullptr; } } @@ -982,7 +982,7 @@ const BaseClass *CellProperty::getPathGraph() const } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -1111,7 +1111,7 @@ void CellProperty::drawDebugShapes(DebugShapeRenderer * const renderer) const #ifdef _DEBUG - if (renderer == NULL) + if (renderer == nullptr) return; Floor const * const floor = getFloor(); @@ -1192,7 +1192,7 @@ CellProperty::PortalObjectEntry const &CellProperty::getPortalObject(int index) bool CellProperty::getAccessAllowed() const { - if (ms_accessAllowedHookFunction != NULL) + if (ms_accessAllowedHookFunction != nullptr) return (*ms_accessAllowedHookFunction)(*this); else return true; @@ -1286,7 +1286,7 @@ Vector const CellProperty::getPosition_w(Location const & location) Vector result = location.getCoordinates(); CellProperty const * const worldCellProperty = CellProperty::getWorldCellProperty(); - if (worldCellProperty != NULL) + if (worldCellProperty != nullptr) { if (location.getCell() != worldCellProperty->getOwner().getNetworkId()) { @@ -1295,7 +1295,7 @@ Vector const CellProperty::getPosition_w(Location const & location) Object const * const cell = NetworkIdManager::getObjectById(location.getCell()); - if (cell != NULL) + if (cell != nullptr) { result = cell->rotateTranslate_o2w(location.getCoordinates()); } diff --git a/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp b/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp index 1fcd8d87..c8658b98 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/Portal.cpp @@ -64,7 +64,7 @@ void Portal::install() void Portal::remove() { delete ms_doorStyleTable; - ms_doorStyleTable = NULL; + ms_doorStyleTable = nullptr; } // ---------------------------------------------------------------------- @@ -105,11 +105,11 @@ Portal::Portal(const PortalPropertyTemplateCellPortal &portalTemplate, CellPrope m_template(portalTemplate), m_relativeToObject(relativeTo), m_closed(false), - m_neighbor(NULL), + m_neighbor(nullptr), m_parentCell(parentCell), - m_dpvsPortal(NULL), - m_door(NULL), - m_appearance(NULL) + m_dpvsPortal(nullptr), + m_door(nullptr), + m_appearance(nullptr) { if(ms_createDoors) { @@ -126,13 +126,13 @@ Portal::~Portal() m_relativeToObject->removeDpvsObject(m_dpvsPortal); NOT_NULL(ms_destroyDpvsPortalHookFunction); (*ms_destroyDpvsPortalHookFunction)(m_dpvsPortal); - m_dpvsPortal = NULL; + m_dpvsPortal = nullptr; } - m_relativeToObject = NULL; - m_neighbor = NULL; - m_parentCell = NULL; - m_door = NULL; + m_relativeToObject = nullptr; + m_neighbor = nullptr; + m_parentCell = nullptr; + m_door = nullptr; delete m_appearance; } diff --git a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp index e88349e2..716b488a 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp @@ -57,9 +57,9 @@ PropertyId PortalProperty::getClassPropertyId() PortalProperty::PortalProperty(Object &owner, const char *fileName) : Container(getClassPropertyId(), owner), - m_template(NULL), + m_template(nullptr), m_cellList(new CellList), - m_fixupList(NULL), + m_fixupList(nullptr), m_hasPassablePortalToParentCell(false) { #ifdef _DEBUG @@ -67,7 +67,7 @@ PortalProperty::PortalProperty(Object &owner, const char *fileName) #endif // _DEBUG m_template = PortalPropertyTemplateList::fetch(CrcLowerString(fileName)); - m_cellList->resize(static_cast(m_template->getNumberOfCells()), NULL); + m_cellList->resize(static_cast(m_template->getNumberOfCells()), nullptr); #ifdef _DEBUG DataLint::popAsset(); @@ -139,7 +139,7 @@ void PortalProperty::addToWorld() int unloaded = 0; int const numberOfCells = static_cast(m_cellList->size()); for (int i = 1; i < numberOfCells; ++i) - if ((*m_cellList)[static_cast(i)] == NULL) + if ((*m_cellList)[static_cast(i)] == nullptr) { WARNING(true, ("cell %d/%d not loaded", i, numberOfCells)); ++unloaded; @@ -215,7 +215,7 @@ bool PortalProperty::serverEndBaselines(int serverObjectCrc, std::vectorsize(); for (uint i = 1; i < numberOfCells; ++i) { - if ((*m_cellList)[i] == NULL) + if ((*m_cellList)[i] == nullptr) { Object *object = ms_beginCreateObjectFunction(static_cast(i)); IGNORE_RETURN(addToContents(*object, tmp)); @@ -460,7 +460,7 @@ void PortalProperty::debugPrint(std::string &buffer) const void PortalProperty::createAppearance() { Appearance * const appearance = AppearanceTemplateList::createAppearance(m_template->getExteriorAppearanceName()); - if (appearance != NULL) { + if (appearance != nullptr) { appearance->setShadowBlobAllowed(); getOwner().setAppearance(appearance); } else { @@ -563,7 +563,7 @@ CellProperty *PortalProperty::getCell(const char *desiredCellName) return (*m_cellList)[static_cast(i)]; } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp b/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp index 09d2e9e1..a21c39b5 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/PortalPropertyTemplate.cpp @@ -41,7 +41,7 @@ typedef BaseClass * (*ExpandBuildingGraphHook)( PortalPropertyTemplate * portalTemplate, BaseClass * baseBuildingGraph ); -ExpandBuildingGraphHook g_expandBuildingGraphHook = NULL; +ExpandBuildingGraphHook g_expandBuildingGraphHook = nullptr; // ====================================================================== @@ -257,8 +257,8 @@ PortalPropertyTemplateCellPortal::PortalPropertyTemplateCellPortal(const PortalP m_disabled(false), m_passable(false), m_geometryWindingClockwise(true), - m_portalGeometry(NULL), - m_doorStyle(NULL), + m_portalGeometry(nullptr), + m_doorStyle(nullptr), m_hasDoorHardpoint(false), m_doorHardpoint(), m_plane(), @@ -272,7 +272,7 @@ PortalPropertyTemplateCellPortal::PortalPropertyTemplateCellPortal(const PortalP PortalPropertyTemplateCellPortal::~PortalPropertyTemplateCellPortal() { - m_portalGeometry = NULL; + m_portalGeometry = nullptr; delete [] m_doorStyle; if (m_preloadManager) @@ -524,14 +524,14 @@ PortalPropertyTemplateCell::PreloadManager::~PreloadManager () PortalPropertyTemplateCell::PortalPropertyTemplateCell(const PortalPropertyTemplate &portalPropertyTemplate, int index, Iff &iff) : - m_name(NULL), - m_appearanceName(NULL), - m_floorName(NULL), - m_floorMesh(NULL), + m_name(nullptr), + m_appearanceName(nullptr), + m_floorName(nullptr), + m_floorMesh(nullptr), m_canSeeParentCell(false), - m_lightList(NULL), + m_lightList(nullptr), m_portalList(new PortalPropertyTemplateCellPortalList), - m_collisionExtent(NULL), + m_collisionExtent(nullptr), m_preloadManager (0) { load(portalPropertyTemplate, index, iff); @@ -556,7 +556,7 @@ PortalPropertyTemplateCell::~PortalPropertyTemplateCell() } delete m_collisionExtent; - m_collisionExtent = NULL; + m_collisionExtent = nullptr; if (m_preloadManager) { @@ -567,7 +567,7 @@ PortalPropertyTemplateCell::~PortalPropertyTemplateCell() if (m_floorMesh) { m_floorMesh->releaseReference (); - m_floorMesh = NULL; + m_floorMesh = nullptr; } } @@ -875,7 +875,7 @@ const char *PortalPropertyTemplateCell::getFloorName() const FloorMesh const * PortalPropertyTemplateCell::getFloorMesh() const { - if(m_floorMesh == NULL) + if(m_floorMesh == nullptr) { if(m_floorName) { @@ -885,7 +885,7 @@ FloorMesh const * PortalPropertyTemplateCell::getFloorMesh() const } else { - //-- cell template r0 always has a null floor name for POBs without accessible exteriors (POB ships & POB-only dungeons) + //-- cell template r0 always has a nullptr floor name for POBs without accessible exteriors (POB ships & POB-only dungeons) //-- don't warn for that cell template DEBUG_WARNING(ConfigSharedCollision::getReportWarnings() && strcmp(m_name, "r0"), ("PortalPropertyTemplateCell::getFloorMesh() - Cell template %s on [%s] has no floor name", m_name, m_appearanceName)); @@ -1039,7 +1039,7 @@ PortalPropertyTemplate::PortalPropertyTemplate(const CrcString &name) m_cellList(new CellList), m_cellNameList(new CellNameList), m_crc(0), - m_pathGraph(NULL), + m_pathGraph(nullptr), m_radarPortalGeometry(0) { FileName shortName(name.getString()); @@ -1079,7 +1079,7 @@ PortalPropertyTemplate::~PortalPropertyTemplate() delete m_portalOwnersList; delete m_pathGraph; - m_pathGraph = NULL; + m_pathGraph = nullptr; delete m_radarPortalGeometry; m_radarPortalGeometry = 0; diff --git a/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h b/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h index 00a1ea37..e83e48e3 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h +++ b/engine/shared/library/sharedObject/src/shared/portal/SphereGrid.h @@ -373,14 +373,14 @@ inline void SphereGrid::findInRangeCapsule( Object c template inline void SphereGrid::findInRange( const Capsule & range, std::set & results) { - findInRangeCapsule( INVALID_POB, range, NULL, results ); + findInRangeCapsule( INVALID_POB, range, nullptr, results ); } template inline void SphereGrid::findInRange( Vector const ¢er_w, float radius, std::set & results) { - findInRangeSphere( INVALID_POB, center_w, radius, NULL, results ); + findInRangeSphere( INVALID_POB, center_w, radius, nullptr, results ); } @@ -401,7 +401,7 @@ inline void SphereGrid::findInRange( Vector const &c template inline void SphereGrid::findInRange( Object const *pob, Vector const ¢er_w, float radius, std::set & results) { - findInRangeSphere( pob, center_w, radius, NULL, results ); + findInRangeSphere( pob, center_w, radius, nullptr, results ); } template diff --git a/engine/shared/library/sharedObject/src/shared/property/LayerProperty.cpp b/engine/shared/library/sharedObject/src/shared/property/LayerProperty.cpp index 63f5cc57..f331b5a4 100755 --- a/engine/shared/library/sharedObject/src/shared/property/LayerProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/property/LayerProperty.cpp @@ -23,7 +23,7 @@ PropertyId LayerProperty::getClassPropertyId() LayerProperty::LayerProperty(Object& thisObject) : Property(getClassPropertyId(), thisObject), -m_layer(NULL) +m_layer(nullptr) { } @@ -31,10 +31,10 @@ m_layer(NULL) LayerProperty::~LayerProperty() { - if (m_layer != NULL) + if (m_layer != nullptr) { delete m_layer; - m_layer = NULL; + m_layer = nullptr; } } diff --git a/engine/shared/library/sharedObject/src/shared/world/World.cpp b/engine/shared/library/sharedObject/src/shared/world/World.cpp index e0d90fae..ce2ab931 100755 --- a/engine/shared/library/sharedObject/src/shared/world/World.cpp +++ b/engine/shared/library/sharedObject/src/shared/world/World.cpp @@ -305,7 +305,7 @@ bool World::removeObject (const Object* object, int listIndex) { DEBUG_FATAL (!ms_installed, ("not installed")); NOT_NULL (object); - DEBUG_FATAL (!object, ("World::removeObject - object is null")); + DEBUG_FATAL (!object, ("World::removeObject - object is nullptr")); VALIDATE_RANGE_INCLUSIVE_EXCLUSIVE (0, listIndex, static_cast(WOL_Count)); ms_objectSet.erase(object); @@ -349,7 +349,7 @@ bool World::removeObject (const Object* object, int listIndex) void World::queueObject (Object* object) { DEBUG_FATAL (!ms_installed, ("not installed")); - DEBUG_FATAL (!object, ("World::queueObject - object is null")); + DEBUG_FATAL (!object, ("World::queueObject - object is nullptr")); ms_queuedObjectList->addObject (object); } diff --git a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.cpp b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.cpp index 532ade02..8b264ebb 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.cpp @@ -25,10 +25,10 @@ DynamicPathGraph::~DynamicPathGraph() clear(); delete m_nodeList; - m_nodeList = NULL; + m_nodeList = nullptr; delete m_dirtyNodes; - m_dirtyNodes = NULL; + m_dirtyNodes = nullptr; } // ---------- @@ -72,7 +72,7 @@ int DynamicPathGraph::getEdgeCount ( int nodeIndex ) const { DynamicPathNode const * node = _getNode(nodeIndex); - if(node == NULL) + if(node == nullptr) { return 0; } @@ -86,13 +86,13 @@ PathEdge * DynamicPathGraph::getEdge ( int nodeIndex, int edgeIndex ) { DynamicPathNode * node = _getNode(nodeIndex); - if(node != NULL) + if(node != nullptr) { return node->getEdge(edgeIndex); } else { - return NULL; + return nullptr; } } @@ -100,13 +100,13 @@ PathEdge const * DynamicPathGraph::getEdge ( int nodeIndex, int edgeIndex ) cons { DynamicPathNode const * node = _getNode(nodeIndex); - if(node != NULL) + if(node != nullptr) { return node->getEdge(edgeIndex); } else { - return NULL; + return nullptr; } } @@ -114,7 +114,7 @@ PathEdge const * DynamicPathGraph::getEdge ( int nodeIndex, int edgeIndex ) cons int DynamicPathGraph::addNode ( DynamicPathNode * newNode ) { - if(newNode == NULL) return -1; + if(newNode == nullptr) return -1; int listSize = m_nodeList->size(); @@ -124,7 +124,7 @@ int DynamicPathGraph::addNode ( DynamicPathNode * newNode ) { for(int i = 0; i < listSize; i++) { - if(m_nodeList->at(i) == NULL) + if(m_nodeList->at(i) == nullptr) { nodeIndex = i; break; @@ -155,11 +155,11 @@ void DynamicPathGraph::removeNode ( int nodeIndex ) DynamicPathNode * node = _getNode(nodeIndex); - if(node != NULL) + if(node != nullptr) { unlinkNode(nodeIndex); - m_nodeList->at(nodeIndex) = NULL; + m_nodeList->at(nodeIndex) = nullptr; delete node; @@ -171,7 +171,7 @@ void DynamicPathGraph::moveNode ( int nodeIndex, Vector const & newPosition ) { DynamicPathNode * node = _getNode(nodeIndex); - if(node != NULL) + if(node != nullptr) { node->setPosition_p(newPosition); @@ -230,7 +230,7 @@ void DynamicPathGraph::unlinkNode ( int nodeIndex ) { DynamicPathNode * node = _getNode(nodeIndex); - if(node == NULL) return; + if(node == nullptr) return; // ---------- @@ -254,7 +254,7 @@ void DynamicPathGraph::relinkNode ( int nodeIndex ) { DynamicPathNode * nodeA = _getNode(nodeIndex); - if(nodeA == NULL) return; + if(nodeA == nullptr) return; // ---------- @@ -268,7 +268,7 @@ void DynamicPathGraph::relinkNode ( int nodeIndex ) { DynamicPathNode * nodeB = _getNode(i); - if(nodeB == NULL) continue; + if(nodeB == nullptr) continue; if(nodeA == nodeB) continue; Vector const & posA = nodeA->getPosition_p(); @@ -314,7 +314,7 @@ void DynamicPathGraph::relinkNode ( int nodeIndex ) { DynamicPathNode * neighborNode = _getNode(neighborList[i]); - if(neighborNode != NULL) + if(neighborNode != nullptr) { neighborNode->markRedundantEdges(); neighborNode->removeMarkedEdges(); @@ -326,7 +326,7 @@ void DynamicPathGraph::relinkNode ( int nodeIndex ) DynamicPathNode * DynamicPathGraph::_getNode ( int nodeIndex ) { - if(nodeIndex == -1) return NULL; + if(nodeIndex == -1) return nullptr; return m_nodeList->at(nodeIndex); } @@ -335,7 +335,7 @@ DynamicPathNode * DynamicPathGraph::_getNode ( int nodeIndex ) DynamicPathNode const * DynamicPathGraph::_getNode ( int nodeIndex ) const { - if(nodeIndex == -1) return NULL; + if(nodeIndex == -1) return nullptr; return m_nodeList->at(nodeIndex); } diff --git a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.h b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.h index e2baf1f3..b778ac1a 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.h +++ b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathGraph.h @@ -20,7 +20,7 @@ class DynamicPathNode; // and remove nodes on the fly (such as city graphs) // DynamicPathGraph uses a sparse array to store its nodes. Calling -// getNode with a nodeIndex in [0,nodeCount) may return NULL. If you +// getNode with a nodeIndex in [0,nodeCount) may return nullptr. If you // want to know the number of live nodes in the graph, call getLiveNodeCount. class DynamicPathGraph : public PathGraph diff --git a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathNode.cpp b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathNode.cpp index 8f3798bf..b82efe57 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/DynamicPathNode.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/DynamicPathNode.cpp @@ -105,7 +105,7 @@ bool DynamicPathNode::removeEdge ( int nodeIndex ) { DynamicPathNode * neighbor = _getGraph()->_getNode(nodeIndex); - if(neighbor == NULL) return false; + if(neighbor == nullptr) return false; if(!_removeEdge(nodeIndex)) return false; @@ -175,8 +175,8 @@ int DynamicPathNode::markRedundantEdges ( void ) const PathEdge const * edgeA = getEdge(i); PathEdge const * edgeB = getEdge(j); - if(edgeA == NULL) continue; - if(edgeB == NULL) continue; + if(edgeA == nullptr) continue; + if(edgeB == nullptr) continue; int iA = edgeA->getIndexA(); int iB = edgeA->getIndexB(); diff --git a/engine/shared/library/sharedPathfinding/src/shared/PathGraph.cpp b/engine/shared/library/sharedPathfinding/src/shared/PathGraph.cpp index a72faa92..0585dc87 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/PathGraph.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/PathGraph.cpp @@ -69,7 +69,7 @@ int PathGraph::findNode ( PathNodeType type, int key ) const if(getEdgeCount(i) == 0) continue; - if((node != NULL) && (node->getType() == type) && (node->getKey() == key)) + if((node != nullptr) && (node->getType() == type) && (node->getKey() == key)) { return i; } @@ -88,7 +88,7 @@ int PathGraph::findEntrance ( int key ) const { PathNode const * node = getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; if(getEdgeCount(i) == 0) continue; @@ -119,7 +119,7 @@ int PathGraph::findNearestNode ( Vector const & position_p ) const { PathNode const * node = getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; if(getEdgeCount(i) == 0) continue; @@ -148,7 +148,7 @@ int PathGraph::findNearestNode ( PathNodeType searchType, Vector const & positio { PathNode const * node = getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; if(getEdgeCount(i) == 0) continue; @@ -180,7 +180,7 @@ void PathGraph::findNodesInRange ( Vector const & position_p, float range, PathN { PathNode const * node = getNode(i); - if(node == NULL) continue; + if(node == nullptr) continue; if(getEdgeCount(i) == 0) continue; diff --git a/engine/shared/library/sharedPathfinding/src/shared/PathGraphIterator.cpp b/engine/shared/library/sharedPathfinding/src/shared/PathGraphIterator.cpp index 92a4dc10..d22b581c 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/PathGraphIterator.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/PathGraphIterator.cpp @@ -14,7 +14,7 @@ // ====================================================================== PathGraphIterator::PathGraphIterator () -: m_graph(NULL), +: m_graph(nullptr), m_nodeIndex(-1) { } @@ -29,18 +29,18 @@ PathGraphIterator::PathGraphIterator ( PathGraph const * graph, int nodeIndex ) bool PathGraphIterator::isValid ( void ) const { - return (m_graph != NULL) && (m_nodeIndex != -1) && (m_graph->getNode(m_nodeIndex) != NULL); + return (m_graph != nullptr) && (m_nodeIndex != -1) && (m_graph->getNode(m_nodeIndex) != nullptr); } PathNode const * PathGraphIterator::getNode ( void ) const { - if( (m_graph != NULL) && (m_nodeIndex != -1) ) + if( (m_graph != nullptr) && (m_nodeIndex != -1) ) { return m_graph->getNode( m_nodeIndex ); } else { - return NULL; + return nullptr; } } @@ -53,7 +53,7 @@ int PathGraphIterator::getNeighborCount ( void ) const PathNode const * PathGraphIterator::getNeighbor ( int whichNeighbor ) const { - if(!isValid()) return NULL; + if(!isValid()) return nullptr; return m_graph->getNode( m_graph->getEdge( m_nodeIndex, whichNeighbor )->getIndexB() ); } diff --git a/engine/shared/library/sharedPathfinding/src/shared/PathNode.cpp b/engine/shared/library/sharedPathfinding/src/shared/PathNode.cpp index 6ff18223..1eec246d 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/PathNode.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/PathNode.cpp @@ -13,7 +13,7 @@ // ====================================================================== PathNode::PathNode() -: m_graph(NULL), +: m_graph(nullptr), m_index(-1), m_id(-1), m_key(-1), @@ -27,7 +27,7 @@ PathNode::PathNode() } PathNode::PathNode ( Vector const & position ) -: m_graph(NULL), +: m_graph(nullptr), m_index(-1), m_id(-1), m_key(-1), diff --git a/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp b/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp index 42abd9d7..e09a5cab 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp @@ -137,7 +137,7 @@ MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITH_INSTALL(PathSearchNode, true, 0, 0, 0); PathSearchNode::PathSearchNode ( PathSearch * search, PathGraph const * graph, PathNode const * node ) : m_search(search), - m_parent(NULL), + m_parent(nullptr), m_graph(graph), m_node(node), m_queued(false), @@ -164,13 +164,13 @@ PathSearchNode * PathSearchNode::getNeighbor ( int whichNeighbor ) PathNode const * neighborNode = m_graph->getNode(neighborIndex); - if(neighborNode != NULL) + if(neighborNode != nullptr) { return getSearchNode(neighborNode); } else { - return NULL; + return nullptr; } } @@ -180,7 +180,7 @@ PathSearchNode * PathSearchNode::createSearchNode( PathNode const * node ) { // doing bad voodoo with the node marks - PathSearchNode * oldNode = NULL; + PathSearchNode * oldNode = nullptr; int mark = node->getMark(3); @@ -206,7 +206,7 @@ PathSearchNode * PathSearchNode::getSearchNode( PathNode const * node ) { // doing bad voodoo with the node marks - PathSearchNode * searchNode = NULL; + PathSearchNode * searchNode = nullptr; int mark = node->getMark(3); @@ -215,7 +215,7 @@ PathSearchNode * PathSearchNode::getSearchNode( PathNode const * node ) searchNode = (PathSearchNode*)((void*)mark); } - if(searchNode == NULL) + if(searchNode == nullptr) { return createSearchNode(node); } @@ -305,9 +305,9 @@ void PathSearch::install() // ---------------------------------------------------------------------- PathSearch::PathSearch ( void ) -: m_graph(NULL), - m_start(NULL), - m_goal(NULL), +: m_graph(nullptr), + m_start(nullptr), + m_goal(nullptr), m_multiGoal(false), m_goals(new NodeList()), m_queue(new PathSearchQueue()), @@ -321,16 +321,16 @@ PathSearch::PathSearch ( void ) PathSearch::~PathSearch() { delete m_goals; - m_goals = NULL; + m_goals = nullptr; delete m_queue; - m_queue = NULL; + m_queue = nullptr; delete m_path; - m_path = NULL; + m_path = nullptr; delete m_visitedNodes; - m_visitedNodes = NULL; + m_visitedNodes = nullptr; } // ---------------------------------------------------------------------- @@ -361,7 +361,7 @@ PathSearchNode * PathSearch::search ( void ) { PathSearchNode * neighbor = node->getNeighbor(i); - if(neighbor != NULL) + if(neighbor != nullptr) { float newCost = node->getCost() + costBetween(node->getPathNode(),neighbor->getPathNode()); @@ -377,7 +377,7 @@ PathSearchNode * PathSearch::search ( void ) } } - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -395,8 +395,8 @@ bool PathSearch::search ( PathGraph const * graph, int startIndex, int goalIndex m_goal = graph->getNode(goalIndex); m_multiGoal = false; - if(m_start == NULL) return false; - if(m_goal == NULL) return false; + if(m_start == nullptr) return false; + if(m_goal == nullptr) return false; m_path->clear(); @@ -429,7 +429,7 @@ bool PathSearch::search ( PathGraph const * graph, int startIndex, IndexList con int goalCount = goalIndices.size(); if(goalCount == 0) return false; - if(m_start == NULL) return false; + if(m_start == nullptr) return false; m_goals->resize(goalCount); @@ -455,7 +455,7 @@ bool PathSearch::search ( PathGraph const * graph, int startIndex, IndexList con bool PathSearch::buildPath ( PathSearchNode * endNode ) { - if( endNode == NULL ) + if( endNode == nullptr ) { m_path->clear(); return false; @@ -633,13 +633,13 @@ IndexList const & PathSearch::getPath ( void ) const bool PathSearch::atGoal ( PathSearchNode * searchNode ) const { - if(searchNode == NULL) return false; + if(searchNode == nullptr) return false; if(m_multiGoal) { PathNode const * pathNode = searchNode->getPathNode(); - if(pathNode == NULL) return false; + if(pathNode == nullptr) return false; return std::find( m_goals->begin(), m_goals->end(), pathNode ) != m_goals->end(); } diff --git a/engine/shared/library/sharedPathfinding/src/shared/Pathfinding.cpp b/engine/shared/library/sharedPathfinding/src/shared/Pathfinding.cpp index dc532a9a..67dfa06a 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/Pathfinding.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/Pathfinding.cpp @@ -69,7 +69,7 @@ BaseClass * Pathfinding::graphFactory ( Iff & iff ) { DEBUG_WARNING(true,("Pathfinding::graphFactory - Don't know how to construct a path graph from the IFF in %s\n",iff.getFileName())); - return NULL; + return nullptr; } } diff --git a/engine/shared/library/sharedPathfinding/src/shared/SetupSharedPathfinding.cpp b/engine/shared/library/sharedPathfinding/src/shared/SetupSharedPathfinding.cpp index 304f3504..230186e9 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/SetupSharedPathfinding.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/SetupSharedPathfinding.cpp @@ -67,7 +67,7 @@ int findNeighbor ( PathNode * node, PathNodeType neighborType, int neighborKey ) BaseClass * expandBuildingGraph ( PortalPropertyTemplate * portalTemplate, BaseClass * baseBuildingGraph ) { - if(baseBuildingGraph == NULL) return NULL; + if(baseBuildingGraph == nullptr) return nullptr; SimplePathGraph * buildingGraph = safe_cast(baseBuildingGraph); @@ -92,11 +92,11 @@ BaseClass * expandBuildingGraph ( PortalPropertyTemplate * portalTemplate, BaseC FloorMesh const * floorMesh = cell->getFloorMesh(); - if(floorMesh == NULL) continue; + if(floorMesh == nullptr) continue; PathGraph const * cellGraph = safe_cast(floorMesh->getPathGraph()); - if(cellGraph == NULL) continue; + if(cellGraph == nullptr) continue; // ---------- diff --git a/engine/shared/library/sharedPathfinding/src/shared/SimplePathGraph.cpp b/engine/shared/library/sharedPathfinding/src/shared/SimplePathGraph.cpp index d408d035..2673b2e6 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/SimplePathGraph.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/SimplePathGraph.cpp @@ -39,7 +39,7 @@ void readArray_Class ( Iff & iff, T * & array, Tag tag ) { int count = iff.read_int32(); - if(array == NULL) array = new T(); + if(array == nullptr) array = new T(); array->resize(count); @@ -58,7 +58,7 @@ void readArray_Class ( Iff & iff, T * & array, Tag tag, Reader R ) { int count = iff.read_int32(); - if(array == NULL) array = new T(); + if(array == nullptr) array = new T(); array->resize(count); @@ -77,7 +77,7 @@ void readArray_Struct ( Iff & iff, T * & array, Tag tag ) { int count = iff.read_int32(); - if(array == NULL) array = new T(); + if(array == nullptr) array = new T(); array->resize(count); @@ -157,7 +157,7 @@ SimplePathGraph::SimplePathGraph ( PathGraphType type ) { #ifdef _DEBUG - m_debugLines = NULL; + m_debugLines = nullptr; #endif } @@ -181,7 +181,7 @@ SimplePathGraph::SimplePathGraph( SimplePathGraph::NodeList * nodes, SimplePathG #ifdef _DEBUG - m_debugLines = NULL; + m_debugLines = nullptr; #endif } @@ -189,21 +189,21 @@ SimplePathGraph::SimplePathGraph( SimplePathGraph::NodeList * nodes, SimplePathG SimplePathGraph::~SimplePathGraph() { delete m_nodes; - m_nodes = NULL; + m_nodes = nullptr; delete m_edges; - m_edges = NULL; + m_edges = nullptr; delete m_edgeCounts; - m_edgeCounts = NULL; + m_edgeCounts = nullptr; delete m_edgeStarts; - m_edgeStarts = NULL; + m_edgeStarts = nullptr; #ifdef _DEBUG delete m_debugLines; - m_debugLines = NULL; + m_debugLines = nullptr; #endif } @@ -265,7 +265,7 @@ PathNode * SimplePathGraph::getNode ( int nodeIndex ) if (static_cast(nodeIndex) < m_nodes->size()) return &m_nodes->at(nodeIndex); - return NULL; + return nullptr; } PathNode const * SimplePathGraph::getNode ( int nodeIndex ) const @@ -273,7 +273,7 @@ PathNode const * SimplePathGraph::getNode ( int nodeIndex ) const if (static_cast(nodeIndex) < m_nodes->size()) return &m_nodes->at(nodeIndex); - return NULL; + return nullptr; } // ---------------------------------------------------------------------- @@ -507,7 +507,7 @@ void SimplePathGraph::drawDebugShapes ( DebugShapeRenderer * renderer ) const #ifdef _DEBUG - if(renderer == NULL) return; + if(renderer == nullptr) return; if( m_debugLines ) renderer->drawLineList( *m_debugLines, VectorArgb::solidYellow ); diff --git a/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServer.cpp b/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServer.cpp index 0e305c96..f33204ef 100755 --- a/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServer.cpp +++ b/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServer.cpp @@ -27,8 +27,8 @@ unsigned int SharedRemoteDebugServer::ms_remoteDebugToolChanne void SharedRemoteDebugServer::install() { - ms_serviceHandle = NULL; - ms_connection = NULL; + ms_serviceHandle = nullptr; + ms_connection = nullptr; if (!ConfigSharedFoundation::getUseRemoteDebug()) return; @@ -41,7 +41,7 @@ void SharedRemoteDebugServer::install() ms_serviceHandle = new Service(ConnectionAllocator(), setup); //even though this is the game client, this is a remoteDebug *server*, since it sends data to a Qt app for viewing - RemoteDebugServer::install(NULL, open, close, send, NULL); + RemoteDebugServer::install(nullptr, open, close, send, nullptr); //this value needs to be true before the call to RemoteDebugServer::open ms_installed = true; @@ -84,7 +84,7 @@ void SharedRemoteDebugServer::close(void) { DEBUG_FATAL(!ms_installed, ("sharedRemoteDebugServer not installed")); delete ms_connection; - ms_connection = NULL; + ms_connection = nullptr; } //------------------------------------------------------------------- diff --git a/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServerConnection.cpp b/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServerConnection.cpp index ef51481a..ac6fcd1b 100755 --- a/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServerConnection.cpp +++ b/engine/shared/library/sharedRemoteDebugServer/src/shared/SharedRemoteDebugServerConnection.cpp @@ -16,7 +16,7 @@ SharedRemoteDebugServerConnection::SharedRemoteDebugServerConnection(const std::string & a, const unsigned short p) : Connection(a, p, NetworkSetupData()), -m_remotedebugCommandChannel (NULL) +m_remotedebugCommandChannel (nullptr) { } @@ -24,7 +24,7 @@ m_remotedebugCommandChannel (NULL) SharedRemoteDebugServerConnection::SharedRemoteDebugServerConnection(UdpConnectionMT * u, TcpClient * t) : Connection(u, t), -m_remotedebugCommandChannel (NULL) +m_remotedebugCommandChannel (nullptr) { } diff --git a/engine/shared/library/sharedSkillSystem/src/shared/ExpertiseManager.cpp b/engine/shared/library/sharedSkillSystem/src/shared/ExpertiseManager.cpp index 3326d378..17b9bc40 100755 --- a/engine/shared/library/sharedSkillSystem/src/shared/ExpertiseManager.cpp +++ b/engine/shared/library/sharedSkillSystem/src/shared/ExpertiseManager.cpp @@ -298,7 +298,7 @@ int const ExpertiseManager::getNumExpertiseTiers() * exist. * * @return - skill object for expertise at grid location. - * returns NULL if none found + * returns nullptr if none found */ SkillObject const * ExpertiseManager::getExpertiseSkillAt(int tree, int tier, int grid, int rank) { diff --git a/engine/shared/library/sharedSkillSystem/src/shared/LevelManager.cpp b/engine/shared/library/sharedSkillSystem/src/shared/LevelManager.cpp index 12195492..5c81ffea 100755 --- a/engine/shared/library/sharedSkillSystem/src/shared/LevelManager.cpp +++ b/engine/shared/library/sharedSkillSystem/src/shared/LevelManager.cpp @@ -335,7 +335,7 @@ void LevelManager::updateLevelDataWithSkill(LevelData &levelData, std::string co //====================================================================== // Find the level corresponding to the xp value and -// returns null if not found +// returns nullptr if not found LevelRecord const * LevelManagerNamespace::getLevelRecord(int xp) { LevelRecordsIterator itr = ms_levelRecords.begin(); @@ -365,7 +365,7 @@ LevelRecord const * LevelManagerNamespace::getLevelRecord(int xp) WARNING(true, ("getLevelRecord: Couldn't find level for xp value[%d]\n", xp)); - return NULL; + return nullptr; } //====================================================================== diff --git a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp index c92f73c4..e0bc3718 100755 --- a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp +++ b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp @@ -18,7 +18,7 @@ #include #include -SkillManager *SkillManager::ms_instance = NULL; +SkillManager *SkillManager::ms_instance = nullptr; const std::string &SkillManager::cms_skillsDatatableName = "datatables/skill/skills.iff"; //----------------------------------------------------------------- @@ -92,7 +92,7 @@ void SkillManager::remove() { DEBUG_FATAL (!ms_instance, ("SkillManager not installed")); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } //---------------------------------------------------------------------- @@ -170,7 +170,7 @@ const SkillObject * SkillManager::loadSkill(const std::string & skillName) uint32 SkillManager::getDefaultXpLimit(const std::string & experienceType) { - if (m_xpLimitMap != NULL) + if (m_xpLimitMap != nullptr) { XpLimitMap::const_iterator result = m_xpLimitMap->find(experienceType); if (result != m_xpLimitMap->end()) @@ -183,13 +183,13 @@ uint32 SkillManager::getDefaultXpLimit(const std::string & experienceType) void SkillManager::initXpLimits() { - if (m_xpLimitTable == NULL) + if (m_xpLimitTable == nullptr) { WARNING(true, ("SkillManager::initXpLimits, m_xpLimitTable not initialized")); return; } - if (m_xpLimitMap == NULL) + if (m_xpLimitMap == nullptr) { WARNING(true, ("SkillManager::initXpLimits, m_xpLimitMap not initialized")); return; diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp index d6f5b854..c162ae34 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp @@ -45,7 +45,7 @@ ServerArmorTemplate::~ServerArmorTemplate() for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_specialProtection.clear(); } @@ -97,10 +97,10 @@ Tag ServerArmorTemplate::getTemplateVersion(void) const */ Tag ServerArmorTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerArmorTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerArmorTemplate::getHighestTemplateVersion @@ -114,9 +114,9 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_rating; } @@ -128,9 +128,9 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_integrity; } @@ -142,9 +142,9 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_effectiveness; } @@ -156,9 +156,9 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_vulnerability; } @@ -170,9 +170,9 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_encumbrance[index]; } @@ -180,7 +180,7 @@ CompilerIntegerParam * ServerArmorTemplate::getCompilerIntegerParam(const char * } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerArmorTemplate::getCompilerIntegerParam FloatParam * ServerArmorTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -229,7 +229,7 @@ StructParamOT * ServerArmorTemplate::getStructParamOT(const char *name, bool dee } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerArmorTemplate::getStructParamOT TriggerVolumeParam * ServerArmorTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -316,12 +316,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -355,7 +355,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_specialProtection.clear(); m_specialProtectionAppend = file.read_bool8(); @@ -532,9 +532,9 @@ CompilerIntegerParam * ServerArmorTemplate::_SpecialProtection::getCompilerInteg { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_type; } @@ -546,9 +546,9 @@ CompilerIntegerParam * ServerArmorTemplate::_SpecialProtection::getCompilerInteg { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_effectiveness; } @@ -556,7 +556,7 @@ CompilerIntegerParam * ServerArmorTemplate::_SpecialProtection::getCompilerInteg } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerArmorTemplate::_SpecialProtection::getCompilerIntegerParam FloatParam * ServerArmorTemplate::_SpecialProtection::getFloatParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp index 4394895d..aa5440ae 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp index ba0b7c07..40cf8c4e 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerBuildingObjectTemplate::getTemplateVersion(void) const */ Tag ServerBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBuildingObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerBuildingObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maintenanceCost; } @@ -113,7 +113,7 @@ CompilerIntegerParam * ServerBuildingObjectTemplate::getCompilerIntegerParam(con } else return ServerTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerBuildingObjectTemplate::getCompilerIntegerParam FloatParam * ServerBuildingObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -129,9 +129,9 @@ BoolParam * ServerBuildingObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_isPublic; } @@ -139,7 +139,7 @@ BoolParam * ServerBuildingObjectTemplate::getBoolParam(const char *name, bool de } else return ServerTangibleObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerBuildingObjectTemplate::getBoolParam StringParam * ServerBuildingObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -227,12 +227,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp index 95175f0f..427b3931 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerCellObjectTemplate::getTemplateVersion(void) const */ Tag ServerCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCellObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp index b3f18a79..ac48b340 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerCityObjectTemplate::getTemplateVersion(void) const */ Tag ServerCityObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCityObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCityObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp index 9a0f8848..73096b66 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag ServerConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerConstructionContractObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp index 7159e108..f63f0d43 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp @@ -45,7 +45,7 @@ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attribMods.clear(); } @@ -97,10 +97,10 @@ Tag ServerCreatureObjectTemplate::getTemplateVersion(void) const */ Tag ServerCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCreatureObjectTemplate::getHighestTemplateVersion @@ -114,9 +114,9 @@ CompilerIntegerParam * ServerCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_attributes[index]; } @@ -128,9 +128,9 @@ CompilerIntegerParam * ServerCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minAttributes[index]; } @@ -142,9 +142,9 @@ CompilerIntegerParam * ServerCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxAttributes[index]; } @@ -156,9 +156,9 @@ CompilerIntegerParam * ServerCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_shockWounds; } @@ -166,7 +166,7 @@ CompilerIntegerParam * ServerCreatureObjectTemplate::getCompilerIntegerParam(con } else return ServerTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerCreatureObjectTemplate::getCompilerIntegerParam FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -177,9 +177,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minDrainModifier; } @@ -191,9 +191,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxDrainModifier; } @@ -205,9 +205,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minFaucetModifier; } @@ -219,9 +219,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxFaucetModifier; } @@ -233,9 +233,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_approachTriggerRange; } @@ -247,9 +247,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxMentalStates[index]; } @@ -261,9 +261,9 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_mentalStatesDecay[index]; } @@ -271,7 +271,7 @@ FloatParam * ServerCreatureObjectTemplate::getFloatParam(const char *name, bool } else return ServerTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerCreatureObjectTemplate::getFloatParam BoolParam * ServerCreatureObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -282,9 +282,9 @@ BoolParam * ServerCreatureObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_canCreateAvatar; } @@ -292,7 +292,7 @@ BoolParam * ServerCreatureObjectTemplate::getBoolParam(const char *name, bool de } else return ServerTangibleObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerCreatureObjectTemplate::getBoolParam StringParam * ServerCreatureObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -303,9 +303,9 @@ StringParam * ServerCreatureObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_defaultWeapon; } @@ -317,9 +317,9 @@ StringParam * ServerCreatureObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_nameGeneratorType; } @@ -327,7 +327,7 @@ StringParam * ServerCreatureObjectTemplate::getStringParam(const char *name, boo } else return ServerTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerCreatureObjectTemplate::getStringParam StringIdParam * ServerCreatureObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -361,7 +361,7 @@ StructParamOT * ServerCreatureObjectTemplate::getStructParamOT(const char *name, } else return ServerTangibleObjectTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerCreatureObjectTemplate::getStructParamOT TriggerVolumeParam * ServerCreatureObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -464,12 +464,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -549,7 +549,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attribMods.clear(); m_attribModsAppend = file.read_bool8(); diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp index 0bc765a5..53c05125 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp @@ -49,7 +49,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); } @@ -58,7 +58,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_skillCommands.clear(); } @@ -67,7 +67,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_manufactureScripts.clear(); } @@ -119,10 +119,10 @@ Tag ServerDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -136,9 +136,9 @@ CompilerIntegerParam * ServerDraftSchematicObjectTemplate::getCompilerIntegerPar { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_category; } @@ -150,9 +150,9 @@ CompilerIntegerParam * ServerDraftSchematicObjectTemplate::getCompilerIntegerPar { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_itemsPerContainer; } @@ -160,7 +160,7 @@ CompilerIntegerParam * ServerDraftSchematicObjectTemplate::getCompilerIntegerPar } else return ServerIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::getCompilerIntegerParam FloatParam * ServerDraftSchematicObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -171,9 +171,9 @@ FloatParam * ServerDraftSchematicObjectTemplate::getFloatParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_manufactureTime; } @@ -185,9 +185,9 @@ FloatParam * ServerDraftSchematicObjectTemplate::getFloatParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_prototypeTime; } @@ -195,7 +195,7 @@ FloatParam * ServerDraftSchematicObjectTemplate::getFloatParam(const char *name, } else return ServerIntangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::getFloatParam BoolParam * ServerDraftSchematicObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -206,9 +206,9 @@ BoolParam * ServerDraftSchematicObjectTemplate::getBoolParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_destroyIngredients; } @@ -216,7 +216,7 @@ BoolParam * ServerDraftSchematicObjectTemplate::getBoolParam(const char *name, b } else return ServerIntangibleObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::getBoolParam StringParam * ServerDraftSchematicObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -227,9 +227,9 @@ StringParam * ServerDraftSchematicObjectTemplate::getStringParam(const char *nam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_craftedObjectTemplate; } @@ -241,9 +241,9 @@ StringParam * ServerDraftSchematicObjectTemplate::getStringParam(const char *nam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_crateObjectTemplate; } @@ -275,7 +275,7 @@ StringParam * ServerDraftSchematicObjectTemplate::getStringParam(const char *nam } else return ServerIntangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::getStringParam StringIdParam * ServerDraftSchematicObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -309,7 +309,7 @@ StructParamOT * ServerDraftSchematicObjectTemplate::getStructParamOT(const char } else return ServerIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::getStructParamOT TriggerVolumeParam * ServerDraftSchematicObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -418,12 +418,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -457,7 +457,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); m_slotsAppend = file.read_bool8(); @@ -476,7 +476,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_skillCommands.clear(); m_skillCommandsAppend = file.read_bool8(); @@ -497,7 +497,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_manufactureScripts.clear(); m_manufactureScriptsAppend = file.read_bool8(); @@ -672,7 +672,7 @@ ServerDraftSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot() for (iter = m_options.begin(); iter != m_options.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_options.clear(); } @@ -719,9 +719,9 @@ FloatParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getFloatParam( { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_complexity; } @@ -729,7 +729,7 @@ FloatParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getFloatParam( } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::_IngredientSlot::getFloatParam BoolParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getBoolParam(const char *name, bool deepCheck, int index) @@ -740,9 +740,9 @@ BoolParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getBoolParam(co { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_optional; } @@ -750,7 +750,7 @@ BoolParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getBoolParam(co } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::_IngredientSlot::getBoolParam StringParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringParam(const char *name, bool deepCheck, int index) @@ -761,9 +761,9 @@ StringParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_optionalSkillCommand; } @@ -775,9 +775,9 @@ StringParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_appearance; } @@ -785,7 +785,7 @@ StringParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringPara } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringParam StringIdParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringIdParam(const char *name, bool deepCheck, int index) @@ -796,9 +796,9 @@ StringIdParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringId { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -806,7 +806,7 @@ StringIdParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringId } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::_IngredientSlot::getStringIdParam VectorParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getVectorParam(const char *name, bool deepCheck, int index) @@ -835,7 +835,7 @@ StructParamOT * ServerDraftSchematicObjectTemplate::_IngredientSlot::getStructPa } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerDraftSchematicObjectTemplate::_IngredientSlot::getStructParamOT TriggerVolumeParam * ServerDraftSchematicObjectTemplate::_IngredientSlot::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -921,7 +921,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_options.begin(); iter != m_options.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_options.clear(); m_optionsAppend = file.read_bool8(); diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp index cd7ab927..a4d8ae8d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerFactoryObjectTemplate::getTemplateVersion(void) const */ Tag ServerFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerFactoryObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp index 647b6606..a4c0367a 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerGroupObjectTemplate::getTemplateVersion(void) const */ Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGroupObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp index 446f3c34..b212df70 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerGuildObjectTemplate::getTemplateVersion(void) const */ Tag ServerGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGuildObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp index 7bfaaf19..6516811d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerHarvesterInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerHarvesterInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerHarvesterInstallationObjectTemplate::getCompilerInt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxExtractionRate; } @@ -117,9 +117,9 @@ CompilerIntegerParam * ServerHarvesterInstallationObjectTemplate::getCompilerInt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_currentExtractionRate; } @@ -131,9 +131,9 @@ CompilerIntegerParam * ServerHarvesterInstallationObjectTemplate::getCompilerInt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxHopperSize; } @@ -141,7 +141,7 @@ CompilerIntegerParam * ServerHarvesterInstallationObjectTemplate::getCompilerInt } else return ServerInstallationObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerHarvesterInstallationObjectTemplate::getCompilerIntegerParam FloatParam * ServerHarvesterInstallationObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -162,9 +162,9 @@ StringParam * ServerHarvesterInstallationObjectTemplate::getStringParam(const ch { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_masterClassName; } @@ -172,7 +172,7 @@ StringParam * ServerHarvesterInstallationObjectTemplate::getStringParam(const ch } else return ServerInstallationObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerHarvesterInstallationObjectTemplate::getStringParam StringIdParam * ServerHarvesterInstallationObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -255,12 +255,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp index efc11fee..6525ffe2 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerInstallationObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp index efdbfac9..43781914 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerIntangibleObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::getCompilerIntegerParam(c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_count; } @@ -113,7 +113,7 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::getCompilerIntegerParam(c } else return ServerObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::getCompilerIntegerParam FloatParam * ServerIntangibleObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -316,7 +316,7 @@ ServerIntangibleObjectTemplate::_Ingredient::~_Ingredient() for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); } @@ -358,9 +358,9 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_Ingredient::getCompilerI { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_ingredientType; } @@ -368,7 +368,7 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_Ingredient::getCompilerI } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_Ingredient::getCompilerIntegerParam FloatParam * ServerIntangibleObjectTemplate::_Ingredient::getFloatParam(const char *name, bool deepCheck, int index) @@ -379,9 +379,9 @@ FloatParam * ServerIntangibleObjectTemplate::_Ingredient::getFloatParam(const ch { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_complexity; } @@ -389,7 +389,7 @@ FloatParam * ServerIntangibleObjectTemplate::_Ingredient::getFloatParam(const ch } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_Ingredient::getFloatParam BoolParam * ServerIntangibleObjectTemplate::_Ingredient::getBoolParam(const char *name, bool deepCheck, int index) @@ -405,9 +405,9 @@ StringParam * ServerIntangibleObjectTemplate::_Ingredient::getStringParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_skillCommand; } @@ -415,7 +415,7 @@ StringParam * ServerIntangibleObjectTemplate::_Ingredient::getStringParam(const } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_Ingredient::getStringParam StringIdParam * ServerIntangibleObjectTemplate::_Ingredient::getStringIdParam(const char *name, bool deepCheck, int index) @@ -449,7 +449,7 @@ StructParamOT * ServerIntangibleObjectTemplate::_Ingredient::getStructParamOT(co } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_Ingredient::getStructParamOT TriggerVolumeParam * ServerIntangibleObjectTemplate::_Ingredient::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -533,7 +533,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); m_ingredientsAppend = file.read_bool8(); @@ -669,9 +669,9 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getC { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_value; } @@ -679,7 +679,7 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getC } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_SchematicAttribute::getCompilerIntegerParam FloatParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getFloatParam(const char *name, bool deepCheck, int index) @@ -705,9 +705,9 @@ StringIdParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getStringId { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -715,7 +715,7 @@ StringIdParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getStringId } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_SchematicAttribute::getStringIdParam VectorParam * ServerIntangibleObjectTemplate::_SchematicAttribute::getVectorParam(const char *name, bool deepCheck, int index) @@ -889,9 +889,9 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getCom { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_count; } @@ -899,7 +899,7 @@ CompilerIntegerParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getCom } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_SimpleIngredient::getCompilerIntegerParam FloatParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getFloatParam(const char *name, bool deepCheck, int index) @@ -920,9 +920,9 @@ StringParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getStringParam( { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_ingredient; } @@ -930,7 +930,7 @@ StringParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getStringParam( } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_SimpleIngredient::getStringParam StringIdParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getStringIdParam(const char *name, bool deepCheck, int index) @@ -941,9 +941,9 @@ StringIdParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getStringIdPa { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -951,7 +951,7 @@ StringIdParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getStringIdPa } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerIntangibleObjectTemplate::_SimpleIngredient::getStringIdParam VectorParam * ServerIntangibleObjectTemplate::_SimpleIngredient::getVectorParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp index 34919f61..acecbef1 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerJediManagerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp index 82335f44..1747392d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerManufactureInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerManufactureInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp index 54bbda83..73735880 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp @@ -47,7 +47,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); } @@ -56,7 +56,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); } @@ -108,10 +108,10 @@ Tag ServerManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion @@ -125,9 +125,9 @@ CompilerIntegerParam * ServerManufactureSchematicObjectTemplate::getCompilerInte { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_itemCount; } @@ -135,7 +135,7 @@ CompilerIntegerParam * ServerManufactureSchematicObjectTemplate::getCompilerInte } else return ServerIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerManufactureSchematicObjectTemplate::getCompilerIntegerParam FloatParam * ServerManufactureSchematicObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -156,9 +156,9 @@ StringParam * ServerManufactureSchematicObjectTemplate::getStringParam(const cha { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_draftSchematic; } @@ -170,9 +170,9 @@ StringParam * ServerManufactureSchematicObjectTemplate::getStringParam(const cha { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_creator; } @@ -180,7 +180,7 @@ StringParam * ServerManufactureSchematicObjectTemplate::getStringParam(const cha } else return ServerIntangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerManufactureSchematicObjectTemplate::getStringParam StringIdParam * ServerManufactureSchematicObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -226,7 +226,7 @@ StructParamOT * ServerManufactureSchematicObjectTemplate::getStructParamOT(const } else return ServerIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerManufactureSchematicObjectTemplate::getStructParamOT TriggerVolumeParam * ServerManufactureSchematicObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -324,12 +324,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -361,7 +361,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_ingredients.clear(); m_ingredientsAppend = file.read_bool8(); @@ -382,7 +382,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); m_attributesAppend = file.read_bool8(); @@ -563,9 +563,9 @@ StringIdParam * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getSt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -573,7 +573,7 @@ StringIdParam * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getSt } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerManufactureSchematicObjectTemplate::_IngredientSlot::getStringIdParam VectorParam * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getVectorParam(const char *name, bool deepCheck, int index) @@ -594,9 +594,9 @@ StructParamOT * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getSt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } return &m_ingredient; } @@ -604,7 +604,7 @@ StructParamOT * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getSt } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerManufactureSchematicObjectTemplate::_IngredientSlot::getStructParamOT TriggerVolumeParam * ServerManufactureSchematicObjectTemplate::_IngredientSlot::getTriggerVolumeParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp index 39ab71f1..240882ac 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerMissionObjectTemplate::getTemplateVersion(void) const */ Tag ServerMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerMissionObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp index 0307ce8c..5df8660b 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp @@ -55,7 +55,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_scripts.clear(); } @@ -64,7 +64,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_visibleFlags.clear(); } @@ -73,7 +73,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_deleteFlags.clear(); } @@ -82,7 +82,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_moveFlags.clear(); } @@ -91,7 +91,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_contents.begin(); iter != m_contents.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_contents.clear(); } @@ -100,7 +100,7 @@ ServerObjectTemplate::~ServerObjectTemplate() for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_xpPoints.clear(); } @@ -152,10 +152,10 @@ Tag ServerObjectTemplate::getTemplateVersion(void) const */ Tag ServerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerObjectTemplate::getHighestTemplateVersion @@ -169,9 +169,9 @@ CompilerIntegerParam * ServerObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_volume; } @@ -219,9 +219,9 @@ CompilerIntegerParam * ServerObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_tintIndex; } @@ -229,7 +229,7 @@ CompilerIntegerParam * ServerObjectTemplate::getCompilerIntegerParam(const char } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getCompilerIntegerParam FloatParam * ServerObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -240,9 +240,9 @@ FloatParam * ServerObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_complexity; } @@ -254,9 +254,9 @@ FloatParam * ServerObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_updateRanges[index]; } @@ -264,7 +264,7 @@ FloatParam * ServerObjectTemplate::getFloatParam(const char *name, bool deepChec } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getFloatParam BoolParam * ServerObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -275,9 +275,9 @@ BoolParam * ServerObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_invulnerable; } @@ -289,9 +289,9 @@ BoolParam * ServerObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_persistByDefault; } @@ -303,9 +303,9 @@ BoolParam * ServerObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_persistContents; } @@ -313,7 +313,7 @@ BoolParam * ServerObjectTemplate::getBoolParam(const char *name, bool deepCheck, } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getBoolParam StringParam * ServerObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -324,9 +324,9 @@ StringParam * ServerObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_sharedTemplate; } @@ -346,7 +346,7 @@ StringParam * ServerObjectTemplate::getStringParam(const char *name, bool deepCh } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getStringParam StringIdParam * ServerObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -367,9 +367,9 @@ DynamicVariableParam * ServerObjectTemplate::getDynamicVariableParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getDynamicVariableParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_objvars; } @@ -377,7 +377,7 @@ DynamicVariableParam * ServerObjectTemplate::getDynamicVariableParam(const char } else return TpfTemplate::getDynamicVariableParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getDynamicVariableParam StructParamOT * ServerObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) @@ -408,7 +408,7 @@ StructParamOT * ServerObjectTemplate::getStructParamOT(const char *name, bool de } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::getStructParamOT TriggerVolumeParam * ServerObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -562,12 +562,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -597,7 +597,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_scripts.clear(); m_scriptsAppend = file.read_bool8(); @@ -620,7 +620,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_visibleFlags.clear(); m_visibleFlagsAppend = file.read_bool8(); @@ -639,7 +639,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_deleteFlags.clear(); m_deleteFlagsAppend = file.read_bool8(); @@ -658,7 +658,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_moveFlags.clear(); m_moveFlagsAppend = file.read_bool8(); @@ -697,7 +697,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_contents.begin(); iter != m_contents.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_contents.clear(); m_contentsAppend = file.read_bool8(); @@ -716,7 +716,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_xpPoints.clear(); m_xpPointsAppend = file.read_bool8(); @@ -980,9 +980,9 @@ CompilerIntegerParam * ServerObjectTemplate::_AttribMod::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_target; } @@ -994,9 +994,9 @@ CompilerIntegerParam * ServerObjectTemplate::_AttribMod::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_value; } @@ -1004,7 +1004,7 @@ CompilerIntegerParam * ServerObjectTemplate::_AttribMod::getCompilerIntegerParam } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_AttribMod::getCompilerIntegerParam FloatParam * ServerObjectTemplate::_AttribMod::getFloatParam(const char *name, bool deepCheck, int index) @@ -1015,9 +1015,9 @@ FloatParam * ServerObjectTemplate::_AttribMod::getFloatParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_time; } @@ -1029,9 +1029,9 @@ FloatParam * ServerObjectTemplate::_AttribMod::getFloatParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_timeAtValue; } @@ -1043,9 +1043,9 @@ FloatParam * ServerObjectTemplate::_AttribMod::getFloatParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_decay; } @@ -1053,7 +1053,7 @@ FloatParam * ServerObjectTemplate::_AttribMod::getFloatParam(const char *name, b } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_AttribMod::getFloatParam BoolParam * ServerObjectTemplate::_AttribMod::getBoolParam(const char *name, bool deepCheck, int index) @@ -1276,9 +1276,9 @@ BoolParam * ServerObjectTemplate::_Contents::getBoolParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_equipObject; } @@ -1286,7 +1286,7 @@ BoolParam * ServerObjectTemplate::_Contents::getBoolParam(const char *name, bool } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_Contents::getBoolParam StringParam * ServerObjectTemplate::_Contents::getStringParam(const char *name, bool deepCheck, int index) @@ -1297,9 +1297,9 @@ StringParam * ServerObjectTemplate::_Contents::getStringParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_slotName; } @@ -1311,9 +1311,9 @@ StringParam * ServerObjectTemplate::_Contents::getStringParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_content; } @@ -1321,7 +1321,7 @@ StringParam * ServerObjectTemplate::_Contents::getStringParam(const char *name, } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_Contents::getStringParam StringIdParam * ServerObjectTemplate::_Contents::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1508,9 +1508,9 @@ CompilerIntegerParam * ServerObjectTemplate::_MentalStateMod::getCompilerInteger { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_target; } @@ -1518,7 +1518,7 @@ CompilerIntegerParam * ServerObjectTemplate::_MentalStateMod::getCompilerInteger } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_MentalStateMod::getCompilerIntegerParam FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *name, bool deepCheck, int index) @@ -1529,9 +1529,9 @@ FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *na { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_value; } @@ -1543,9 +1543,9 @@ FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *na { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_time; } @@ -1557,9 +1557,9 @@ FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *na { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_timeAtValue; } @@ -1571,9 +1571,9 @@ FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *na { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_decay; } @@ -1581,7 +1581,7 @@ FloatParam * ServerObjectTemplate::_MentalStateMod::getFloatParam(const char *na } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_MentalStateMod::getFloatParam BoolParam * ServerObjectTemplate::_MentalStateMod::getBoolParam(const char *name, bool deepCheck, int index) @@ -1794,9 +1794,9 @@ CompilerIntegerParam * ServerObjectTemplate::_Xp::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_type; } @@ -1808,9 +1808,9 @@ CompilerIntegerParam * ServerObjectTemplate::_Xp::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_level; } @@ -1822,9 +1822,9 @@ CompilerIntegerParam * ServerObjectTemplate::_Xp::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_value; } @@ -1832,7 +1832,7 @@ CompilerIntegerParam * ServerObjectTemplate::_Xp::getCompilerIntegerParam(const } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerObjectTemplate::_Xp::getCompilerIntegerParam FloatParam * ServerObjectTemplate::_Xp::getFloatParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp index 91f52345..fc998c4a 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerPlanetObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlanetObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlanetObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlanetObjectTemplate::getHighestTemplateVersion @@ -118,9 +118,9 @@ StringParam * ServerPlanetObjectTemplate::getStringParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_planetName; } @@ -128,7 +128,7 @@ StringParam * ServerPlanetObjectTemplate::getStringParam(const char *name, bool } else return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerPlanetObjectTemplate::getStringParam StringIdParam * ServerPlanetObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp index 2824f83a..bd678142 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerPlayerObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp index 0c05dd79..36c23628 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerQuestObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp index 2df53960..0a5c1bac 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerResourceClassObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceClassObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerResourceClassObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceClassObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_numTypes; } @@ -117,9 +117,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minTypes; } @@ -131,9 +131,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxTypes; } @@ -141,7 +141,7 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara } else return ServerUniverseObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerResourceClassObjectTemplate::getCompilerIntegerParam FloatParam * ServerResourceClassObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -162,9 +162,9 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_resourceClassName; } @@ -176,9 +176,9 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_parentClass; } @@ -186,7 +186,7 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name } else return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerResourceClassObjectTemplate::getStringParam StringIdParam * ServerResourceClassObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -269,12 +269,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp index c5e367cc..c4008c2f 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceContainerObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerResourceContainerObjectTemplate::getCompilerInteger { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxResources; } @@ -113,7 +113,7 @@ CompilerIntegerParam * ServerResourceContainerObjectTemplate::getCompilerInteger } else return ServerTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerResourceContainerObjectTemplate::getCompilerIntegerParam FloatParam * ServerResourceContainerObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp index 6aa324d6..15ad8ebc 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerResourcePoolObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourcePoolObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerResourcePoolObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourcePoolObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_mapSeed; } @@ -117,9 +117,9 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_amountRemaining; } @@ -127,7 +127,7 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam } else return ServerUniverseObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerResourcePoolObjectTemplate::getCompilerIntegerParam FloatParam * ServerResourcePoolObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -225,12 +225,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp index dd44c902..7ed9954d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerResourceTypeObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceTypeObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerResourceTypeObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceTypeObjectTemplate::getHighestTemplateVersion @@ -118,9 +118,9 @@ StringParam * ServerResourceTypeObjectTemplate::getStringParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_resourceName; } @@ -128,7 +128,7 @@ StringParam * ServerResourceTypeObjectTemplate::getStringParam(const char *name, } else return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerResourceTypeObjectTemplate::getStringParam StringIdParam * ServerResourceTypeObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp index 247bda11..c1bb613c 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerShipObjectTemplate::getTemplateVersion(void) const */ Tag ServerShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerShipObjectTemplate::getHighestTemplateVersion @@ -118,9 +118,9 @@ StringParam * ServerShipObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_shipType; } @@ -128,7 +128,7 @@ StringParam * ServerShipObjectTemplate::getStringParam(const char *name, bool de } else return ServerTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerShipObjectTemplate::getStringParam StringIdParam * ServerShipObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp index fb078b58..48fe0b50 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerStaticObjectTemplate::getTemplateVersion(void) const */ Tag ServerStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerStaticObjectTemplate::getHighestTemplateVersion @@ -113,9 +113,9 @@ BoolParam * ServerStaticObjectTemplate::getBoolParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_clientOnlyBuildout; } @@ -123,7 +123,7 @@ BoolParam * ServerStaticObjectTemplate::getBoolParam(const char *name, bool deep } else return ServerObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerStaticObjectTemplate::getBoolParam StringParam * ServerStaticObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -211,12 +211,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp index 5604b102..52fd36b3 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp @@ -45,7 +45,7 @@ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumes.clear(); } @@ -97,10 +97,10 @@ Tag ServerTangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTangibleObjectTemplate::getHighestTemplateVersion @@ -114,9 +114,9 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_combatSkeleton; } @@ -128,9 +128,9 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxHitPoints; } @@ -142,9 +142,9 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_interestRadius; } @@ -156,9 +156,9 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_count; } @@ -170,9 +170,9 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_condition; } @@ -180,7 +180,7 @@ CompilerIntegerParam * ServerTangibleObjectTemplate::getCompilerIntegerParam(con } else return ServerObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerTangibleObjectTemplate::getCompilerIntegerParam FloatParam * ServerTangibleObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -196,9 +196,9 @@ BoolParam * ServerTangibleObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_wantSawAttackTriggers; } @@ -206,7 +206,7 @@ BoolParam * ServerTangibleObjectTemplate::getBoolParam(const char *name, bool de } else return ServerObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerTangibleObjectTemplate::getBoolParam StringParam * ServerTangibleObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -217,9 +217,9 @@ StringParam * ServerTangibleObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_armor; } @@ -227,7 +227,7 @@ StringParam * ServerTangibleObjectTemplate::getStringParam(const char *name, boo } else return ServerObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerTangibleObjectTemplate::getStringParam StringIdParam * ServerTangibleObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -266,7 +266,7 @@ TriggerVolumeParam * ServerTangibleObjectTemplate::getTriggerVolumeParam(const c } else return ServerObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerTangibleObjectTemplate::getTriggerVolumeParam void ServerTangibleObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) @@ -341,12 +341,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -374,7 +374,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumes.clear(); m_triggerVolumesAppend = file.read_bool8(); diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp index b63a3f63..a3cac916 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerTokenObjectTemplate::getTemplateVersion(void) const */ Tag ServerTokenObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerTokenObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTokenObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp index 20c3f1f8..6aba5832 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp @@ -87,7 +87,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListSimple.begin(); iter != m_intListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -95,7 +95,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListWeightedList.begin(); iter != m_intListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -103,7 +103,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListRandomRange.begin(); iter != m_intListRandomRange.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -111,7 +111,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListDiceRoll.begin(); iter != m_intListDiceRoll.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -119,7 +119,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListSimple.begin(); iter != m_floatListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -127,7 +127,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListWeightedList.begin(); iter != m_floatListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -135,7 +135,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListRandomRange.begin(); iter != m_floatListRandomRange.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -143,7 +143,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_enumListIndexed.begin(); iter != m_enumListIndexed.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -151,7 +151,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_enumListWeightedList.begin(); iter != m_enumListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -159,7 +159,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringIdListSimple.begin(); iter != m_stringIdListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -167,7 +167,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringIdListWeightedList.begin(); iter != m_stringIdListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -175,7 +175,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringListSimple.begin(); iter != m_stringListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -183,7 +183,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringListWeightedList.begin(); iter != m_stringListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -191,7 +191,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_triggerVolumeList.begin(); iter != m_triggerVolumeList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -199,7 +199,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_triggerVolumesListWeightedList.begin(); iter != m_triggerVolumesListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -207,7 +207,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListDerived.begin(); iter != m_boolListDerived.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -215,7 +215,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListSimple.begin(); iter != m_boolListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -223,7 +223,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListWeightedList.begin(); iter != m_boolListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -231,7 +231,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_vectorListSimple.begin(); iter != m_vectorListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -239,7 +239,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_filenameListSimple.begin(); iter != m_filenameListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -247,7 +247,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_templateListSimple.begin(); iter != m_templateListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } { @@ -255,7 +255,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_structListSimple.begin(); iter != m_structListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } //@END TFD CLEANUP @@ -306,10 +306,10 @@ Tag ServerUberObjectTemplate::getTemplateVersion(void) const */ Tag ServerUberObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerUberObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUberObjectTemplate::getHighestTemplateVersion @@ -323,9 +323,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intAtDerived; } @@ -337,9 +337,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intSimple; } @@ -351,9 +351,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intSimpleDeltaPositive; } @@ -365,9 +365,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intSimpleDeltaNegative; } @@ -379,9 +379,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intSimpleDeltaPositivePercent; } @@ -393,9 +393,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intSimpleDeltaNegativePercent; } @@ -407,9 +407,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intWeightedList; } @@ -421,9 +421,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intWeightedListDeltaPositive; } @@ -435,9 +435,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intWeightedListDeltaNegative; } @@ -449,9 +449,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intWeightedListDeltaPositivePercent; } @@ -463,9 +463,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intWeightedListDeltaNegativePercent; } @@ -477,9 +477,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intRandomRange1; } @@ -491,9 +491,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intRandomRange2; } @@ -505,9 +505,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intRandomRange3; } @@ -519,9 +519,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intRandomRange4; } @@ -533,9 +533,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intDiceRoll1; } @@ -547,9 +547,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_intDiceRoll2; } @@ -609,9 +609,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_enumIndexedByEnumSingle[index]; } @@ -623,9 +623,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_enumIndexedByEnumWeightedList[index]; } @@ -661,9 +661,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_integerArray[index]; } @@ -671,7 +671,7 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getCompilerIntegerParam FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -682,9 +682,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatAtDerived; } @@ -696,9 +696,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatSimple; } @@ -710,9 +710,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatSimpleDeltaPositive; } @@ -724,9 +724,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatSimpleDeltaNegative; } @@ -738,9 +738,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatSimpleDeltaPositivePercent; } @@ -752,9 +752,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatSimpleDeltaNegativePercent; } @@ -766,9 +766,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatWeightedList; } @@ -780,9 +780,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatRandomRange1; } @@ -794,9 +794,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatRandomRange2; } @@ -808,9 +808,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatRandomRange3; } @@ -822,9 +822,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatRandomRange4; } @@ -872,9 +872,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_floatArray[index]; } @@ -882,7 +882,7 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getFloatParam BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -893,9 +893,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_boolDerived; } @@ -907,9 +907,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_boolSimple; } @@ -921,9 +921,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_boolWeightedList; } @@ -971,9 +971,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_boolArray[index]; } @@ -981,7 +981,7 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getBoolParam StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -992,9 +992,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringDerived; } @@ -1006,9 +1006,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringSimple; } @@ -1020,9 +1020,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringWeightedList; } @@ -1058,9 +1058,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_filenameAtDerived; } @@ -1072,9 +1072,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_filenameSimple; } @@ -1086,9 +1086,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_filenameWeightedList; } @@ -1112,9 +1112,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_templateDerived; } @@ -1126,9 +1126,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_templateSimple; } @@ -1140,9 +1140,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_templateWeightedList; } @@ -1166,9 +1166,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringArray[index]; } @@ -1180,9 +1180,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_fileNameArray[index]; } @@ -1190,7 +1190,7 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getStringParam StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1201,9 +1201,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringIdDerived; } @@ -1215,9 +1215,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringIdSimple; } @@ -1229,9 +1229,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringIdWeightedList; } @@ -1267,9 +1267,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stringIdArray[index]; } @@ -1277,7 +1277,7 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getStringIdParam VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) @@ -1288,9 +1288,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_vectorAtDerived; } @@ -1302,9 +1302,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_vectorSimple; } @@ -1328,9 +1328,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_vectorArray[index]; } @@ -1338,7 +1338,7 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de } else return TpfTemplate::getVectorParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getVectorParam DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) @@ -1349,9 +1349,9 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getDynamicVariableParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_objvarDerived; } @@ -1363,9 +1363,9 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getDynamicVariableParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_objvarSimple; } @@ -1373,7 +1373,7 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c } else return TpfTemplate::getDynamicVariableParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getDynamicVariableParam StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) @@ -1384,9 +1384,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } return &m_structAtDerived; } @@ -1398,9 +1398,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } return &m_structSimple; } @@ -1424,9 +1424,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } return &m_structArrayEnum[index]; } @@ -1438,9 +1438,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } return &m_structArrayInteger[index]; } @@ -1448,7 +1448,7 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getStructParamOT TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -1459,9 +1459,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_triggerVolumeDerived; } @@ -1473,9 +1473,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_triggerVolumeSimple; } @@ -1487,9 +1487,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_triggerVolumeWeightedList; } @@ -1525,9 +1525,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_triggerArray[index]; } @@ -1535,7 +1535,7 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char } else return TpfTemplate::getTriggerVolumeParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::getTriggerVolumeParam void ServerUberObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) @@ -1942,12 +1942,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -2009,7 +2009,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_intListSimple.begin(); iter != m_intListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_intListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2027,7 +2027,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_intListWeightedList.begin(); iter != m_intListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_intListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2045,7 +2045,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_intListRandomRange.begin(); iter != m_intListRandomRange.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_intListRandomRangeAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2063,7 +2063,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_intListDiceRoll.begin(); iter != m_intListDiceRoll.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_intListDiceRollAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2103,7 +2103,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_floatListSimple.begin(); iter != m_floatListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_floatListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2121,7 +2121,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_floatListWeightedList.begin(); iter != m_floatListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_floatListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2139,7 +2139,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_floatListRandomRange.begin(); iter != m_floatListRandomRange.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_floatListRandomRangeAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2185,7 +2185,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_enumListIndexed.begin(); iter != m_enumListIndexed.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_enumListIndexedAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2203,7 +2203,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_enumListWeightedList.begin(); iter != m_enumListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_enumListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2227,7 +2227,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_stringIdListSimple.begin(); iter != m_stringIdListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_stringIdListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2245,7 +2245,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_stringIdListWeightedList.begin(); iter != m_stringIdListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_stringIdListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2269,7 +2269,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_stringListSimple.begin(); iter != m_stringListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_stringListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2287,7 +2287,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_stringListWeightedList.begin(); iter != m_stringListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_stringListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2311,7 +2311,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_triggerVolumeList.begin(); iter != m_triggerVolumeList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumeListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2329,7 +2329,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_triggerVolumesListWeightedList.begin(); iter != m_triggerVolumesListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_triggerVolumesListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2353,7 +2353,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_boolListDerived.begin(); iter != m_boolListDerived.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_boolListDerivedAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2371,7 +2371,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_boolListSimple.begin(); iter != m_boolListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_boolListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2389,7 +2389,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_boolListWeightedList.begin(); iter != m_boolListWeightedList.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_boolListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2411,7 +2411,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_vectorListSimple.begin(); iter != m_vectorListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_vectorListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2435,7 +2435,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_filenameListSimple.begin(); iter != m_filenameListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_filenameListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2463,7 +2463,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_templateListSimple.begin(); iter != m_templateListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_templateListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2485,7 +2485,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_structListSimple.begin(); iter != m_structListSimple.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_structListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -3487,9 +3487,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::_Foo::getCompilerIntegerParam(c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_item1; } @@ -3497,7 +3497,7 @@ CompilerIntegerParam * ServerUberObjectTemplate::_Foo::getCompilerIntegerParam(c } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::_Foo::getCompilerIntegerParam FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, bool deepCheck, int index) @@ -3508,9 +3508,9 @@ FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_item2; } @@ -3518,7 +3518,7 @@ FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, boo } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::_Foo::getFloatParam BoolParam * ServerUberObjectTemplate::_Foo::getBoolParam(const char *name, bool deepCheck, int index) @@ -3534,9 +3534,9 @@ StringParam * ServerUberObjectTemplate::_Foo::getStringParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_item3; } @@ -3544,7 +3544,7 @@ StringParam * ServerUberObjectTemplate::_Foo::getStringParam(const char *name, b } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerUberObjectTemplate::_Foo::getStringParam StringIdParam * ServerUberObjectTemplate::_Foo::getStringIdParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp index 359ddce6..7f4176f1 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerUniverseObjectTemplate::getTemplateVersion(void) const */ Tag ServerUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUniverseObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp index 663fdb2a..e204aa23 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerVehicleObjectTemplate::getTemplateVersion(void) const */ Tag ServerVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerVehicleObjectTemplate::getHighestTemplateVersion @@ -108,9 +108,9 @@ FloatParam * ServerVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_currentFuel; } @@ -122,9 +122,9 @@ FloatParam * ServerVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxFuel; } @@ -136,9 +136,9 @@ FloatParam * ServerVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_consumpsion; } @@ -146,7 +146,7 @@ FloatParam * ServerVehicleObjectTemplate::getFloatParam(const char *name, bool d } else return ServerTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerVehicleObjectTemplate::getFloatParam BoolParam * ServerVehicleObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -162,9 +162,9 @@ StringParam * ServerVehicleObjectTemplate::getStringParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_fuelType; } @@ -172,7 +172,7 @@ StringParam * ServerVehicleObjectTemplate::getStringParam(const char *name, bool } else return ServerTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerVehicleObjectTemplate::getStringParam StringIdParam * ServerVehicleObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -255,12 +255,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp index 0cd323ea..23c83cd5 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerWaypointObjectTemplate::getTemplateVersion(void) const */ Tag ServerWaypointObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerWaypointObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWaypointObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp index 54aa2726..65775fd0 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerWeaponObjectTemplate::getTemplateVersion(void) const */ Tag ServerWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWeaponObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_weaponType; } @@ -117,9 +117,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_attackType; } @@ -131,9 +131,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_damageType; } @@ -145,9 +145,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_elementalType; } @@ -159,9 +159,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_elementalValue; } @@ -173,9 +173,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minDamageAmount; } @@ -187,9 +187,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxDamageAmount; } @@ -201,9 +201,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_attackCost; } @@ -215,9 +215,9 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_accuracy; } @@ -225,7 +225,7 @@ CompilerIntegerParam * ServerWeaponObjectTemplate::getCompilerIntegerParam(const } else return ServerTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerWeaponObjectTemplate::getCompilerIntegerParam FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -236,9 +236,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_attackSpeed; } @@ -250,9 +250,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_audibleRange; } @@ -264,9 +264,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minRange; } @@ -278,9 +278,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxRange; } @@ -292,9 +292,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_damageRadius; } @@ -306,9 +306,9 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_woundChance; } @@ -316,7 +316,7 @@ FloatParam * ServerWeaponObjectTemplate::getFloatParam(const char *name, bool de } else return ServerTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //ServerWeaponObjectTemplate::getFloatParam BoolParam * ServerWeaponObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -409,12 +409,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp index b5969702..0725fed2 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag ServerXpManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerXpManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerXpManagerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp index 21c891e3..a5bd8fe4 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * SharedBattlefieldMarkerObjectTemplate::getCompilerInteger { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_numberOfPoles; } @@ -113,7 +113,7 @@ CompilerIntegerParam * SharedBattlefieldMarkerObjectTemplate::getCompilerInteger } else return SharedTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedBattlefieldMarkerObjectTemplate::getCompilerIntegerParam FloatParam * SharedBattlefieldMarkerObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -124,9 +124,9 @@ FloatParam * SharedBattlefieldMarkerObjectTemplate::getFloatParam(const char *na { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_radius; } @@ -134,7 +134,7 @@ FloatParam * SharedBattlefieldMarkerObjectTemplate::getFloatParam(const char *na } else return SharedTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedBattlefieldMarkerObjectTemplate::getFloatParam BoolParam * SharedBattlefieldMarkerObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -227,12 +227,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp index 3af16bfb..f4bba6f0 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedBuildingObjectTemplate::getTemplateVersion(void) const */ Tag SharedBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBuildingObjectTemplate::getHighestTemplateVersion @@ -118,9 +118,9 @@ StringParam * SharedBuildingObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_terrainModificationFileName; } @@ -132,9 +132,9 @@ StringParam * SharedBuildingObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_interiorLayoutFileName; } @@ -142,7 +142,7 @@ StringParam * SharedBuildingObjectTemplate::getStringParam(const char *name, boo } else return SharedTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedBuildingObjectTemplate::getStringParam StringIdParam * SharedBuildingObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -225,12 +225,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp index 7e96a950..1a71a06d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedCellObjectTemplate::getTemplateVersion(void) const */ Tag SharedCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCellObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp index 7426b7c1..5c4b79e2 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag SharedConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedConstructionContractObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp index 913472e0..e4034d22 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedCreatureObjectTemplate::getTemplateVersion(void) const */ Tag SharedCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCreatureObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * SharedCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_gender; } @@ -117,9 +117,9 @@ CompilerIntegerParam * SharedCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_niche; } @@ -131,9 +131,9 @@ CompilerIntegerParam * SharedCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_species; } @@ -145,9 +145,9 @@ CompilerIntegerParam * SharedCreatureObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_race; } @@ -155,7 +155,7 @@ CompilerIntegerParam * SharedCreatureObjectTemplate::getCompilerIntegerParam(con } else return SharedTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedCreatureObjectTemplate::getCompilerIntegerParam FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -166,9 +166,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_acceleration[index]; } @@ -180,9 +180,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_speed[index]; } @@ -194,9 +194,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_turnRate[index]; } @@ -208,9 +208,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_slopeModAngle; } @@ -222,9 +222,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_slopeModPercent; } @@ -236,9 +236,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_waterModPercent; } @@ -250,9 +250,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_stepHeight; } @@ -264,9 +264,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_collisionHeight; } @@ -278,9 +278,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_collisionRadius; } @@ -292,9 +292,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_swimHeight; } @@ -306,9 +306,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_warpTolerance; } @@ -320,9 +320,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_collisionOffsetX; } @@ -334,9 +334,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_collisionOffsetZ; } @@ -348,9 +348,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_collisionLength; } @@ -362,9 +362,9 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_cameraHeight; } @@ -372,7 +372,7 @@ FloatParam * SharedCreatureObjectTemplate::getFloatParam(const char *name, bool } else return SharedTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedCreatureObjectTemplate::getFloatParam BoolParam * SharedCreatureObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -383,9 +383,9 @@ BoolParam * SharedCreatureObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_postureAlignToTerrain[index]; } @@ -393,7 +393,7 @@ BoolParam * SharedCreatureObjectTemplate::getBoolParam(const char *name, bool de } else return SharedTangibleObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedCreatureObjectTemplate::getBoolParam StringParam * SharedCreatureObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -404,9 +404,9 @@ StringParam * SharedCreatureObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_animationMapFilename; } @@ -418,9 +418,9 @@ StringParam * SharedCreatureObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_movementDatatable; } @@ -428,7 +428,7 @@ StringParam * SharedCreatureObjectTemplate::getStringParam(const char *name, boo } else return SharedTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedCreatureObjectTemplate::getStringParam StringIdParam * SharedCreatureObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -528,12 +528,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp index 3f651ac8..9c18023d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp @@ -47,7 +47,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); } @@ -56,7 +56,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); } @@ -108,10 +108,10 @@ Tag SharedDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -140,9 +140,9 @@ StringParam * SharedDraftSchematicObjectTemplate::getStringParam(const char *nam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_craftedSharedTemplate; } @@ -150,7 +150,7 @@ StringParam * SharedDraftSchematicObjectTemplate::getStringParam(const char *nam } else return SharedIntangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::getStringParam StringIdParam * SharedDraftSchematicObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -196,7 +196,7 @@ StructParamOT * SharedDraftSchematicObjectTemplate::getStructParamOT(const char } else return SharedIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::getStructParamOT TriggerVolumeParam * SharedDraftSchematicObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -294,12 +294,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -327,7 +327,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_slots.clear(); m_slotsAppend = file.read_bool8(); @@ -346,7 +346,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_attributes.clear(); m_attributesAppend = file.read_bool8(); @@ -512,9 +512,9 @@ StringParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_hardpoint; } @@ -522,7 +522,7 @@ StringParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringPara } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringParam StringIdParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringIdParam(const char *name, bool deepCheck, int index) @@ -533,9 +533,9 @@ StringIdParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringId { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -543,7 +543,7 @@ StringIdParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringId } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::_IngredientSlot::getStringIdParam VectorParam * SharedDraftSchematicObjectTemplate::_IngredientSlot::getVectorParam(const char *name, bool deepCheck, int index) @@ -717,9 +717,9 @@ CompilerIntegerParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute:: { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_value; } @@ -727,7 +727,7 @@ CompilerIntegerParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute:: } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::_SchematicAttribute::getCompilerIntegerParam FloatParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute::getFloatParam(const char *name, bool deepCheck, int index) @@ -753,9 +753,9 @@ StringIdParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute::getStri { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_name; } @@ -767,9 +767,9 @@ StringIdParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute::getStri { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_experiment; } @@ -777,7 +777,7 @@ StringIdParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute::getStri } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedDraftSchematicObjectTemplate::_SchematicAttribute::getStringIdParam VectorParam * SharedDraftSchematicObjectTemplate::_SchematicAttribute::getVectorParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp index e917394d..3088f935 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedFactoryObjectTemplate::getTemplateVersion(void) const */ Tag SharedFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedFactoryObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp index a5bb8830..6eecfb9e 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedGroupObjectTemplate::getTemplateVersion(void) const */ Tag SharedGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGroupObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp index 26ba6d9a..be710a73 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedGuildObjectTemplate::getTemplateVersion(void) const */ Tag SharedGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGuildObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp index 70ae2f01..3b396c5a 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedInstallationObjectTemplate::getTemplateVersion(void) const */ Tag SharedInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedInstallationObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp index 67245c19..077b284d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedIntangibleObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp index 0cce8f75..66b0ddfa 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag SharedJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedJediManagerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp index 3b860316..e1fa62c8 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp index f52ed728..23330fc7 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedMissionObjectTemplate::getTemplateVersion(void) const */ Tag SharedMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedMissionObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp index ea1fa149..250ddd5c 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedObjectTemplate::getTemplateVersion(void) const */ Tag SharedObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * SharedObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_containerType; } @@ -117,9 +117,9 @@ CompilerIntegerParam * SharedObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_containerVolumeLimit; } @@ -131,9 +131,9 @@ CompilerIntegerParam * SharedObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_gameObjectType; } @@ -145,9 +145,9 @@ CompilerIntegerParam * SharedObjectTemplate::getCompilerIntegerParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_surfaceType; } @@ -155,7 +155,7 @@ CompilerIntegerParam * SharedObjectTemplate::getCompilerIntegerParam(const char } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedObjectTemplate::getCompilerIntegerParam FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -166,9 +166,9 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_scale; } @@ -180,9 +180,9 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_scaleThresholdBeforeExtentTest; } @@ -194,9 +194,9 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_clearFloraRadius; } @@ -208,9 +208,9 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_noBuildRadius; } @@ -222,9 +222,9 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_locationReservationRadius; } @@ -232,7 +232,7 @@ FloatParam * SharedObjectTemplate::getFloatParam(const char *name, bool deepChec } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedObjectTemplate::getFloatParam BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -243,9 +243,9 @@ BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_snapToTerrain; } @@ -257,9 +257,9 @@ BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_sendToClient; } @@ -271,9 +271,9 @@ BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_onlyVisibleInTools; } @@ -285,9 +285,9 @@ BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_forceNoCollision; } @@ -295,7 +295,7 @@ BoolParam * SharedObjectTemplate::getBoolParam(const char *name, bool deepCheck, } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedObjectTemplate::getBoolParam StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -306,9 +306,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_tintPalette; } @@ -320,9 +320,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_slotDescriptorFilename; } @@ -334,9 +334,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_arrangementDescriptorFilename; } @@ -348,9 +348,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_appearanceFilename; } @@ -362,9 +362,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_portalLayoutFilename; } @@ -376,9 +376,9 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_clientDataFile; } @@ -386,7 +386,7 @@ StringParam * SharedObjectTemplate::getStringParam(const char *name, bool deepCh } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedObjectTemplate::getStringParam StringIdParam * SharedObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -397,9 +397,9 @@ StringIdParam * SharedObjectTemplate::getStringIdParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_objectName; } @@ -411,9 +411,9 @@ StringIdParam * SharedObjectTemplate::getStringIdParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_detailedDescription; } @@ -425,9 +425,9 @@ StringIdParam * SharedObjectTemplate::getStringIdParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_lookAtText; } @@ -435,7 +435,7 @@ StringIdParam * SharedObjectTemplate::getStringIdParam(const char *name, bool de } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedObjectTemplate::getStringIdParam VectorParam * SharedObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) @@ -513,12 +513,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp index b926fbb4..5d99e4c9 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedPlayerObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp index b9ed644e..f3b04e88 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp @@ -87,10 +87,10 @@ Tag SharedPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerQuestObjectTemplate::getHighestTemplateVersion @@ -196,12 +196,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp index e77a29d6..3ea96d3d 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag SharedResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedResourceContainerObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp index 25f8f375..d7705d97 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedShipObjectTemplate::getTemplateVersion(void) const */ Tag SharedShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedShipObjectTemplate::getHighestTemplateVersion @@ -113,9 +113,9 @@ BoolParam * SharedShipObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_hasWings; } @@ -127,9 +127,9 @@ BoolParam * SharedShipObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_playerControlled; } @@ -137,7 +137,7 @@ BoolParam * SharedShipObjectTemplate::getBoolParam(const char *name, bool deepCh } else return SharedTangibleObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedShipObjectTemplate::getBoolParam StringParam * SharedShipObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -148,9 +148,9 @@ StringParam * SharedShipObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_cockpitFilename; } @@ -162,9 +162,9 @@ StringParam * SharedShipObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_interiorLayoutFileName; } @@ -172,7 +172,7 @@ StringParam * SharedShipObjectTemplate::getStringParam(const char *name, bool de } else return SharedTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedShipObjectTemplate::getStringParam StringIdParam * SharedShipObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -255,12 +255,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp index 630e8239..19de68be 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedStaticObjectTemplate::getTemplateVersion(void) const */ Tag SharedStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedStaticObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp index 3157fb24..10a66071 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp @@ -55,7 +55,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_paletteColorCustomizationVariables.clear(); } @@ -64,7 +64,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_rangedIntCustomizationVariables.begin(); iter != m_rangedIntCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_rangedIntCustomizationVariables.clear(); } @@ -73,7 +73,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_constStringCustomizationVariables.begin(); iter != m_constStringCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_constStringCustomizationVariables.clear(); } @@ -82,7 +82,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_socketDestinations.begin(); iter != m_socketDestinations.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_socketDestinations.clear(); } @@ -91,7 +91,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_certificationsRequired.begin(); iter != m_certificationsRequired.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_certificationsRequired.clear(); } @@ -100,7 +100,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() for (iter = m_customizationVariableMapping.begin(); iter != m_customizationVariableMapping.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_customizationVariableMapping.clear(); } @@ -152,10 +152,10 @@ Tag SharedTangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTangibleObjectTemplate::getHighestTemplateVersion @@ -181,9 +181,9 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::getCompilerIntegerParam(con { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_clientVisabilityFlag; } @@ -191,7 +191,7 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::getCompilerIntegerParam(con } else return SharedObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::getCompilerIntegerParam FloatParam * SharedTangibleObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -207,9 +207,9 @@ BoolParam * SharedTangibleObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_useStructureFootprintOutline; } @@ -221,9 +221,9 @@ BoolParam * SharedTangibleObjectTemplate::getBoolParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_targetable; } @@ -231,7 +231,7 @@ BoolParam * SharedTangibleObjectTemplate::getBoolParam(const char *name, bool de } else return SharedObjectTemplate::getBoolParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::getBoolParam StringParam * SharedTangibleObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -242,9 +242,9 @@ StringParam * SharedTangibleObjectTemplate::getStringParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_structureFootprintFileName; } @@ -264,7 +264,7 @@ StringParam * SharedTangibleObjectTemplate::getStringParam(const char *name, boo } else return SharedObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::getStringParam StringIdParam * SharedTangibleObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -334,7 +334,7 @@ StructParamOT * SharedTangibleObjectTemplate::getStructParamOT(const char *name, } else return SharedObjectTemplate::getStructParamOT(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::getStructParamOT TriggerVolumeParam * SharedTangibleObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -488,12 +488,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } @@ -521,7 +521,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_paletteColorCustomizationVariables.clear(); m_paletteColorCustomizationVariablesAppend = file.read_bool8(); @@ -540,7 +540,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_rangedIntCustomizationVariables.begin(); iter != m_rangedIntCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_rangedIntCustomizationVariables.clear(); m_rangedIntCustomizationVariablesAppend = file.read_bool8(); @@ -559,7 +559,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_constStringCustomizationVariables.begin(); iter != m_constStringCustomizationVariables.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_constStringCustomizationVariables.clear(); m_constStringCustomizationVariablesAppend = file.read_bool8(); @@ -578,7 +578,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_socketDestinations.begin(); iter != m_socketDestinations.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_socketDestinations.clear(); m_socketDestinationsAppend = file.read_bool8(); @@ -603,7 +603,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_certificationsRequired.begin(); iter != m_certificationsRequired.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_certificationsRequired.clear(); m_certificationsRequiredAppend = file.read_bool8(); @@ -622,7 +622,7 @@ char paramName[MAX_NAME_SIZE]; for (iter = m_customizationVariableMapping.begin(); iter != m_customizationVariableMapping.end(); ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } m_customizationVariableMapping.clear(); m_customizationVariableMappingAppend = file.read_bool8(); @@ -866,9 +866,9 @@ StringParam * SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::g { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_variableName; } @@ -880,9 +880,9 @@ StringParam * SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::g { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_constValue; } @@ -890,7 +890,7 @@ StringParam * SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::g } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getStringParam StringIdParam * SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1084,9 +1084,9 @@ StringParam * SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_sourceVariable; } @@ -1098,9 +1098,9 @@ StringParam * SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSt { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_dependentVariable; } @@ -1108,7 +1108,7 @@ StringParam * SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSt } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_CustomizationVariableMapping::getStringParam StringIdParam * SharedTangibleObjectTemplate::_CustomizationVariableMapping::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1287,9 +1287,9 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationV { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_defaultPaletteIndex; } @@ -1297,7 +1297,7 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationV } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getCompilerIntegerParam FloatParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getFloatParam(const char *name, bool deepCheck, int index) @@ -1318,9 +1318,9 @@ StringParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable:: { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_variableName; } @@ -1332,9 +1332,9 @@ StringParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable:: { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_palettePathName; } @@ -1342,7 +1342,7 @@ StringParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable:: } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getStringParam StringIdParam * SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1529,9 +1529,9 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVari { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_minValueInclusive; } @@ -1543,9 +1543,9 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVari { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_defaultValue; } @@ -1557,9 +1557,9 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVari { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxValueExclusive; } @@ -1567,7 +1567,7 @@ CompilerIntegerParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVari } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getCompilerIntegerParam FloatParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getFloatParam(const char *name, bool deepCheck, int index) @@ -1588,9 +1588,9 @@ StringParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::get { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_variableName; } @@ -1598,7 +1598,7 @@ StringParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::get } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getStringParam StringIdParam * SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getStringIdParam(const char *name, bool deepCheck, int index) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp index 2eb61bd9..aeaeff99 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedTerrainSurfaceObjectTemplate::getTemplateVersion(void) const */ Tag SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedTerrainSurfaceObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion @@ -108,9 +108,9 @@ FloatParam * SharedTerrainSurfaceObjectTemplate::getFloatParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_cover; } @@ -118,7 +118,7 @@ FloatParam * SharedTerrainSurfaceObjectTemplate::getFloatParam(const char *name, } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTerrainSurfaceObjectTemplate::getFloatParam BoolParam * SharedTerrainSurfaceObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -134,9 +134,9 @@ StringParam * SharedTerrainSurfaceObjectTemplate::getStringParam(const char *nam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_surfaceType; } @@ -144,7 +144,7 @@ StringParam * SharedTerrainSurfaceObjectTemplate::getStringParam(const char *nam } else return TpfTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedTerrainSurfaceObjectTemplate::getStringParam StringIdParam * SharedTerrainSurfaceObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -227,12 +227,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp index cf352144..03f9ec94 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedTokenObjectTemplate::getTemplateVersion(void) const */ Tag SharedTokenObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedTokenObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTokenObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp index 62685a52..d429becf 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedUniverseObjectTemplate::getTemplateVersion(void) const */ Tag SharedUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedUniverseObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp index ffa28bfb..b1f83b74 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedVehicleObjectTemplate::getTemplateVersion(void) const */ Tag SharedVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedVehicleObjectTemplate::getHighestTemplateVersion @@ -108,9 +108,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_speed[index]; } @@ -122,9 +122,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_slopeAversion; } @@ -136,9 +136,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_hoverValue; } @@ -150,9 +150,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_turnRate; } @@ -164,9 +164,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_maxVelocity; } @@ -178,9 +178,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_acceleration; } @@ -192,9 +192,9 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_braking; } @@ -202,7 +202,7 @@ FloatParam * SharedVehicleObjectTemplate::getFloatParam(const char *name, bool d } else return SharedTangibleObjectTemplate::getFloatParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedVehicleObjectTemplate::getFloatParam BoolParam * SharedVehicleObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -300,12 +300,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp index b845d576..69ad3053 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedWaypointObjectTemplate::getTemplateVersion(void) const */ Tag SharedWaypointObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedWaypointObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWaypointObjectTemplate::getHighestTemplateVersion @@ -195,12 +195,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp index b6bf3e51..690d160e 100755 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp @@ -86,10 +86,10 @@ Tag SharedWeaponObjectTemplate::getTemplateVersion(void) const */ Tag SharedWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const SharedWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWeaponObjectTemplate::getHighestTemplateVersion @@ -103,9 +103,9 @@ CompilerIntegerParam * SharedWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_weaponEffectIndex; } @@ -117,9 +117,9 @@ CompilerIntegerParam * SharedWeaponObjectTemplate::getCompilerIntegerParam(const { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_attackType; } @@ -127,7 +127,7 @@ CompilerIntegerParam * SharedWeaponObjectTemplate::getCompilerIntegerParam(const } else return SharedTangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedWeaponObjectTemplate::getCompilerIntegerParam FloatParam * SharedWeaponObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -148,9 +148,9 @@ StringParam * SharedWeaponObjectTemplate::getStringParam(const char *name, bool { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != NULL) + if (getBaseTemplate() != nullptr) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } return &m_weaponEffect; } @@ -158,7 +158,7 @@ StringParam * SharedWeaponObjectTemplate::getStringParam(const char *name, bool } else return SharedTangibleObjectTemplate::getStringParam(name, deepCheck, index); - return NULL; + return nullptr; } //SharedWeaponObjectTemplate::getStringParam StringIdParam * SharedWeaponObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -241,12 +241,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp index d3b0322d..07755d95 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp @@ -19,7 +19,7 @@ // File static variables Filename File::m_basePath; -File::FunctionPtr File::m_callBack = NULL; +File::FunctionPtr File::m_callBack = nullptr; //======================================================================== // File functions @@ -49,7 +49,7 @@ bool File::open(const char *filename, const char *mode) // @todo: find an equivalent function for Linux m_fp = fopen(m_filename, mode); #endif - if (m_fp != NULL) + if (m_fp != nullptr) { m_currentLine = 0; return true; @@ -57,7 +57,7 @@ bool File::open(const char *filename, const char *mode) else { const char * errstr = strerror(errno); - if (errstr != NULL) + if (errstr != nullptr) { m_filename.clear(); printError(errstr); @@ -75,7 +75,7 @@ bool File::open(const char *filename, const char *mode) */ bool File::exists(const char *filename) { - if (filename == NULL) + if (filename == nullptr) return false; #if defined(WIN32) @@ -110,7 +110,7 @@ int File::readRawLine(char *buffer, int bufferSize) NOT_NULL(buffer); ++m_currentLine; - if (fgets(buffer, bufferSize, m_fp) == NULL) + if (fgets(buffer, bufferSize, m_fp) == nullptr) { if (feof(m_fp)) return -1; @@ -149,7 +149,7 @@ int File::readLine(char *buffer, int bufferSize) for (;;) { ++m_currentLine; - if (fgets(buffer, bufferSize, m_fp) == NULL) + if (fgets(buffer, bufferSize, m_fp) == nullptr) { if (feof(m_fp)) return -1; diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h index b8f655e6..c2292615 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h @@ -54,13 +54,13 @@ private: inline File::File(void) : - m_fp(NULL), + m_fp(nullptr), m_currentLine(0) { } // File::File(void) inline File::File(const char *filename, const char *mode) : - m_fp(NULL), + m_fp(nullptr), m_currentLine(0) { open(filename, mode); @@ -83,15 +83,15 @@ inline const Filename & File::getFilename(void) const inline bool File::isOpened(void) const { - return (m_fp != NULL); + return (m_fp != nullptr); } // File::isOpened inline void File::close(void) { - if (m_fp != NULL) + if (m_fp != nullptr) { fclose(m_fp); - m_fp = NULL; + m_fp = nullptr; } } // File::close @@ -110,7 +110,7 @@ inline void File::printWarning(const char *buffer) const fprintf(stderr, "%s", error); - if (m_callBack != NULL) + if (m_callBack != nullptr) { m_callBack(error); } @@ -125,7 +125,7 @@ inline void File::printError(const char *buffer) const fprintf(stderr, "%s", error); - if (m_callBack != NULL) + if (m_callBack != nullptr) { m_callBack(error); } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp index 82d85bfa..1f329c77 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp @@ -39,7 +39,7 @@ const char PATH_SEPARATOR = LINUX_PATH_SEPARATOR; */ void Filename::setPath(const char *path) { - if (path == NULL || *path == '\0') + if (path == nullptr || *path == '\0') m_path.clear(); else { @@ -69,7 +69,7 @@ void Filename::setPath(const char *path) */ void Filename::setName(const char *name) { - if (name == NULL || *name == '\0') + if (name == nullptr || *name == '\0') m_name.clear(); else { @@ -85,7 +85,7 @@ void Filename::setName(const char *name) const char *dot = strrchr(localname.c_str(), '.'); const char *firstSeparator = strchr(localname.c_str(), PATH_SEPARATOR); const char *lastSeparator = strrchr(localname.c_str(), PATH_SEPARATOR); - if (firstSeparator != NULL) + if (firstSeparator != nullptr) { // name has a path if (firstSeparator == localname) @@ -100,11 +100,11 @@ void Filename::setName(const char *name) localname.c_str() + 1); } } - if (dot != NULL && (lastSeparator == NULL || dot > lastSeparator)) + if (dot != nullptr && (lastSeparator == nullptr || dot > lastSeparator)) { // name has an extension setExtension(dot); - if (lastSeparator == NULL) + if (lastSeparator == nullptr) m_name = std::string(localname.c_str(), dot - localname.c_str()); else m_name = std::string(lastSeparator + 1, dot - (lastSeparator + 1)); @@ -112,7 +112,7 @@ void Filename::setName(const char *name) else { // name doesn't have an extension - if (lastSeparator == NULL) + if (lastSeparator == nullptr) m_name = localname; else m_name = std::string(lastSeparator + 1); @@ -129,7 +129,7 @@ void Filename::setName(const char *name) */ void Filename::setExtension(const char *extension) { - if (extension == NULL || *extension == '\0') + if (extension == nullptr || *extension == '\0') m_extension.clear(); else { @@ -253,7 +253,7 @@ static const std::string PATH_SEPARATOR_STRING(PATH_SEPARATOR_BUFF); */ void Filename::setDrive(const char *drive) { - if (drive != NULL && isalpha(*drive)) + if (drive != nullptr && isalpha(*drive)) m_drive = std::string(drive, 1) + ":"; else m_drive.clear(); @@ -273,7 +273,7 @@ std::string path; #if defined(WIN32) char *pathBuf; - DWORD bufsize = GetFullPathName(getFullFilename().c_str(), 0, NULL, NULL); + DWORD bufsize = GetFullPathName(getFullFilename().c_str(), 0, nullptr, nullptr); if (bufsize != 0) { pathBuf = new char[bufsize + 1]; @@ -285,7 +285,7 @@ std::string path; } #elif defined(linux) char pathBuf[PATH_MAX]; - if (getcwd(pathBuf, PATH_MAX) != NULL) + if (getcwd(pathBuf, PATH_MAX) != nullptr) { strcat(pathBuf, "/"); strcat(pathBuf, getFullFilename().c_str()); @@ -306,19 +306,19 @@ void Filename::verifyAndCreatePath(void) const #if defined(WIN32) if (WindowsUnicode) { - char *buffer = NULL; + char *buffer = nullptr; DWORD buflen; // get our current path - buflen = GetFullPathName(".", 0, buffer, NULL); + buflen = GetFullPathName(".", 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(".", buflen + 1, buffer, NULL); + buflen = GetFullPathName(".", buflen + 1, buffer, nullptr); Unicode::String srcPath = Unicode::narrowToWide(buffer); delete[] buffer; // get the destination path std::string correctPath(getDrive() + getPath()); - buflen = GetFullPathName(correctPath.c_str(), 0, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, nullptr); Unicode::String destPath = Unicode::narrowToWide(buffer); delete[] buffer; @@ -335,7 +335,7 @@ void Filename::verifyAndCreatePath(void) const destPath += splitDestPath[i]; if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) { - if (CreateDirectoryW((LPCWSTR)destPath.c_str(), NULL) == 0) + if (CreateDirectoryW((LPCWSTR)destPath.c_str(), nullptr) == 0) return; if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) return; @@ -347,19 +347,19 @@ void Filename::verifyAndCreatePath(void) const } else { - char *buffer = NULL; + char *buffer = nullptr; DWORD buflen; // get our current path - buflen = GetFullPathName(".", 0, buffer, NULL); + buflen = GetFullPathName(".", 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(".", buflen + 1, buffer, NULL); + buflen = GetFullPathName(".", buflen + 1, buffer, nullptr); std::string srcPath = buffer; delete[] buffer; // get the destination path std::string correctPath(getDrive() + getPath()); - buflen = GetFullPathName(correctPath.c_str(), 0, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, nullptr); std::string destPath = buffer; delete[] buffer; @@ -378,7 +378,7 @@ void Filename::verifyAndCreatePath(void) const destPath += splitDestPath[i]; if (SetCurrentDirectory(destPath.c_str()) == 0) { - if (CreateDirectory(destPath.c_str(), NULL) == 0) + if (CreateDirectory(destPath.c_str(), nullptr) == 0) return; if (SetCurrentDirectory(destPath.c_str()) == 0) return; diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.h b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.h index 62466a7a..a947e70d 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.h +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.h @@ -57,13 +57,13 @@ inline Filename::Filename(void) inline Filename::Filename(const char *drive, const char *path, const char *name, const char *extension) { - if (drive != NULL) + if (drive != nullptr) setDrive(drive); - if (path != NULL) + if (path != nullptr) setPath(path); - if (name != NULL) + if (name != nullptr) setName(name); - if (extension != NULL) + if (extension != nullptr) setExtension(extension); } // Filename::Filename @@ -115,7 +115,7 @@ inline void Filename::makeFullPath(void) //======================================================================== -const Filename NEXT_HIGHER_PATH(NULL, "..", NULL, NULL); +const Filename NEXT_HIGHER_PATH(nullptr, "..", nullptr, nullptr); #endif // _INCLUDED_Filename_H diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.cpp index 42def7d2..5492f6ec 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/ObjectTemplate.cpp @@ -16,8 +16,8 @@ //----------------------------------------------------------------- -template <> ObjectTemplateList::CreateDataResourceMap *ObjectTemplateList::ms_bindings = NULL; -template <> ObjectTemplateList::LoadedDataResourceMap *ObjectTemplateList::ms_loaded = NULL; +template <> ObjectTemplateList::CreateDataResourceMap *ObjectTemplateList::ms_bindings = nullptr; +template <> ObjectTemplateList::LoadedDataResourceMap *ObjectTemplateList::ms_loaded = nullptr; // ====================================================================== @@ -40,10 +40,10 @@ ObjectTemplate::ObjectTemplate(const std::string & filename) : ObjectTemplate::~ObjectTemplate(void) { - if (m_baseData != NULL) + if (m_baseData != nullptr) { m_baseData->releaseReference(); - m_baseData = NULL; + m_baseData = nullptr; } } @@ -63,7 +63,7 @@ void ObjectTemplate::load(Iff &iff) */ void ObjectTemplate::addReference(void) const { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->addReference(); DataResource::addReference(); @@ -76,7 +76,7 @@ void ObjectTemplate::addReference(void) const */ void ObjectTemplate::releaseReference(void) const { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); DataResource::releaseReference(); diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp index a5974767..335347bc 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp @@ -52,8 +52,8 @@ static const bool HasMinMax[] = // map enum ParamType to access function return value static const char * const PaddedDataMethodNames[] = { - NULL, - NULL, + nullptr, + nullptr, "int ", "float ", "bool ", @@ -62,25 +62,25 @@ static const char * const PaddedDataMethodNames[] = "const Vector & ", "void ", "const ObjectTemplate *", - NULL, - NULL, + nullptr, + nullptr, "const TriggerVolumeData &", "const std::string & " }; static const char * const UnpaddedDataMethodNames[] = { - NULL, - NULL, + nullptr, + nullptr, "int", "float", "bool", "const std::string &", "const StringId", "const Vector &", - NULL, + nullptr, "const ObjectTemplate *", - NULL, - NULL, + nullptr, + nullptr, "const TriggerVolumeData &", "const std::string &" }; @@ -88,8 +88,8 @@ static const char * const UnpaddedDataMethodNames[] = // map enum ParamType to struct storage type static const char * const PaddedDataStructNames[] = { - NULL, - NULL, + nullptr, + nullptr, "int ", "float ", "bool ", @@ -98,15 +98,15 @@ static const char * const PaddedDataStructNames[] = "Vector ", "DynamicVariableList ", "const ObjectTemplate *", - NULL, - NULL, + nullptr, + nullptr, "TriggerVolumeData ", "std::string " }; static const char * const UnpaddedDataStructNames[] = { - NULL, - NULL, + nullptr, + nullptr, "int", "float", "bool", @@ -115,8 +115,8 @@ static const char * const UnpaddedDataStructNames[] = "Vector", "DynamicVariableList", "const ObjectTemplate *", - NULL, - NULL, + nullptr, + nullptr, "TriggerVolumeData", "std::string" }; @@ -160,8 +160,8 @@ static const char * const CompilerDataVariableNames[] = static const char * const DefaultDataReturnValue[] = { - NULL, - NULL, + nullptr, + nullptr, "0", "0.0f", "false", @@ -169,7 +169,7 @@ static const char * const DefaultDataReturnValue[] = "DefaultStringId", "DefaultVector", "", - "NULL", + "nullptr", "(0)", "", "DefaultTriggerVolumeData", @@ -217,7 +217,7 @@ static const char * const EnumLocationNames[] = */ TemplateData::TemplateData(int version, const TemplateDefinitionFile &parent) : m_fileParent(&parent), - m_templateParent(NULL), + m_templateParent(nullptr), m_hasTemplateParam(false), m_hasDynamicVarParam(false), m_hasList(false), @@ -228,9 +228,9 @@ TemplateData::TemplateData(int version, const TemplateDefinitionFile &parent) : m_parseState(STATE_PARAM), m_parameters(), m_parameterMap(), - m_currentEnumList(NULL), + m_currentEnumList(nullptr), m_enumMap(), - m_currentStruct(NULL), + m_currentStruct(nullptr), m_structMap(), m_structList() { @@ -252,7 +252,7 @@ TemplateData::TemplateData(int version, const TemplateDefinitionFile &parent) : * @param name the structure's name */ TemplateData::TemplateData(const TemplateData *parent, const std::string &name) : - m_fileParent(NULL), + m_fileParent(nullptr), m_templateParent(parent), m_hasTemplateParam(false), m_hasDynamicVarParam(false), @@ -265,9 +265,9 @@ TemplateData::TemplateData(const TemplateData *parent, const std::string &name) m_parseState(STATE_PARAM), m_parameters(), m_parameterMap(), - m_currentEnumList(NULL), + m_currentEnumList(nullptr), m_enumMap(), - m_currentStruct(NULL), + m_currentStruct(nullptr), m_structMap(), m_structList() { @@ -284,15 +284,15 @@ TemplateData::~TemplateData() for (iter = m_structMap.begin(); iter != m_structMap.end(); ++iter) { delete (*iter).second; - (*iter).second = NULL; + (*iter).second = nullptr; } m_parameterMap.clear(); m_parameters.clear(); m_structMap.clear(); m_structList.clear(); - m_currentEnumList = NULL; - m_currentStruct = NULL; + m_currentEnumList = nullptr; + m_currentStruct = nullptr; } // TemplateData::~TemplateData @@ -306,9 +306,9 @@ TemplateData::~TemplateData() */ const std::string TemplateData::getName(void) const { - if (m_fileParent != NULL) + if (m_fileParent != nullptr) return m_fileParent->getTemplateName(); - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getName() + "::_" + m_name; return ""; } @@ -320,9 +320,9 @@ const std::string TemplateData::getName(void) const */ const std::string TemplateData::getBaseName(void) const { - if (m_fileParent != NULL && !m_fileParent->getBaseName().empty()) + if (m_fileParent != nullptr && !m_fileParent->getBaseName().empty()) return m_fileParent->getBaseName(); -// if (m_templateParent != NULL) +// if (m_templateParent != nullptr) return m_baseName; // return ""; } @@ -334,9 +334,9 @@ const std::string TemplateData::getBaseName(void) const */ TemplateLocation TemplateData::getTemplateLocation(void) const { - if (m_fileParent != NULL) + if (m_fileParent != nullptr) return m_fileParent->getTemplateLocation(); - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getTemplateLocation(); return LOC_NONE; } // TemplateData::getTemplateLocation @@ -359,8 +359,8 @@ const char * TemplateData::parseLine(const File &fp, const char *buffer, { ParamState paramState = STATE_LIST; - if (buffer == NULL || *buffer == '\0') - return NULL; + if (buffer == nullptr || *buffer == '\0') + return nullptr; const char *line = buffer; @@ -413,7 +413,7 @@ ParamState paramState = STATE_LIST; return CHAR_ERROR; } const EnumList * enumList = getEnumList(tokenbuf, true); - if (enumList != NULL) + if (enumList != nullptr) { fp.printError("enum already defined"); return CHAR_ERROR; @@ -421,7 +421,7 @@ ParamState paramState = STATE_LIST; m_currentEnumList = &(*m_enumMap.insert(std::make_pair( std::string(tokenbuf), EnumList())).first).second; m_parseState = STATE_ENUM; - if (line != NULL && *line != '\0') + if (line != nullptr && *line != '\0') return parseEnum(fp, line, tokenbuf); return line; } @@ -455,7 +455,7 @@ ParamState paramState = STATE_LIST; m_structMap.insert(std::make_pair(tokenbuf, m_currentStruct)); m_structList.push_back(m_currentStruct); m_parseState = STATE_STRUCT; - if (line != NULL && *line != '\0') + if (line != nullptr && *line != '\0') return parseStruct(fp, line, tokenbuf); return line; } @@ -463,7 +463,7 @@ ParamState paramState = STATE_LIST; return CHAR_ERROR; } // if we are a structure, the 1st item should be the structure id - else if (strcmp(tokenbuf, "id") == 0 && m_templateParent != NULL && + else if (strcmp(tokenbuf, "id") == 0 && m_templateParent != nullptr && m_structId.tag == NO_TAG) { line = getNextToken(line, tokenbuf); @@ -479,7 +479,7 @@ ParamState paramState = STATE_LIST; } // if we are a structure, the 1st item should be the structure id - if (m_templateParent != NULL && m_structId.tag == NO_TAG) + if (m_templateParent != nullptr && m_structId.tag == NO_TAG) { fp.printError("struct id not defined"); return CHAR_ERROR; @@ -508,7 +508,7 @@ ParamState paramState = STATE_LIST; parameter.list_type = LIST_ENUM_ARRAY; parameter.enum_list_name = &tokenbuf[8]; const EnumList * list = getEnumList(parameter.enum_list_name.c_str(), false); - if (list == NULL) + if (list == nullptr) { fp.printError("enum name not defined!"); return CHAR_ERROR; @@ -592,7 +592,7 @@ ParamState paramState = STATE_LIST; { parameter.type = TYPE_ENUM; parameter.extendedName = &tokenbuf[4]; - if (getEnumList(&tokenbuf[4], false) == NULL) + if (getEnumList(&tokenbuf[4], false) == nullptr) { std::string errbuf = "enum type " + parameter.extendedName + " not defined"; @@ -605,7 +605,7 @@ ParamState paramState = STATE_LIST; { parameter.type = TYPE_STRUCT; parameter.extendedName = &tokenbuf[6]; - if (getStruct(&tokenbuf[6]) == NULL) + if (getStruct(&tokenbuf[6]) == nullptr) { std::string errbuf = "struct " + parameter.extendedName + " not defined"; @@ -640,12 +640,12 @@ ParamState paramState = STATE_LIST; tempToken = getNextToken(tempToken, tempBuf); if (parameter.type == TYPE_INTEGER) { - parameter.min_int_limit = strtol(tempBuf, NULL, 10); + parameter.min_int_limit = strtol(tempBuf, nullptr, 10); } else { parameter.min_float_limit = static_cast( - strtod(tempBuf, NULL)); + strtod(tempBuf, nullptr)); } } if (*tempToken == '.' && *(tempToken + 1) == '.') @@ -682,7 +682,7 @@ ParamState paramState = STATE_LIST; } // anything left over in the line is the parameter description - if (line != NULL) + if (line != nullptr) parameter.description = line; m_parameters.push_back(parameter); @@ -714,12 +714,12 @@ int TemplateData::getEnumValue(const char * enumValue) const } } - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getEnumValue(enumValue); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { const TemplateDefinitionFile * baseFile = m_fileParent->getBaseDefinitionFile(); - if (baseFile != NULL) + if (baseFile != nullptr) { return baseFile->getTemplateData(baseFile->getHighestVersion())-> getEnumValue(enumValue); @@ -742,7 +742,7 @@ int TemplateData::getEnumValue(const std::string & enumType, NOT_NULL(enumValue); const EnumList *elist = getEnumList(enumType.c_str(), false); - if (elist == NULL) + if (elist == nullptr) return INVALID_ENUM_RESULT; EnumList::const_iterator listIter; for (listIter = elist->begin(); listIter != elist->end(); ++listIter) @@ -760,7 +760,7 @@ int TemplateData::getEnumValue(const std::string & enumType, * @param name the enum list name * @param define flag that we are defining templates and should not look in base templates * - * @return the enum list definition, or NULL if not found + * @return the enum list definition, or nullptr if not found */ const TemplateData::EnumList * TemplateData::getEnumList(const std::string & name, bool define) const @@ -768,17 +768,17 @@ const TemplateData::EnumList * TemplateData::getEnumList(const std::string & nam EnumMap::const_iterator iter = m_enumMap.find(name); if (iter != m_enumMap.end()) return &(*iter).second; - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getEnumList(name, define); - if (!define && m_fileParent != NULL && m_fileParent->getBaseDefinitionFile() != NULL) + if (!define && m_fileParent != nullptr && m_fileParent->getBaseDefinitionFile() != nullptr) { const TemplateData * baseData = m_fileParent->getBaseDefinitionFile()-> getTemplateData(m_fileParent->getBaseDefinitionFile()-> getHighestVersion()); - if (baseData != NULL) + if (baseData != nullptr) return baseData->getEnumList(name, define); } - return NULL; + return nullptr; } // TemplateData::getEnumList /** @@ -787,7 +787,7 @@ const TemplateData::EnumList * TemplateData::getEnumList(const std::string & nam * * @param name the enum list name * - * @return the struct definition, or NULL if not found + * @return the struct definition, or nullptr if not found */ const TemplateData * TemplateData::getStruct(const char *name) const { @@ -796,23 +796,23 @@ const TemplateData * TemplateData::getStruct(const char *name) const StructMap::const_iterator iter = m_structMap.find(name); if (iter != m_structMap.end()) return (*iter).second; - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getStruct(name); - if (m_fileParent != NULL && m_fileParent->getBaseDefinitionFile() != NULL) + if (m_fileParent != nullptr && m_fileParent->getBaseDefinitionFile() != nullptr) { const TemplateData * baseData = m_fileParent->getBaseDefinitionFile()-> getTemplateData(m_fileParent->getBaseDefinitionFile()-> getHighestVersion()); - if (baseData != NULL) + if (baseData != nullptr) return baseData->getStruct(name); } - return NULL; + return nullptr; } // TemplateData::getStruct /** * Returns the tdf file for this TemplateData * - * @return the TemplateDefinitionFile, or NULL if not there + * @return the TemplateDefinitionFile, or nullptr if not there */ const TemplateDefinitionFile * TemplateData::getTdf() const @@ -823,7 +823,7 @@ const TemplateDefinitionFile * TemplateData::getTdf() const /** * Returns the tdf file for this TemplateData's first ancestor * - * @return the TemplateDefinitionFile, or NULL if not there + * @return the TemplateDefinitionFile, or nullptr if not there */ const TemplateDefinitionFile * TemplateData::getTdfParent() const @@ -834,19 +834,19 @@ const TemplateDefinitionFile * TemplateData::getTdfParent() const } else { - return NULL; + return nullptr; } } /** * Returns the tdf file that contains the parameter * - * @return the TemplateDefinitionFile, or NULL if not found + * @return the TemplateDefinitionFile, or nullptr if not found */ const TemplateDefinitionFile * TemplateData::getTdfForParameter(const char *parameterName) const { - if(m_fileParent != NULL) + if(m_fileParent != nullptr) { if(getParameter(parameterName)) { @@ -855,18 +855,18 @@ const TemplateDefinitionFile * TemplateData::getTdfForParameter(const char *para const TemplateDefinitionFile* ancestorTemplateDefinitionFile = m_fileParent->getBaseDefinitionFile(); - if(ancestorTemplateDefinitionFile != NULL) + if(ancestorTemplateDefinitionFile != nullptr) { const TemplateData *ancestorTemplateData = ancestorTemplateDefinitionFile->getTemplateData(ancestorTemplateDefinitionFile->getHighestVersion()); - if(ancestorTemplateData != NULL) + if(ancestorTemplateData != nullptr) { return ancestorTemplateData->getTdfForParameter(parameterName); } } } - return NULL; + return nullptr; } /** @@ -883,7 +883,7 @@ int TemplateData::parseIntValue(const File &fp, const char * line, const char ** char * intbuf) const { NOT_NULL(endLine); - if (line == NULL || *line == '\0' || intbuf == NULL) + if (line == nullptr || *line == '\0' || intbuf == nullptr) { fp.printError("bad value passed to TemplateData::parseIntValue"); *endLine = CHAR_ERROR; @@ -920,7 +920,7 @@ int TemplateData::parseIntValue(const File &fp, const char * line, const char ** *endLine = CHAR_ERROR; return 0; } - if (tempLine != NULL) + if (tempLine != nullptr) line = tempLine; else line += strlen(line); @@ -954,8 +954,8 @@ int TemplateData::parseIntValue(const File &fp, const char * line, const char ** strncpy(intbuf, startLine, line - startLine); intbuf[line - startLine] = '\0'; intbuf += strlen(intbuf); - if (line != NULL && *line == '\0') - *endLine = NULL; + if (line != nullptr && *line == '\0') + *endLine = nullptr; else *endLine = line; @@ -1010,7 +1010,7 @@ const char * TemplateData::parseEnum(const File &fp, const char *buffer, if (m_bracketCount == 1) { m_bracketCount = 0; - m_currentEnumList = NULL; + m_currentEnumList = nullptr; m_parseState = STATE_PARAM; return line; } @@ -1023,7 +1023,7 @@ const char * TemplateData::parseEnum(const File &fp, const char *buffer, EnumData enumData; enumData.name = tokenbuf; - if (line != NULL && *line == '=') + if (line != nullptr && *line == '=') { line = getNextToken(line, tokenbuf); @@ -1054,12 +1054,12 @@ const char * TemplateData::parseEnum(const File &fp, const char *buffer, enumData.value = m_currentEnumList->back().value + 1; } - if (line != NULL && *line == ',') + if (line != nullptr && *line == ',') line = getNextToken(line, tokenbuf); - if (line != NULL) + if (line != nullptr) { enumData.comment = line; - line = NULL; + line = nullptr; } m_currentEnumList->push_back(enumData); @@ -1103,7 +1103,7 @@ const char * TemplateData::parseStruct(const File &fp, const char *buffer, if (m_bracketCount == 1) { m_bracketCount = 0; - m_currentStruct = NULL; + m_currentStruct = nullptr; m_parseState = STATE_PARAM; return line; } @@ -1194,7 +1194,7 @@ char buffer[256]; else if (param.list_type == LIST_ENUM_ARRAY) { const EnumList * enumList = getEnumList(param.enum_list_name, false); - FATAL(enumList == NULL, ("Enum list %s missing", + FATAL(enumList == nullptr, ("Enum list %s missing", param.enum_list_name.c_str())); sprintf(buffer, "missing parameter %s[%s] from section " "@class %s", param.name.c_str(), enumList->at(i).name.c_str(), @@ -1280,10 +1280,10 @@ void TemplateData::setWriteForCompiler(bool flag) */ void TemplateData::writeRegisterTemplate(File &fp, const char * leadInChars) const { - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_INSTALL_BEGIN); - if (leadInChars != NULL) + if (leadInChars != nullptr) fp.print("%s", leadInChars); fp.print("%s::registerMe();\n", getName().c_str()); @@ -1296,7 +1296,7 @@ void TemplateData::writeRegisterTemplate(File &fp, const char * leadInChars) con subStruct->writeRegisterTemplate(fp, leadInChars); } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_INSTALL_END); } // TemplateData::writeRegisterTemplate @@ -1338,7 +1338,7 @@ std::vector paramStrings; paramStrings.push_back(param.enum_list_name + " index"); break; } - if (m_templateParent != NULL) + if (m_templateParent != nullptr) paramStrings.push_back("bool versionOk"); if (param.list_type == LIST_NONE) { @@ -1420,7 +1420,7 @@ void TemplateData::getTemplateNames(std::set &names) const else if (param.type == TYPE_STRUCT) { const TemplateData * structData = getStruct(param.extendedName.c_str()); - if (structData != NULL) + if (structData != nullptr) structData->getTemplateNames(names); } } @@ -1439,7 +1439,7 @@ void TemplateData::writeHeaderParams(File &fp) const return; } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_BEGIN); writeHeaderEnums(fp); @@ -1447,7 +1447,7 @@ void TemplateData::writeHeaderParams(File &fp) const writeHeaderMethods(fp); writeHeaderVariables(fp); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_END); } // TemplateData::writeHeaderParams @@ -1461,7 +1461,7 @@ void TemplateData::writeCompilerHeaderParams(File &fp) const { DEBUG_FATAL(!m_writeForCompilerFlag, ("write for compiler not enabled")); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_BEGIN); writeHeaderEnums(fp); @@ -1469,7 +1469,7 @@ void TemplateData::writeCompilerHeaderParams(File &fp) const writeCompilerHeaderMethods(fp); writeHeaderVariables(fp); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_END); } // TemplateData::writeCompilerHeaderParams @@ -1883,7 +1883,7 @@ ParameterList::const_iterator iter; case LIST_NONE: case LIST_INT_ARRAY: case LIST_ENUM_ARRAY: - if (PaddedDataStructNames[param.type] != NULL) + if (PaddedDataStructNames[param.type] != nullptr) { fp.print("\t\t%s %s", PaddedDataStructNames[param.type], param.name.c_str()); @@ -1904,7 +1904,7 @@ ParameterList::const_iterator iter; break; case LIST_LIST: fp.print("\t\tstdvector<"); - if (UnpaddedDataStructNames[param.type] != NULL) + if (UnpaddedDataStructNames[param.type] != nullptr) fp.print("%s", UnpaddedDataStructNames[param.type]); else if (param.type == TYPE_ENUM) fp.print("enum %s", param.extendedName.c_str()); @@ -1953,7 +1953,7 @@ void TemplateData::writeSourceLoadedFlagInit(File &fp) const { ParameterList::const_iterator iter; - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_INIT_BEGIN); fp.print("\t: %s(filename)\n", getBaseName().c_str()); @@ -1968,13 +1968,13 @@ ParameterList::const_iterator iter; fp.print("m_%sLoaded(false)\n", param.name.c_str()); fp.print("\t,m_%sAppend(false)\n", param.name.c_str()); } - if (m_templateParent == NULL && !isWritingForCompiler()) + if (m_templateParent == nullptr && !isWritingForCompiler()) { fp.print("\t,"); fp.print("m_versionOk(true)\n"); } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_INIT_END); } // TemplateData::writeSourceLoadedFlagInit @@ -1985,7 +1985,7 @@ ParameterList::const_iterator iter; */ void TemplateData::writeSourceStructStart(File &fp) const { - if (m_templateParent == NULL) + if (m_templateParent == nullptr) return; const std::string & templateNameString = getName(); @@ -2051,7 +2051,7 @@ void TemplateData::writeSourceStructStart(File &fp, const std::string &name) con { ParameterList::const_iterator iter; - if (m_templateParent == NULL || !m_hasTemplateParam) + if (m_templateParent == nullptr || !m_hasTemplateParam) return; std::string className = m_templateParent->getName() + "::" + name; @@ -2079,18 +2079,18 @@ ParameterList::const_iterator iter; switch (param.list_type) { case LIST_NONE: - fp.print("\t%s = NULL;\n", pname); + fp.print("\t%s = nullptr;\n", pname); break; case LIST_INT_ARRAY: fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\t%s[i] = NULL;\n", pname); + fp.print("\t\t%s[i] = nullptr;\n", pname); fp.print("\t}\n"); break; case LIST_ENUM_ARRAY: fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\t%s[static_cast<%s>(i)] = NULL;\n", pname, + fp.print("\t\t%s[static_cast<%s>(i)] = nullptr;\n", pname, param.enum_list_name.c_str()); fp.print("\t}\n"); break; @@ -2134,14 +2134,14 @@ ParameterList::const_iterator iter; switch (param.list_type) { case LIST_NONE: - fp.print("\tif (%s != NULL)\n", pname); + fp.print("\tif (%s != nullptr)\n", pname); fp.print("\t\tconst_cast(%s)->addReference();\n", pname); break; case LIST_INT_ARRAY: fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\tif (%s[i] != NULL)\n", pname); + fp.print("\t\tif (%s[i] != nullptr)\n", pname); fp.print("\t\t\tconst_cast(%s[i])->addReference" "();\n", pname); fp.print("\t}\n"); @@ -2149,7 +2149,7 @@ ParameterList::const_iterator iter; case LIST_ENUM_ARRAY: fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\tif (%s[static_cast<%s>(i)] != NULL)\n", pname, + fp.print("\t\tif (%s[static_cast<%s>(i)] != nullptr)\n", pname, param.enum_list_name.c_str()); fp.print("\t\t\tconst_cast(%s[static_cast<%s>" "(i)])->addReference();\n", pname, param.enum_list_name.c_str()); @@ -2182,10 +2182,10 @@ ParameterList::const_iterator iter; switch (param.list_type) { case LIST_NONE: - fp.print("\tif (%s != NULL)\n", pname); + fp.print("\tif (%s != nullptr)\n", pname); fp.print("\t{\n"); fp.print("\t\t%s->releaseReference();\n", pname); - fp.print("\t\t%s = NULL;\n", pname); + fp.print("\t\t%s = nullptr;\n", pname); fp.print("\t}\n"); break; case LIST_LIST: @@ -2198,23 +2198,23 @@ ParameterList::const_iterator iter; else fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\tif (%s[i] != NULL)\n", pname); + fp.print("\t\tif (%s[i] != nullptr)\n", pname); fp.print("\t\t{\n"); fp.print("\t\t\t%s[i]->releaseReference();\n", pname); - fp.print("\t\t\t%s[i] = NULL;\n", pname); + fp.print("\t\t\t%s[i] = nullptr;\n", pname); fp.print("\t\t}\n"); fp.print("\t}\n"); break; case LIST_ENUM_ARRAY: fp.print("\tfor (int i = 0; i < %d; ++i)\n", param.list_size); fp.print("\t{\n"); - fp.print("\t\tif (%s[static_cast<%s>(i)] != NULL)\n", pname, + fp.print("\t\tif (%s[static_cast<%s>(i)] != nullptr)\n", pname, param.enum_list_name.c_str()); fp.print("\t\t{\n"); fp.print("\t\t\t%s[static_cast<%s>(i)]->releaseReference();\n", pname, param.enum_list_name.c_str()); - fp.print("\t\t\t%s[static_cast<%s>(i)] = NULL;\n", pname, + fp.print("\t\t\t%s[static_cast<%s>(i)] = nullptr;\n", pname, param.enum_list_name.c_str()); fp.print("\t\t}\n"); fp.print("\t}\n"); @@ -2259,7 +2259,7 @@ int result; return 0; } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_BEGIN); result = writeSourceGetData(fp); @@ -2282,7 +2282,7 @@ int result; return result; } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_END); return 0; } // TemplateData::writeSourceMethods @@ -2297,7 +2297,7 @@ void TemplateData::writeCompilerSourceMethods(File &fp) const { DEBUG_FATAL(!m_writeForCompilerFlag, ("write for compiler not enabled")); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_BEGIN); writeCompilerSourceAccessMethods(fp); @@ -2314,7 +2314,7 @@ void TemplateData::writeCompilerSourceMethods(File &fp) const subStruct->writeCompilerSourceMethods(fp); } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_END); } // TemplateData::writeCompilerSourceMethods @@ -2355,7 +2355,7 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, } else if (param.list_type != LIST_NONE) indexString = "index"; - if (m_templateParent != NULL) + if (m_templateParent != nullptr) { if (!indexString.empty()) indexString += ", "; @@ -2372,10 +2372,10 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, fp.print("\tif (!m_%s[index].isLoaded())\n", param.name.c_str()); fp.print("\t{\n"); - if (DefaultDataReturnValue[param.type] != NULL) + if (DefaultDataReturnValue[param.type] != nullptr) { fp.print("\t\tif (ms_allowDefaultTemplateParams && " - "/*!%s &&*/ base == NULL)\n", m_templateParent == NULL ? "m_versionOk" : + "/*!%s &&*/ base == nullptr)\n", m_templateParent == nullptr ? "m_versionOk" : "versionOk"); fp.print("\t\t{\n"); fp.print("\t\t\tDEBUG_WARNING(true, (\"Returning default value for " @@ -2391,7 +2391,7 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, fp.print("\t\t}\n"); fp.print("\t\telse\n"); fp.print("\t\t{\n"); - fp.print("\t\t\tDEBUG_FATAL(base == NULL, (\"Template parameter %s has " + fp.print("\t\t\tDEBUG_FATAL(base == nullptr, (\"Template parameter %s has " "not been defined in template %%s!\", DataResource::getName()));\n", param.name.c_str()); if (DefaultDataReturnValue[param.type][0] != '\0') @@ -2419,7 +2419,7 @@ void TemplateData::writeSourceReturnBaseValue(File &fp, const Parameter ¶m, // we need to get the base value instead of ours if (param.list_type == LIST_LIST) { - fp.print("\tif (m_%sAppend && base != NULL)\n", param.name.c_str()); + fp.print("\tif (m_%sAppend && base != nullptr)\n", param.name.c_str()); fp.print("\t{\n"); fp.print("\t\tint baseCount = base->get%sCount();\n", upperName.c_str()); @@ -2505,21 +2505,21 @@ int result; fp.print("{\n"); fp.print("\tif (!m_%sLoaded)\n", pname); fp.print("\t{\n"); - fp.print("\t\tif (m_baseData == NULL)\n"); + fp.print("\t\tif (m_baseData == nullptr)\n"); fp.print("\t\t\treturn 0;\n"); fp.print("\t\tconst %s * base = dynamic_cast" "(m_baseData);\n", templateName, templateName); - fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong " + fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong " "type\"));\n"); fp.print("\t\treturn base->get%sCount();\n", upperName.c_str()); fp.print("\t}\n\n"); fp.print("\tsize_t count = m_%s.size();\n\n", pname); fp.print("\t// if we are extending our base template, add it's count\n"); - fp.print("\tif (m_%sAppend && m_baseData != NULL)\n", pname); + fp.print("\tif (m_%sAppend && m_baseData != nullptr)\n", pname); fp.print("\t{\n"); fp.print("\t\tconst %s * base = dynamic_cast(m_baseData);\n", templateName, templateName); - fp.print("\t\tif (base != NULL)\n"); + fp.print("\t\tif (base != nullptr)\n"); fp.print("\t\t\tcount += base->get%sCount();\n", upperName.c_str()); fp.print("\t}\n\n"); fp.print("\treturn count;\n"); @@ -2582,7 +2582,7 @@ void TemplateData::writeSourceTestData(File &fp) const } } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { // check the base class if (!getBaseName().empty() && getBaseName() != ROOT_TEMPLATE_NAME) @@ -2631,18 +2631,18 @@ void TemplateData::writeSourceGetGeneric(File &fp, const Parameter ¶m) const fp.print("#endif\n\n"); } - fp.print("\tconst %s * base = NULL;\n", templateName); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", templateName); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", templateName); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); if (param.list_type == LIST_NONE) { // get the test base value fp.print("#ifdef _DEBUG\n"); - fp.print("\t\tif (testData && base != NULL)\n"); + fp.print("\t\tif (testData && base != nullptr)\n"); fp.print("\t\t\ttestDataValue = base->get%s%s(true);\n", upperName.c_str(), MinMaxNames[i]); fp.print("#endif\n"); @@ -2651,7 +2651,7 @@ void TemplateData::writeSourceGetGeneric(File &fp, const Parameter ¶m) const fp.print("\t}\n\n"); const char *arrayIndex = ""; - std::string indexName = m_templateParent == NULL ? "" : "versionOk"; + std::string indexName = m_templateParent == nullptr ? "" : "versionOk"; const char *access = "."; if (param.list_type == LIST_NONE) { @@ -2689,9 +2689,9 @@ void TemplateData::writeSourceGetGeneric(File &fp, const Parameter ¶m) const fp.print("\tif (delta == '+' || delta == '-' || delta == '_' || delta == '=')\n"); fp.print("\t{\n"); fp.print("\t\t%s baseValue = 0;\n", UnpaddedDataMethodNames[param.type]); - fp.print("\t\tif (m_baseData != NULL)\n"); + fp.print("\t\tif (m_baseData != nullptr)\n"); fp.print("\t\t{\n"); - fp.print("\t\t\tif (base != NULL)\n"); + fp.print("\t\t\tif (base != nullptr)\n"); fp.print("\t\t\t\tbaseValue = base->get%s%s(%s);\n", upperName.c_str(), MinMaxNames[i], indexName.c_str()); fp.print("\t\t\telse if (ms_allowDefaultTemplateParams)\n"); @@ -2716,7 +2716,7 @@ void TemplateData::writeSourceGetGeneric(File &fp, const Parameter ¶m) const { // check the return value vs the base value, and warn if the same fp.print("#ifdef _DEBUG\n"); - fp.print("\tif (testData && base != NULL)\n"); + fp.print("\tif (testData && base != nullptr)\n"); fp.print("\t{\n"); // fp.print("\t\tif (testDataValue == value)\n"); // fp.print("\t\t\tDEBUG_WARNING(true, (\"Template %%s, parameter %s is " @@ -2758,12 +2758,12 @@ void TemplateData::writeSourceGetVector(File &fp, const Parameter ¶m) const fp.print(") const\n"); fp.print("{\n"); - fp.print("\tconst %s * base = NULL;\n", templateName); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", templateName); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", templateName); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); fp.print("\t}\n\n"); const char *arrayIndex = ""; @@ -2820,18 +2820,18 @@ void TemplateData::writeSourceGetDynamicVariable(File &fp, const Parameter ¶ fp.print(") const\n"); fp.print("{\n"); - fp.print("\tconst %s * base = NULL;\n", templateName); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", templateName); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", templateName); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); fp.print("\t}\n\n"); if (param.list_type == LIST_NONE) { writeSourceReturnBaseValue(fp, param, ""); - fp.print("\tif (m_%s.isExtendingBaseList() && base != NULL)\n", pname); + fp.print("\tif (m_%s.isExtendingBaseList() && base != nullptr)\n", pname); fp.print("\t\tbase->get%s(list);\n", upperName.c_str()); fp.print("\tm_%s.getDynamicVariableList(list);\n", pname); } @@ -2840,7 +2840,7 @@ void TemplateData::writeSourceGetDynamicVariable(File &fp, const Parameter ¶ fp.print("\tDEBUG_FATAL(index < 0 || index >= %d, (\"" "template param index out of range\"));\n", param.list_size); writeSourceReturnBaseValue(fp, param, ""); - fp.print("\tif (m_%s[index].isExtendingBaseList() && base != NULL)\n", pname); + fp.print("\tif (m_%s[index].isExtendingBaseList() && base != nullptr)\n", pname); fp.print("\t\tbase->get%s(list, index);\n", upperName.c_str()); fp.print("\tm_%s[index].getDynamicVariableList(list);\n", pname); } @@ -2872,19 +2872,19 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons fp.print(") const\n"); fp.print("{\n"); - fp.print("\tconst %s * base = NULL;\n", templateName); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", templateName); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", templateName); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); fp.print("\t}\n\n"); if (param.list_type == LIST_NONE) { writeSourceReturnBaseValue(fp, param, ""); - fp.print("\tconst %s%s * returnValue = NULL;\n", + fp.print("\tconst %s%s * returnValue = nullptr;\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); fp.print("\tconst std::string & templateName = m_%s.getValue();\n", pname); @@ -2894,7 +2894,7 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons "ObjectTemplateList::fetch(templateName));\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); - fp.print("\t\tif (returnValue == NULL)\n"); + fp.print("\t\tif (returnValue == nullptr)\n"); fp.print("\t\t\tWARNING_STRICT_FATAL(true, (\"Error loading template %%s\"," "templateName.c_str()));\n"); fp.print("\t}\n"); @@ -2918,7 +2918,7 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons writeSourceReturnBaseValue(fp, param, ""); } - fp.print("\tconst %s%s * returnValue = NULL;\n", + fp.print("\tconst %s%s * returnValue = nullptr;\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); fp.print("\tconst std::string & templateName = m_%s[index]%sgetValue();\n", @@ -2929,7 +2929,7 @@ void TemplateData::writeSourceGetTemplate(File &fp, const Parameter ¶m) cons "ObjectTemplateList::fetch(templateName));\n", EnumLocationTypes[getTemplateLocation()], filenameLowerToUpper(param.extendedName).c_str()); - fp.print("\t\tif (returnValue == NULL)\n"); + fp.print("\t\tif (returnValue == nullptr)\n"); fp.print("\t\t\tWARNING_STRICT_FATAL(true, (\"Error loading template %%s\"," "templateName.c_str()));\n"); fp.print("\t}\n"); @@ -2974,17 +2974,17 @@ void TemplateData::writeSourceGetEnum(File &fp, const Parameter ¶m) const fp.print("#endif\n\n"); } - fp.print("\tconst %s * base = NULL;\n", className); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", className); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", className); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); if (param.list_type == LIST_NONE) { // get the test base value fp.print("#ifdef _DEBUG\n"); - fp.print("\t\tif (testData && base != NULL)\n"); + fp.print("\t\tif (testData && base != nullptr)\n"); fp.print("\t\t\ttestDataValue = base->get%s(true);\n", upperName.c_str()); fp.print("#endif\n"); } @@ -2999,7 +2999,7 @@ void TemplateData::writeSourceGetEnum(File &fp, const Parameter ¶m) const // check the return value vs the base value, and warn if the same fp.print("#ifdef _DEBUG\n"); - fp.print("\tif (testData && base != NULL)\n"); + fp.print("\tif (testData && base != nullptr)\n"); fp.print("\t{\n"); // fp.print("\t\tif (testDataValue == value)\n"); // fp.print("\t\t\tDEBUG_WARNING(true, (\"Template %%s, parameter %s is " @@ -3061,11 +3061,11 @@ std::string upperName; fp.print(") const\n"); fp.print("{\n"); - fp.print("\tconst %s * base = NULL;\n", templateName); - fp.print("\tif (m_baseData != NULL)\n"); + fp.print("\tconst %s * base = nullptr;\n", templateName); + fp.print("\tif (m_baseData != nullptr)\n"); fp.print("\t{\n"); fp.print("\t\tbase = dynamic_cast(m_baseData);\n", templateName); -// fp.print("\t\tDEBUG_FATAL(base == NULL, (\"base template wrong type\"));\n"); +// fp.print("\t\tDEBUG_FATAL(base == nullptr, (\"base template wrong type\"));\n"); fp.print("\t}\n\n"); if (param.list_type == LIST_NONE) @@ -3100,7 +3100,7 @@ std::string upperName; fp.print("\tNOT_NULL(param);\n"); const TemplateData *structData = getStruct(param.extendedName.c_str()); - if (structData == NULL) + if (structData == nullptr) { fprintf(stderr, "unable to find structure %s\n", param.extendedName.c_str()); @@ -3108,7 +3108,7 @@ std::string upperName; } std::string versionString = "versionOk"; - if (m_templateParent == NULL) + if (m_templateParent == nullptr) versionString = "m_" + versionString; structData->writeSourceGetStructAssignments(fp, versionString, MinMaxNames[i]); @@ -3248,7 +3248,7 @@ void TemplateData::writeSourceReadIff(File &fp) const fp.print("char paramName[MAX_NAME_SIZE];\n"); fp.print("\n"); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { // check that we are in our form fp.print("\tif (file.getCurrentName() != %s_tag)\n", @@ -3277,14 +3277,14 @@ void TemplateData::writeSourceReadIff(File &fp) const // fp.print("\t\t%s * mybase = dynamic_cast<%s *>(base);\n", // templateName, templateName); - // fp.print("\t\tFATAL(mybase == NULL, (\"trying to derive a template from an incompatable template type\"));\n"); - fp.print("\t\tDEBUG_WARNING(base == NULL, (\"was unable to load base template %%s\", baseFilename.c_str()));\n"); - fp.print("\t\tif (m_baseData == base && base != NULL)\n"); + // fp.print("\t\tFATAL(mybase == nullptr, (\"trying to derive a template from an incompatable template type\"));\n"); + fp.print("\t\tDEBUG_WARNING(base == nullptr, (\"was unable to load base template %%s\", baseFilename.c_str()));\n"); + fp.print("\t\tif (m_baseData == base && base != nullptr)\n"); fp.print("\t\t\tbase->releaseReference();\n"); fp.print("\t\telse\n"); fp.print("\t\t{\n"); - fp.print("\t\t\tif (m_baseData != NULL)\n"); + fp.print("\t\t\tif (m_baseData != nullptr)\n"); fp.print("\t\t\t\tm_baseData->releaseReference();\n"); fp.print("\t\t\tm_baseData = base;\n"); @@ -3356,7 +3356,7 @@ void TemplateData::writeSourceReadIff(File &fp) const " ++iter)\n", param.name.c_str(), param.name.c_str()); fp.print("\t\t\t{\n"); fp.print("\t\t\t\tdelete *iter;\n"); - fp.print("\t\t\t\t*iter = NULL;\n"); + fp.print("\t\t\t\t*iter = nullptr;\n"); fp.print("\t\t\t}\n"); fp.print("\t\t\tm_%s.clear();\n", param.name.c_str()); fp.print("\t\t\tm_%sAppend = file.read_bool8();\n", param.name.c_str()); @@ -3408,7 +3408,7 @@ void TemplateData::writeSourceReadIff(File &fp) const fp.print("\n"); fp.print("\tfile.exitForm();\n"); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { // enter the next form if (!baseNameString.empty() && baseNameString != ROOT_TEMPLATE_NAME) @@ -3450,7 +3450,7 @@ void TemplateData::writeSourceWriteIff(File &fp) const fp.print("int count;\n\n"); // write form enter header stuff - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { fp.print("\tfile.insertForm(%s_tag);\n", m_fileParent->getTemplateName().c_str()); @@ -3552,7 +3552,7 @@ void TemplateData::writeSourceWriteIff(File &fp) const fp.print("\n"); fp.print("\tfile.exitForm(true);\n"); - if (m_fileParent != NULL) + if (m_fileParent != nullptr) { // call base class write iff method if (!getBaseName().empty() && getBaseName() != ROOT_TEMPLATE_NAME) @@ -3576,7 +3576,7 @@ void TemplateData::writeSourceWriteIff(File &fp) const */ void TemplateData::writeSourceCleanup(File &fp) const { - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_CLEANUP_BEGIN); const char * const * variableNames = DataVariableNames; @@ -3613,7 +3613,7 @@ void TemplateData::writeSourceCleanup(File &fp) const " ++iter)\n", param.name.c_str(), param.name.c_str()); fp.print("\t\t{\n"); fp.print("\t\t\tdelete *iter;\n"); - fp.print("\t\t\t*iter = NULL;\n"); + fp.print("\t\t\t*iter = nullptr;\n"); fp.print("\t\t}\n"); fp.print("\t\tm_%s.clear();\n", param.name.c_str()); fp.print("\t}\n"); @@ -3624,7 +3624,7 @@ void TemplateData::writeSourceCleanup(File &fp) const } } - if (m_fileParent != NULL) + if (m_fileParent != nullptr) fp.print("%s\n", TDF_CLEANUP_END); } // TemplateData::writeSourceCleanup @@ -3719,9 +3719,9 @@ ParameterList::const_iterator iter; fp.print("\t\t{\n"); fp.print("\t\t\tif (deepCheck && !isParamLoaded(name, false, 0))\n"); fp.print("\t\t\t{\n"); - fp.print("\t\t\t\tif (getBaseTemplate() != NULL)\n"); + fp.print("\t\t\t\tif (getBaseTemplate() != nullptr)\n"); fp.print("\t\t\t\t\treturn getBaseTemplate()->get%s(name, deepCheck, index);\n", FUNC_NAMES[i]); - fp.print("\t\t\t\treturn NULL;\n"); + fp.print("\t\t\t\treturn nullptr;\n"); fp.print("\t\t\t}\n"); fp.print("\t\t\treturn &m_%s;\n", pname); fp.print("\t\t}\n"); @@ -3751,9 +3751,9 @@ ParameterList::const_iterator iter; fp.print("\t\t{\n"); fp.print("\t\t\tif (deepCheck && !isParamLoaded(name, false, index))\n"); fp.print("\t\t\t{\n"); - fp.print("\t\t\t\tif (getBaseTemplate() != NULL)\n"); + fp.print("\t\t\t\tif (getBaseTemplate() != nullptr)\n"); fp.print("\t\t\t\t\treturn getBaseTemplate()->get%s(name, deepCheck, index);\n", FUNC_NAMES[i]); - fp.print("\t\t\t\treturn NULL;\n"); + fp.print("\t\t\t\treturn nullptr;\n"); fp.print("\t\t\t}\n"); fp.print("\t\t\treturn &m_%s[index];\n", pname); fp.print("\t\t}\n"); @@ -3774,7 +3774,7 @@ ParameterList::const_iterator iter; fp.print("\treturn %s::get%s(name, deepCheck, index);\n", baseName, FUNC_NAMES[i]); } if (paramCount != 0) - fp.print("\treturn NULL;\n"); + fp.print("\treturn nullptr;\n"); fp.print("}\t//%s::get%s\n", templateName, FUNC_NAMES[i]); fp.print("\n"); } @@ -4227,7 +4227,7 @@ void TemplateData::writeParameterDefault(File &fp, const Parameter ¶m, int i case LIST_ENUM_ARRAY: { const EnumList * enumList = getEnumList(param.enum_list_name, false); - DEBUG_FATAL(enumList == NULL, ("unknown enum name %s", + DEBUG_FATAL(enumList == nullptr, ("unknown enum name %s", param.enum_list_name.c_str())); if (index >= 0 && index < param.list_size) @@ -4288,7 +4288,7 @@ void TemplateData::writeStructParameterDefault(File &fp, const Parameter ¶m, case LIST_ENUM_ARRAY: { const EnumList * enumList = getEnumList(param.enum_list_name, false); - DEBUG_FATAL(enumList == NULL, ("unknown enum name %s", + DEBUG_FATAL(enumList == nullptr, ("unknown enum name %s", param.enum_list_name.c_str())); EnumList::const_iterator listIter; @@ -4357,7 +4357,7 @@ void TemplateData::writeDefaultValue(File &fp, const Parameter ¶m) const case TYPE_ENUM: { const EnumList * enumList = getEnumList(param.extendedName, false); - DEBUG_FATAL(enumList == NULL, ("unknown enum name %s", + DEBUG_FATAL(enumList == nullptr, ("unknown enum name %s", param.extendedName.c_str())); fp.print("%s", enumList->at(0).name.c_str()); } @@ -4398,7 +4398,7 @@ const TemplateData::Parameter *TemplateData::getParameter( { NOT_NULL(name); - TemplateData::Parameter const *result = NULL; + TemplateData::Parameter const *result = nullptr; // Shallow check, just checks this immediate tdf @@ -4414,7 +4414,7 @@ const TemplateData::Parameter *TemplateData::getParameter( const TemplateDefinitionFile *TemplateDefinitionFile = getTdfForParameter(name); - if (TemplateDefinitionFile != NULL) + if (TemplateDefinitionFile != nullptr) { result = TemplateDefinitionFile->getTemplateData(TemplateDefinitionFile->getHighestVersion())->getParameter(name); } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h index cac38cd7..f7949388 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.h @@ -238,11 +238,11 @@ inline bool TemplateData::isWritingForCompiler(void) const inline const TemplateDefinitionFile * TemplateData::getFileParent(void) const { - if (m_fileParent != NULL) + if (m_fileParent != nullptr) return m_fileParent; - if (m_templateParent != NULL) + if (m_templateParent != nullptr) return m_templateParent->getFileParent(); - return NULL; + return nullptr; } // TemplateData::getFileParent diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDataIterator.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDataIterator.cpp index 11b8d2dd..5a5c1c48 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDataIterator.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDataIterator.cpp @@ -25,7 +25,7 @@ //----------------------------------------------------------------------------- TemplateDataIterator::TemplateDataIterator() -: m_templateDataToIterate(NULL), +: m_templateDataToIterate(nullptr), m_numItems(0), m_noMoreData(true) { @@ -34,7 +34,7 @@ TemplateDataIterator::TemplateDataIterator() //----------------------------------------------------------------------------- TemplateDataIterator::TemplateDataIterator(const TemplateData& templateData) -: m_templateDataToIterate(NULL), +: m_templateDataToIterate(nullptr), m_numItems(0), m_noMoreData(true) { @@ -45,7 +45,7 @@ TemplateDataIterator::TemplateDataIterator(const TemplateData& templateData) TemplateDataIterator::~TemplateDataIterator() { - m_templateDataToIterate = NULL; + m_templateDataToIterate = nullptr; } //----------------------------------------------------------------------------- @@ -62,7 +62,7 @@ TemplateDataIterator::setTo(const TemplateData &templateData) // .. end at the child TDF's. const ParameterList* parameterListToAdd; - while(m_templateDataToIterate != NULL) + while(m_templateDataToIterate != nullptr) { parameterListToAdd = &(m_templateDataToIterate->m_parameters); m_numItems += parameterListToAdd->size(); @@ -75,23 +75,23 @@ TemplateDataIterator::setTo(const TemplateData &templateData) } // Get the template data from the parent TDF - if(m_templateDataToIterate->m_fileParent != NULL) + if(m_templateDataToIterate->m_fileParent != nullptr) { const TemplateDefinitionFile* parentFile = m_templateDataToIterate->m_fileParent->getBaseDefinitionFile(); - if(parentFile != NULL) + if(parentFile != nullptr) { m_templateDataToIterate = parentFile->getTemplateData(parentFile->getHighestVersion()); } else { - m_templateDataToIterate = NULL; + m_templateDataToIterate = nullptr; } } else { - m_templateDataToIterate = NULL; + m_templateDataToIterate = nullptr; } } @@ -164,7 +164,7 @@ TemplateDataIterator::operator *() const { if(this->end()) { - return NULL; + return nullptr; } else { diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.cpp index f191b3fb..4025ab5f 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.cpp @@ -20,9 +20,9 @@ * Class constructor. */ TemplateDefinitionFile::TemplateDefinitionFile(void) : - m_baseDefinitionFile(NULL), + m_baseDefinitionFile(nullptr), m_writeForCompilerFlag(false), - m_filterCompiledRegex(NULL) + m_filterCompiledRegex(nullptr) { cleanup(); } // TemplateDefinitionFile::TemplateDefinitionFile @@ -51,24 +51,24 @@ void TemplateDefinitionFile::cleanup(void) m_compilerPath.clear(); m_fileComments.clear(); - if (m_baseDefinitionFile != NULL) + if (m_baseDefinitionFile != nullptr) { delete m_baseDefinitionFile; - m_baseDefinitionFile = NULL; + m_baseDefinitionFile = nullptr; } std::map::iterator iter; for (iter = m_templateMap.begin(); iter != m_templateMap.end(); ++iter) { delete (*iter).second; - (*iter).second = NULL; + (*iter).second = nullptr; } m_templateMap.clear(); - if (m_filterCompiledRegex != NULL) + if (m_filterCompiledRegex != nullptr) { RegexServices::freeMemory(m_filterCompiledRegex); - m_filterCompiledRegex = NULL; + m_filterCompiledRegex = nullptr; } } // TemplateDefinitionFile::cleanup @@ -104,7 +104,7 @@ static const std::string wildcard = "*"; if (!m_templateNameFilter.empty()) return m_templateNameFilter; - if (m_baseDefinitionFile != NULL) + if (m_baseDefinitionFile != nullptr) return m_baseDefinitionFile->getTemplateNameFilter(); return wildcard; @@ -121,7 +121,7 @@ bool TemplateDefinitionFile::isValidTemplateName(const Filename & name) const { if (m_templateNameFilter.empty()) { - if (m_baseDefinitionFile != NULL) + if (m_baseDefinitionFile != nullptr) return m_baseDefinitionFile->isValidTemplateName(name); else return true; @@ -131,7 +131,7 @@ bool TemplateDefinitionFile::isValidTemplateName(const Filename & name) const int const matchDataElementCount = maxCaptureCount * 3; int matchData[matchDataElementCount]; - int const matchCode = pcre_exec(m_filterCompiledRegex, NULL, name.getName().c_str(), name.getName().length(), 0, 0, matchData, matchDataElementCount); + int const matchCode = pcre_exec(m_filterCompiledRegex, nullptr, name.getName().c_str(), name.getName().length(), 0, 0, matchData, matchDataElementCount); bool const result = (matchCode >= 0); if (matchCode < -1) @@ -425,10 +425,10 @@ void TemplateDefinitionFile::writeClassSourceBegin(File &fp, const TemplateData fp.print(" */\n"); fp.print("Tag %s::getHighestTemplateVersion(void) const\n", name); fp.print("{\n"); - fp.print("\tif (m_baseData == NULL)\n"); + fp.print("\tif (m_baseData == nullptr)\n"); fp.print("\t\treturn m_templateVersion;\n"); fp.print("\tconst %s * base = dynamic_cast(m_baseData);\n", name, name); - fp.print("\tif (base == NULL)\n"); + fp.print("\tif (base == nullptr)\n"); fp.print("\t\treturn m_templateVersion;\n"); fp.print("\treturn std::max(m_templateVersion, base->getHighestTemplateVersion());\n"); fp.print("} // %s::getHighestTemplateVersion\n", name); @@ -449,7 +449,7 @@ static const int BUFFER_SIZE = 1024; int lineLen; char buffer[BUFFER_SIZE]; char token[BUFFER_SIZE]; -TemplateData *currentTemplate = NULL; +TemplateData *currentTemplate = nullptr; cleanup(); @@ -510,7 +510,7 @@ TemplateData *currentTemplate = NULL; currentTemplate = new TemplateData(version, *this); m_templateMap[version] = currentTemplate; } - else if (currentTemplate != NULL) + else if (currentTemplate != nullptr) { line = currentTemplate->parseLine(fp, buffer, token); if (line == CHAR_ERROR) @@ -540,7 +540,7 @@ TemplateData *currentTemplate = NULL; fp.printError("unable to open base template definition"); return -1; } - if (m_baseDefinitionFile == NULL) + if (m_baseDefinitionFile == nullptr) m_baseDefinitionFile = new TemplateDefinitionFile; else m_baseDefinitionFile->cleanup(); @@ -570,19 +570,19 @@ TemplateData *currentTemplate = NULL; m_templateNameFilter = token; //-- Attempt to compile the regex. - if (m_filterCompiledRegex != NULL) + if (m_filterCompiledRegex != nullptr) { // First free the existing compiled regex. RegexServices::freeMemory(m_filterCompiledRegex); - m_filterCompiledRegex = NULL; + m_filterCompiledRegex = nullptr; } //-- Compile the new regex. - char const *errorString = NULL; + char const *errorString = nullptr; int errorOffset = 0; - m_filterCompiledRegex = pcre_compile(m_templateNameFilter.c_str(), 0, &errorString, &errorOffset, NULL); - WARNING(m_filterCompiledRegex == NULL, ("TemplateDefinitionFile::parse(): pcre_compile() failed, error=[%s], errorOffset=[%d], regex text=[%s].", errorString, errorOffset, m_templateNameFilter.c_str())); + m_filterCompiledRegex = pcre_compile(m_templateNameFilter.c_str(), 0, &errorString, &errorOffset, nullptr); + WARNING(m_filterCompiledRegex == nullptr, ("TemplateDefinitionFile::parse(): pcre_compile() failed, error=[%s], errorOffset=[%d], regex text=[%s].", errorString, errorOffset, m_templateNameFilter.c_str())); } else if (strcmp(token, "clientpath") == 0 || strcmp(token, "serverpath") == 0 || diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h index 82487e67..2ea426fc 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateDefinitionFile.h @@ -111,7 +111,7 @@ inline TemplateData *TemplateDefinitionFile::getTemplateData(int version) const { std::map::const_iterator iter = m_templateMap.find(version); if (iter == m_templateMap.end()) - return NULL; + return nullptr; return (*iter).second; } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.cpp index 2b376aa0..b12dc5ef 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateGlobals.cpp @@ -57,15 +57,15 @@ int strip(char *buffer) * the size of buffer * * @return the next non-whitespace character in the string after the token, or - * NULL if the end of line has been reached + * nullptr if the end of line has been reached */ const char *getNextWhitespaceToken(const char *buffer, char *token) { NOT_NULL(token); *token = '\0'; - if (buffer == NULL) - return NULL; + if (buffer == nullptr) + return nullptr; const char *from = buffer; char *to = token; @@ -74,7 +74,7 @@ const char *getNextWhitespaceToken(const char *buffer, char *token) while (isspace(*from) && *from != '\0') ++from; if (*from == '\0') - return NULL; + return nullptr; // copy the token while (!isspace(*from) && *from != '\0') @@ -85,7 +85,7 @@ const char *getNextWhitespaceToken(const char *buffer, char *token) while (isspace(*from) && *from != '\0') ++from; if (*from == '\0') - return NULL; + return nullptr; return from; } // getNextWhitespaceToken @@ -97,20 +97,20 @@ const char *getNextWhitespaceToken(const char *buffer, char *token) * the size of buffer * * @return the next token, defined by the 1st non-whitespace character in buffer: - * if it is '/' and the next character is '/', NULL + * if it is '/' and the next character is '/', nullptr * if it is a double-quote, the text until the next double quote (not including \") * if it is a symbol, the symbol * if it is a number, the next characters that make a valid integer or float * if it is a character, the text until the next whitespace or symbol, not including _ - * if it is NULL, NULL + * if it is nullptr, nullptr */ const char *getNextToken(const char *buffer, char *token) { NOT_NULL(token); *token = '\0'; - if (buffer == NULL) - return NULL; + if (buffer == nullptr) + return nullptr; const char *from = buffer; char *to = token; @@ -119,12 +119,12 @@ const char *getNextToken(const char *buffer, char *token) while (isspace(*from) && *from != '\0') ++from; if (*from == '\0') - return NULL; + return nullptr; if (*from == '/' && *(from+1) == '/') { // comment - return NULL; + return nullptr; } else if (isdigit(*from) || ((*from == '+' || *from == '-') && isdigit(*(from + 1))) @@ -173,7 +173,7 @@ const char *getNextToken(const char *buffer, char *token) while (isspace(*from) && *from != '\0') ++from; if (*from == '\0') - return NULL; + return nullptr; return from; } // getNextToken @@ -247,9 +247,9 @@ std::string filenameUpperToLower(const std::string & filename) std::string concatPaths(const char *path1, const char *path2) { // test for missing path - if (path1 == NULL || *path1 == '\0') + if (path1 == nullptr || *path1 == '\0') return path2; - if (path2 == NULL || *path2 == '\0') + if (path2 == nullptr || *path2 == '\0') return path1; #ifdef WIN32 @@ -286,7 +286,7 @@ std::string getNextHighestPath(const char *path) // find the two highest path separators const char *separator1 = strrchr(path, PATH_SEPARATOR); - if (separator1 == NULL) + if (separator1 == nullptr) { #ifdef WIN32 if (isalpha(*path) && *(path + 1) == ':') @@ -304,7 +304,7 @@ std::string getNextHighestPath(const char *path) return std::string(path, 3); #endif const char *separator2 = strrchr(separator1 - 1, PATH_SEPARATOR); - if (separator2 == NULL) + if (separator2 == nullptr) return std::string(path, separator1 - path); return std::string(path, separator2 - path); diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp index 425bf716..23b456d5 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp @@ -27,12 +27,12 @@ * Class constructor. */ TpfFile::TpfFile(void) : - m_template(NULL), + m_template(nullptr), m_baseTemplateName(), - m_currTemplateDef(NULL), - m_templateData(NULL), - m_highestTemplateData(NULL), - m_parameter(NULL), + m_currTemplateDef(nullptr), + m_templateData(nullptr), + m_highestTemplateData(nullptr), + m_parameter(nullptr), m_path(), m_iffPath(), m_templateLocation(LOC_NONE) @@ -53,14 +53,14 @@ TpfFile::~TpfFile() */ void TpfFile::cleanup(void) { - m_parameter = NULL; + m_parameter = nullptr; m_fp.close(); - if (m_template != NULL) + if (m_template != nullptr) { delete m_template; - m_template = NULL; + m_template = nullptr; } - m_currTemplateDef = NULL; + m_currTemplateDef = nullptr; IGNORE_RETURN(m_baseTemplateName.erase()); } // TpfFile::cleanup @@ -174,7 +174,7 @@ int TpfFile::loadTemplate(const Filename & filename) if (lineLen == -1) { // if we are a base template, check for missing parameters - if (m_highestTemplateData != NULL && m_template != NULL && + if (m_highestTemplateData != nullptr && m_template != nullptr && !m_highestTemplateData->verifyTemplate(m_template, m_fp)) { result = -1; @@ -190,7 +190,7 @@ int TpfFile::loadTemplate(const Filename & filename) // parse the 1st token: comment, @flag, or variable name const char *line = m_buffer; line = getNextToken(line, m_token); - if (*m_token == '\0' && line == NULL) + if (*m_token == '\0' && line == nullptr) { // empty line or comment continue; @@ -201,7 +201,7 @@ int TpfFile::loadTemplate(const Filename & filename) } else if (isalpha(*m_token)) { - if (m_template == NULL) + if (m_template == nullptr) { m_fp.printError("unable to parse parameters, no template class defined"); return -1; @@ -209,7 +209,7 @@ int TpfFile::loadTemplate(const Filename & filename) line = parseAssignment(line); if (line == CHAR_ERROR) result = -1; - else if (line != NULL) + else if (line != nullptr) { char buffer[1024]; if (getNextToken(line, buffer)) @@ -261,7 +261,7 @@ int TpfFile::makeIffFiles(const Filename & filename) if (result != 0) return result; - Filename iffname(NULL, m_iffPath.c_str(), filename.getName().c_str(), + Filename iffname(nullptr, m_iffPath.c_str(), filename.getName().c_str(), IFF_EXTENSION); Iff iffFile(1024, true, true); m_template->save(iffFile); @@ -291,20 +291,20 @@ int TpfFile::WriteIffFile(Iff & iffData, const Filename & fileName) { // there are problems with long path names in Windows that changing to // the directory seems to fix - char *buffer = NULL; + char *buffer = nullptr; DWORD buflen; // get our current path - buflen = GetFullPathName(".", 0, buffer, NULL); + buflen = GetFullPathName(".", 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(".", buflen + 1, buffer, NULL); + buflen = GetFullPathName(".", buflen + 1, buffer, nullptr); Unicode::String srcPath = Unicode::narrowToWide(buffer); delete[] buffer; srcPath = L"\\\\?\\" + srcPath; // get the destination path std::string correctPath(fileName.getDrive() + fileName.getPath()); - buflen = GetFullPathName(correctPath.c_str(), 0, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, nullptr); Unicode::String destPath = Unicode::narrowToWide(buffer); delete[] buffer; destPath = L"\\\\?\\" + destPath; @@ -323,18 +323,18 @@ int TpfFile::WriteIffFile(Iff & iffData, const Filename & fileName) } else { - char *buffer = NULL; + char *buffer = nullptr; DWORD buflen; // get our current path - buflen = GetFullPathName(".", 0, buffer, NULL); + buflen = GetFullPathName(".", 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(".", buflen + 1, buffer, NULL); + buflen = GetFullPathName(".", buflen + 1, buffer, nullptr); delete[] buffer; // get the destination path std::string correctPath(fileName.getDrive() + fileName.getPath()); - buflen = GetFullPathName(correctPath.c_str(), 0, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), 0, buffer, nullptr); buffer = new char[buflen + 1]; - buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, NULL); + buflen = GetFullPathName(correctPath.c_str(), buflen + 1, buffer, nullptr); std::string destPath = buffer; delete[] buffer; // change to the destination path @@ -389,7 +389,7 @@ int result = 0; cleanup(); File temp_fp; - if (!temp_fp.open(tmpnam(NULL), "wt")) + if (!temp_fp.open(tmpnam(nullptr), "wt")) { fprintf(stderr, "error opening temp file for template replacement\n"); return -1; @@ -419,7 +419,7 @@ int result = 0; // parse the 1st token: comment, @flag, or variable name const char *line = m_buffer; line = getNextToken(line, m_token); - if (*m_token == '\0' && line == NULL) + if (*m_token == '\0' && line == nullptr) { // empty line or comment if (temp_fp.puts(m_buffer) < 0) @@ -432,7 +432,7 @@ int result = 0; { // @base or @class const char *templine = getNextToken(line, m_token); - if (templine == NULL) + if (templine == nullptr) { m_fp.printEolError(); return -1; @@ -452,7 +452,7 @@ int result = 0; else { // if we are a base template, check for missing parameters - if (m_highestTemplateData != NULL && m_template != NULL) + if (m_highestTemplateData != nullptr && m_template != nullptr) { m_highestTemplateData->updateTemplate(m_template, temp_fp); } @@ -462,7 +462,7 @@ int result = 0; else if (isalpha(*m_token)) { m_parameter = m_templateData->getParameter(m_token); - if (m_parameter == NULL) + if (m_parameter == nullptr) { } else @@ -494,14 +494,14 @@ int result = 0; int TpfFile::parseTemplateCommand(const char *line) { line = getNextToken(line, m_token); - if (line == NULL) + if (line == nullptr) { m_fp.printEolError(); return -1; } if (strcmp(m_token, "base") == 0) { - if (m_template != NULL && !m_template->getBaseTemplateName().empty()) + if (m_template != nullptr && !m_template->getBaseTemplateName().empty()) { m_fp.printError("base template already defined"); return -1; @@ -509,7 +509,7 @@ int TpfFile::parseTemplateCommand(const char *line) line = getNextWhitespaceToken(line, m_token); if (isalpha(*m_token)) { - if (m_template != NULL) + if (m_template != nullptr) { if (m_template->setBaseTemplateName(m_token) != 0) { @@ -536,7 +536,7 @@ int TpfFile::parseTemplateCommand(const char *line) { // if we are a base template, check for missing parameters // @todo: fix so we can verify non-base templates - if (m_highestTemplateData != NULL && m_template != NULL && + if (m_highestTemplateData != nullptr && m_template != nullptr && !m_highestTemplateData->verifyTemplate(m_template, m_fp)) { return -1; @@ -564,7 +564,7 @@ int TpfFile::parseTemplateCommand(const char *line) } int result = 0; - if(m_currTemplateDef == NULL) + if(m_currTemplateDef == nullptr) { result = m_templateDef.parse(fp); m_currTemplateDef = &m_templateDef; @@ -579,7 +579,7 @@ int TpfFile::parseTemplateCommand(const char *line) while(lookingForMatchingData) { - if(templateDataChild == NULL) // DHERMAN Check here for template definition names not matching + if(templateDataChild == nullptr) // DHERMAN Check here for template definition names not matching { char errbuf[256]; @@ -618,7 +618,7 @@ int TpfFile::parseTemplateCommand(const char *line) int version = static_cast(atol(m_token)); m_templateData = m_currTemplateDef->getTemplateData(version); - if (m_templateData == NULL) + if (m_templateData == nullptr) { char errbuf[256]; sprintf(errbuf, "can't find version %d in template definition %s", @@ -634,14 +634,14 @@ int TpfFile::parseTemplateCommand(const char *line) return -1; } - if (m_template == NULL) + if (m_template == nullptr) { // this is the highest class level, make a blank template // with it const TagInfo & templateId = m_currTemplateDef->getTemplateId(); m_template = dynamic_cast(TpfTemplate::createTemplate( templateId.tag)); - if (m_template == NULL) + if (m_template == nullptr) { m_fp.printError("Unable to create template class. May not be installed."); return -1; @@ -708,12 +708,12 @@ enum PARSE_ENUM_ASSIGNMENT, PARSE_ENUM_VALUE } parseState = PARSE_ENUM_TOKEN; -TemplateData::EnumList * enumList = NULL; // current list being defined -TemplateData::EnumData * enumData = NULL; // current item being defined +TemplateData::EnumList * enumList = nullptr; // current list being defined +TemplateData::EnumData * enumData = nullptr; // current item being defined int currentEnumValue = 0; File fp; - Filename headerFilename(NULL, NULL, headerName, NULL); + Filename headerFilename(nullptr, nullptr, headerName, nullptr); int i = 0; while (!fp.exists(headerFilename) && i < MAX_DIRECTORY_DEPTH) { @@ -744,7 +744,7 @@ int currentEnumValue = 0; } const char * line = m_buffer; - while (line != NULL) + while (line != nullptr) { const char * templine = getNextToken(line, m_token); switch (parseState) @@ -788,7 +788,7 @@ int currentEnumValue = 0; case PARSE_END_BRACKET : if (*m_token == '}') { - enumList = NULL; + enumList = nullptr; parseState = PARSE_ENUM_TOKEN; } else @@ -798,7 +798,7 @@ int currentEnumValue = 0; } break; case PARSE_ENUM_DEF: - if (isalpha(*m_token) && enumList != NULL) + if (isalpha(*m_token) && enumList != nullptr) { enumList->push_back(TemplateData::EnumData()); enumData = &enumList->back(); @@ -815,7 +815,7 @@ int currentEnumValue = 0; { enumData->value = currentEnumValue++; templine = line; - enumData = NULL; + enumData = nullptr; parseState = PARSE_END_BRACKET; } break; @@ -838,7 +838,7 @@ int currentEnumValue = 0; } currentEnumValue = (*iter).value; enumData->value = currentEnumValue++; - enumData = NULL; + enumData = nullptr; parseState = PARSE_END_BRACKET; } else @@ -895,7 +895,7 @@ const char * TpfFile::parseAssignment(const char *line) // get the parameter type info m_parameter = m_templateData->getParameter(m_token); - if (m_parameter == NULL) + if (m_parameter == nullptr) { std::string errmsg = "cannot find parameter "; errmsg += m_token; @@ -915,7 +915,7 @@ const char * TpfFile::parseAssignment(const char *line) m_fp.printError("non-array parameter being assigned as array"); return CHAR_ERROR; } - if (line == NULL) + if (line == nullptr) { // we need to read the next line to continue parsing line = goToNextLine(); @@ -943,7 +943,7 @@ const char * TpfFile::parseAssignment(const char *line) } // check for the ending ] line = getNextToken(line, m_token); - if (line == NULL) + if (line == nullptr) { m_fp.printEolError(); return CHAR_ERROR; @@ -954,13 +954,13 @@ const char * TpfFile::parseAssignment(const char *line) return CHAR_ERROR; } line = getNextToken(line, m_token); - if (line == NULL) + if (line == nullptr) { m_fp.printEolError(); return CHAR_ERROR; } } - else if (line == NULL) + else if (line == nullptr) { m_fp.printEolError(); return CHAR_ERROR; @@ -1038,7 +1038,7 @@ const char * TpfFile::parseAssignment(const char *line) * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const char *line) @@ -1064,7 +1064,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const if (line == CHAR_ERROR) return CHAR_ERROR; - if (line != NULL && *line == 'd') + if (line != nullptr && *line == 'd') { // rolling die int base = 0; @@ -1115,7 +1115,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const } param.setValue(num_dice, num_sides, base); } - else if (line != NULL && *line == '.' && *(line+1) == '.') + else if (line != nullptr && *line == '.' && *(line+1) == '.') { // range int min_value = value; @@ -1168,7 +1168,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const tempLine = m_token; char tempBuffer[64]; std::vector enumList; - while (tempLine != NULL) + while (tempLine != nullptr) { tempLine = getNextToken(tempLine, tempBuffer); if (isalpha(*tempBuffer)) @@ -1178,7 +1178,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const } } } - else if (*m_token == '.' && tempLine != NULL && *tempLine == '.') + else if (*m_token == '.' && tempLine != nullptr && *tempLine == '.') { // range with lower bound of INT_MIN line = tempLine + 1; @@ -1232,7 +1232,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const return CHAR_ERROR; } line = parseIntegerParameter(param, line); - if (line != NULL && *line == '%') + if (line != nullptr && *line == '%') { // % offset from base value line = getNextToken(line, m_token); @@ -1257,7 +1257,7 @@ const char * TpfFile::parseIntegerParameter(CompilerIntegerParam & param, const * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseFloatParameter(FloatParam & param, const char *line) @@ -1278,7 +1278,7 @@ const char * TpfFile::parseFloatParameter(FloatParam & param, const char *line) } else if (isfloat(m_token)) { - if (line != NULL && *line == '.' && *(line+1) == '.') + if (line != nullptr && *line == '.' && *(line+1) == '.') { // range float min_value = static_cast(atof(m_token)); @@ -1325,7 +1325,7 @@ const char * TpfFile::parseFloatParameter(FloatParam & param, const char *line) param.setValue(value); } } - else if (*m_token == '.' && line != NULL && *line == '.') + else if (*m_token == '.' && line != nullptr && *line == '.') { // range with lower bound of -FLT_MAX ++line; @@ -1378,7 +1378,7 @@ const char * TpfFile::parseFloatParameter(FloatParam & param, const char *line) return CHAR_ERROR; } line = parseFloatParameter(param, line); - if (line != NULL && *line == '%') + if (line != nullptr && *line == '%') { // % offset from base value line = getNextToken(line, m_token); @@ -1414,7 +1414,7 @@ const char * TpfFile::parseFloatParameter(FloatParam & param, const char *line) * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseBoolParameter(BoolParam & param, const char *line) @@ -1455,7 +1455,7 @@ const char * TpfFile::parseBoolParameter(BoolParam & param, const char *line) * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseStringParameter(StringParam & param, const char *line) @@ -1494,7 +1494,7 @@ const char * TpfFile::parseStringParameter(StringParam & param, const char *line * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseStringIdParameter(StringIdParam & param, const char *line) @@ -1530,7 +1530,7 @@ const char * TpfFile::parseStringIdParameter(StringIdParam & param, const char * * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseFilenameParameter(StringParam & param, const char *line) @@ -1586,7 +1586,7 @@ const char * TpfFile::parseFilenameParameter(StringParam & param, const char *li * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseVectorParameter(VectorParam & param, const char *line) @@ -1648,7 +1648,7 @@ const char * TpfFile::parseVectorParameter(VectorParam & param, const char *line * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseTemplateParameter(StringParam & param, const char *line) @@ -1662,7 +1662,7 @@ const char * TpfFile::parseTemplateParameter(StringParam & param, const char *li * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseEnumParameter(CompilerIntegerParam & param, const char *line) @@ -1707,7 +1707,7 @@ const char * TpfFile::parseEnumParameter(CompilerIntegerParam & param, const cha * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseDynamicVariableParameter(DynamicVariableParam & param, @@ -1731,7 +1731,7 @@ const char * TpfFile::parseDynamicVariableParameter(DynamicVariableParam & param if (*m_token == '+') { // extending an objevar list - if (m_template != NULL && m_template->getBaseTemplateName().empty()) + if (m_template != nullptr && m_template->getBaseTemplateName().empty()) { m_fp.printError("trying to extend an objvar list from a base template"); return CHAR_ERROR; @@ -1746,7 +1746,7 @@ const char * TpfFile::parseDynamicVariableParameter(DynamicVariableParam & param } else { - if (line == NULL) + if (line == nullptr) { // we need to read the next line to continue parsing line = goToNextLine(); @@ -1786,7 +1786,7 @@ const char * TpfFile::parseDynamicVariableParameter(DynamicVariableParam & param * @param param a DynamicVariableParamData containing an empty list * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseDynamicVariableParameterList( @@ -1797,7 +1797,7 @@ std::string name; NOT_NULL(line); if (data.m_type != DynamicVariableParamData::LIST || - data.m_data.lparam == NULL) + data.m_data.lparam == nullptr) { m_fp.printError("parse objvar list not given a list"); return CHAR_ERROR; @@ -1938,7 +1938,7 @@ std::string name; } else { - if (line == NULL) + if (line == nullptr) { // we need to read the next line to continue parsing line = goToNextLine(); @@ -1984,7 +1984,7 @@ std::string name; * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseStructParameter(StructParamOT & param, const char *line) @@ -2077,7 +2077,7 @@ const char * TpfFile::parseStructParameter(StructParamOT & param, const char *li * @param param template parameter * @param line buffer containing the assignment statement * - * @return character in line where parsing stopped, or NULL if at eol, or -1 if + * @return character in line where parsing stopped, or nullptr if at eol, or -1 if * error */ const char * TpfFile::parseTriggerVolumeParameter(TriggerVolumeParam & param, @@ -2313,7 +2313,7 @@ Q * param; file.m_fp.printError("expected [ at start of list"); return CHAR_ERROR; } - if (line == NULL) + if (line == nullptr) { // we need to read the next line to continue parsing line = file.goToNextLine(); @@ -2339,7 +2339,7 @@ Q * param; // get the next parameters in the list param = (*getParamFunc)(*file.m_template, file.m_parameter->name, index); - if (param == NULL) + if (param == nullptr) { std::string errmsg = "cannot find parameter " + file.m_parameter->name; file.m_fp.printError(errmsg.c_str()); @@ -2385,7 +2385,7 @@ Q * param; arrayIndex = 0; param = (*getParamFunc)(*file.m_template, file.m_parameter->name, arrayIndex); - if (param == NULL) + if (param == nullptr) { // if the tpf version is less than the current version, print a // warning and ignore @@ -2396,7 +2396,7 @@ Q * param; " due to being removed from later version (need to update the " "template to the latest version)"; file.m_fp.printWarning(errmsg.c_str()); - return NULL; + return nullptr; } else { @@ -2434,7 +2434,7 @@ const char *parseWeightedList( for (;;) { VALUE value; - Q *valueParam = NULL; + Q *valueParam = nullptr; value.value = valueParam = new Q; list->push_back(value); VALUE *newValue = &list->back(); @@ -2505,7 +2505,7 @@ std::string TpfFile::getFileName() const const std::string & TpfFile::getBaseTemplateName() const { - if (m_template != NULL) + if (m_template != nullptr) return m_template->getBaseTemplateName(); return m_baseTemplateName; } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfTemplate.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfTemplate.cpp index 3773bcfd..2a0d76c0 100755 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfTemplate.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfTemplate.cpp @@ -21,9 +21,9 @@ */ TpfTemplate::TpfTemplate(const std::string & filename) : ObjectTemplate(filename), - m_parentFile(NULL), + m_parentFile(nullptr), m_baseTemplateName(), - m_baseTemplateFile(NULL) + m_baseTemplateFile(nullptr) { } // TpfTemplate::TpfTemplate @@ -32,12 +32,12 @@ TpfTemplate::TpfTemplate(const std::string & filename) : */ TpfTemplate::~TpfTemplate() { - m_parentFile = NULL; + m_parentFile = nullptr; m_baseTemplateName.clear(); - if (m_baseTemplateFile != NULL) + if (m_baseTemplateFile != nullptr) { delete m_baseTemplateFile; - m_baseTemplateFile = NULL; + m_baseTemplateFile = nullptr; } } // TpfTemplate::~TpfTemplate @@ -52,18 +52,18 @@ int TpfTemplate::setBaseTemplateName(const std::string & name) { m_baseTemplateName = name; - if (m_parentFile == NULL) + if (m_parentFile == nullptr) return -1; // load the base template - if (m_baseTemplateFile != NULL) + if (m_baseTemplateFile != nullptr) { delete m_baseTemplateFile; - m_baseTemplateFile = NULL; + m_baseTemplateFile = nullptr; } - Filename baseTemplateFileName(NULL, NULL, name.c_str(), TEMPLATE_EXTENSION); - Filename sourceTpfPath(NULL, m_parentFile->getTpfPath().c_str(), NULL, NULL); + Filename baseTemplateFileName(nullptr, nullptr, name.c_str(), TEMPLATE_EXTENSION); + Filename sourceTpfPath(nullptr, m_parentFile->getTpfPath().c_str(), nullptr, nullptr); Filename tempPath(baseTemplateFileName); tempPath.setPath(sourceTpfPath.getPath().c_str()); @@ -93,9 +93,9 @@ int TpfTemplate::setBaseTemplateName(const std::string & name) */ TpfTemplate * TpfTemplate::getBaseTemplate(void) const { - if (m_baseTemplateFile != NULL) + if (m_baseTemplateFile != nullptr) return m_baseTemplateFile->getTemplate(); - return NULL; + return nullptr; } // TpfTemplate::getBaseTemplate /** @@ -115,14 +115,14 @@ void TpfTemplate::save(Iff &file) * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ CompilerIntegerParam *TpfTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getCompilerIntegerParam /** @@ -132,14 +132,14 @@ CompilerIntegerParam *TpfTemplate::getCompilerIntegerParam(const char *name, boo * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ FloatParam *TpfTemplate::getFloatParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getFloatParam /** @@ -149,14 +149,14 @@ FloatParam *TpfTemplate::getFloatParam(const char *name, bool deepCheck, int ind * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ BoolParam *TpfTemplate::getBoolParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getBoolParam /** @@ -166,14 +166,14 @@ BoolParam *TpfTemplate::getBoolParam(const char *name, bool deepCheck, int index * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ StringParam *TpfTemplate::getStringParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getStringParam /** @@ -183,14 +183,14 @@ StringParam *TpfTemplate::getStringParam(const char *name, bool deepCheck, int i * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ StringIdParam *TpfTemplate::getStringIdParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getStringIdParam /** @@ -200,14 +200,14 @@ StringIdParam *TpfTemplate::getStringIdParam(const char *name, bool deepCheck, i * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ VectorParam *TpfTemplate::getVectorParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getVectorParam /** @@ -217,14 +217,14 @@ VectorParam *TpfTemplate::getVectorParam(const char *name, bool deepCheck, int i * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ DynamicVariableParam *TpfTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getDynamicVariableParam /** @@ -234,14 +234,14 @@ DynamicVariableParam *TpfTemplate::getDynamicVariableParam(const char *name, boo * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ StructParamOT *TpfTemplate::getStructParamOT(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getStructParamOT /** @@ -251,14 +251,14 @@ StructParamOT *TpfTemplate::getStructParamOT(const char *name, bool deepCheck, i * @param deepcheck flag to check base template if the parameter isn't loaded * @param index array index of the parameter * - * @return the parameter, or NULL if not found + * @return the parameter, or nullptr if not found */ TriggerVolumeParam *TpfTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) { UNREF(name); UNREF(deepCheck); UNREF(index); - return NULL; + return nullptr; } // TpfTemplate::getTriggerVolumeParam /** @@ -408,7 +408,7 @@ bool TpfTemplate::isParamLoadedLocal(const std::string &name, bool deepCheck) co { result = true; } - else if (deepCheck && getBaseTemplate() != NULL) + else if (deepCheck && getBaseTemplate() != nullptr) { result = getBaseTemplate()->isParamLoadedLocal(name); } @@ -433,7 +433,7 @@ bool TpfTemplate::isParamPureVirtualLocal(const std::string &name, bool deepChec { result = true; } - else if (deepCheck && (getBaseTemplate() != NULL)) + else if (deepCheck && (getBaseTemplate() != nullptr)) { result = getBaseTemplate()->isParamPureVirtualLocal(name); } diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp index 3aca2005..3ffa961b 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp @@ -803,7 +803,7 @@ TerrainGeneratorWaterType ProceduralTerrainAppearance::getWaterType (const Vecto bool ProceduralTerrainAppearance::getWater (const int chunkX, const int chunkZ) const { - if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != NULL) + if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != nullptr) return proceduralTerrainAppearanceTemplate->getBakedTerrain ()->getWater (chunkX, chunkZ); return false; @@ -813,7 +813,7 @@ bool ProceduralTerrainAppearance::getWater (const int chunkX, const int chunkZ) bool ProceduralTerrainAppearance::getSlope (const int chunkX, const int chunkZ) const { - if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != NULL) + if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != nullptr) return proceduralTerrainAppearanceTemplate->getBakedTerrain ()->getSlope (chunkX, chunkZ); return false; @@ -823,7 +823,7 @@ bool ProceduralTerrainAppearance::getSlope (const int chunkX, const int chunkZ) bool ProceduralTerrainAppearance::getWater (const Rectangle2d& rectangle) const { - if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != NULL) + if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != nullptr) return proceduralTerrainAppearanceTemplate->getBakedTerrain ()->getWater (rectangle); return false; @@ -833,7 +833,7 @@ bool ProceduralTerrainAppearance::getWater (const Rectangle2d& rectangle) const bool ProceduralTerrainAppearance::getSlope (const Rectangle2d& rectangle) const { - if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != NULL) + if (proceduralTerrainAppearanceTemplate->getBakedTerrain () != nullptr) return proceduralTerrainAppearanceTemplate->getBakedTerrain ()->getSlope (rectangle); return false; @@ -877,7 +877,7 @@ float ProceduralTerrainAppearance::alter (float elapsedTime) #ifdef _DEBUG const char* const appearanceTemplateName = object->getAppearance () && object->getAppearance ()->getAppearanceTemplate () ? object->getAppearance ()->getAppearanceTemplate ()->getCrcName ().getString () : 0; const Vector position = object->getPosition_w (); - DEBUG_REPORT_LOG (ms_logFloraCreation, ("flora delete: <%1.2f, %1.2f> [%s]\n", position.x, position.z, appearanceTemplateName ? appearanceTemplateName : "null")); + DEBUG_REPORT_LOG (ms_logFloraCreation, ("flora delete: <%1.2f, %1.2f> [%s]\n", position.x, position.z, appearanceTemplateName ? appearanceTemplateName : "nullptr")); #endif delete object; } @@ -1054,7 +1054,7 @@ bool ProceduralTerrainAppearance::isPassableForceChunkCreation(const Vector& pos #ifndef WIN32 if (!chunk) - LOG("PTA::isPFCC", ("(%g,%g,%g) chunk is NULL, %d/%d/%d/%d", position.x, position.y, position.z, getNumberOfChunks(), maximumNumberOfChunksAllowed, getNumberOfReferenceObjects(), maximumNumberOfChunksAlongSide)); + LOG("PTA::isPFCC", ("(%g,%g,%g) chunk is nullptr, %d/%d/%d/%d", position.x, position.y, position.z, getNumberOfChunks(), maximumNumberOfChunksAllowed, getNumberOfReferenceObjects(), maximumNumberOfChunksAlongSide)); #endif return isPassable; @@ -1183,7 +1183,7 @@ void ProceduralTerrainAppearance::_legacyCreateFlora(const Chunk* const chunk) object->yaw_o (yaw); Appearance * const appearance = AppearanceTemplateList::createAppearance (FileName (FileName::P_appearance, data.familyChildData->appearanceTemplateName)); - if (appearance != NULL) { + if (appearance != nullptr) { appearance->setKeepAlive (true); object->setAppearance (appearance); object->setScale (Vector::xyz111 * scale); @@ -1340,7 +1340,7 @@ void ProceduralTerrainAppearance::createFlora (const Chunk* const chunk) object->yaw_o (yaw); Appearance * const appearance = AppearanceTemplateList::createAppearance (FileName (FileName::P_appearance, data.familyChildData->appearanceTemplateName)); - if (appearance != NULL) { + if (appearance != nullptr) { appearance->setKeepAlive (true); object->setAppearance (appearance); object->setScale (Vector::xyz111 * scale); @@ -1403,7 +1403,7 @@ void ProceduralTerrainAppearance::destroyFlora (const Chunk* const chunk) { #ifdef _DEBUG const char* const appearanceTemplateName = object->getAppearance () && object->getAppearance ()->getAppearanceTemplate () ? object->getAppearance ()->getAppearanceTemplate ()->getCrcName ().getString () : 0; - DEBUG_REPORT_LOG (ms_logFloraCreation, ("flora cache: <%1.2f, %1.2f> [%s]\n", position.x, position.z, appearanceTemplateName ? appearanceTemplateName : "null")); + DEBUG_REPORT_LOG (ms_logFloraCreation, ("flora cache: <%1.2f, %1.2f> [%s]\n", position.x, position.z, appearanceTemplateName ? appearanceTemplateName : "nullptr")); #endif iter->second->removeFromWorld (); IGNORE_RETURN (m_cachedFloraMap->insert (std::make_pair (key, iter->second))); diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.cpp index 5cf95df7..dbe9e3fe 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.cpp @@ -910,7 +910,7 @@ void SamplerProceduralTerrainAppearance::generateBetween(Vector const & start_o, } } - // add on all chunks to be generated to chunkList. if we encounter invalid chunks (null), don't include them + // add on all chunks to be generated to chunkList. if we encounter invalid chunks (nullptr), don't include them const Chunk* chunk; for (GenerateList::iterator iter = generateList.begin(); iter != generateList.end(); ++iter) { diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.cpp index 3045b129..938c4f2f 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.cpp @@ -805,7 +805,7 @@ void ServerProceduralTerrainAppearance::generateBetween(Vector const & start_o, } } - // add on all chunks to be generated to chunkList. if we encounter invalid chunks (null), don't include them + // add on all chunks to be generated to chunkList. if we encounter invalid chunks (nullptr), don't include them const Chunk* chunk; for (GenerateList::iterator iter = generateList.begin(); iter != generateList.end(); ++iter) { diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.cpp index 275a6986..08cd30a7 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.cpp @@ -534,9 +534,9 @@ void TerrainQuadTree::Node::pruneTree () /** * Find the leaf node which directly contains this chunk. * -* @param aChunk the chunk to be located. If non null, the parameters ax and az are ignored. -* @param ax the chunkspace coordinate of the chunk to be located. Only used if param aChunk is null -* @param az the chunkspace coordinate of the chunk to be located. Only used if param aChunk is null +* @param aChunk the chunk to be located. If non nullptr, the parameters ax and az are ignored. +* @param ax the chunkspace coordinate of the chunk to be located. Only used if param aChunk is nullptr +* @param az the chunkspace coordinate of the chunk to be located. Only used if param aChunk is nullptr */ TerrainQuadTree::Node * TerrainQuadTree::Node::findChunkNode (const ProceduralTerrainAppearance::Chunk * const chunk, int x, int z, int size) { @@ -754,9 +754,9 @@ TerrainQuadTree::Node * TerrainQuadTree::Node::findFirstRenderableNode (const in /** * hasChunk is a wrapper for findChunkNode * -* @param aChunk the chunk to be located. If non null, the parameters ax and az are ignored. -* @param ax the chunkspace coordinate of the chunk to be located. Only used if param aChunk is null -* @param az the chunkspace coordinate of the chunk to be located. Only used if param aChunk is null +* @param aChunk the chunk to be located. If non nullptr, the parameters ax and az are ignored. +* @param ax the chunkspace coordinate of the chunk to be located. Only used if param aChunk is nullptr +* @param az the chunkspace coordinate of the chunk to be located. Only used if param aChunk is nullptr * @param chunkSize the relative size of the chunk in chunkspace. */ bool TerrainQuadTree::Node::hasChunk (const ProceduralTerrainAppearance::Chunk * const chunk, const int x, const int z, const int size) diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h b/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h index cb92dce0..a48d759e 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.h @@ -320,7 +320,7 @@ public: /** * TerrainQuadTree::Iterator is a preorder iterator - * To use an iterator, loop while the current node is non-null. If the + * To use an iterator, loop while the current node is non-nullptr. If the * current node's subtree should be processed further, call descend () * on the iterator, otherwise call advance () to go to the next node. * Either advance () or descend () should be called every loop iteration, diff --git a/engine/shared/library/sharedTerrain/src/shared/core/WaterTypeManager.cpp b/engine/shared/library/sharedTerrain/src/shared/core/WaterTypeManager.cpp index 65b5b1d0..4ec613d1 100755 --- a/engine/shared/library/sharedTerrain/src/shared/core/WaterTypeManager.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/core/WaterTypeManager.cpp @@ -19,8 +19,8 @@ // ====================================================================== bool WaterTypeManager::ms_installed = false; -WaterTypeManager::WaterTypeDataType * WaterTypeManager::ms_waterTypeData=NULL; -WaterTypeManager::CreatureWaterTypeDataType* WaterTypeManager::ms_creatureWaterTypeData=NULL; +WaterTypeManager::WaterTypeDataType * WaterTypeManager::ms_waterTypeData=nullptr; +WaterTypeManager::CreatureWaterTypeDataType* WaterTypeManager::ms_creatureWaterTypeData=nullptr; // ====================================================================== @@ -116,9 +116,9 @@ void WaterTypeManager::remove() } delete ms_waterTypeData; - ms_waterTypeData=NULL; + ms_waterTypeData=nullptr; delete ms_creatureWaterTypeData; - ms_creatureWaterTypeData=NULL; + ms_creatureWaterTypeData=nullptr; ms_installed = false; } diff --git a/engine/shared/library/sharedTerrain/src/shared/generator/BitmapGroup.cpp b/engine/shared/library/sharedTerrain/src/shared/generator/BitmapGroup.cpp index e9215147..9d26743f 100755 --- a/engine/shared/library/sharedTerrain/src/shared/generator/BitmapGroup.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/generator/BitmapGroup.cpp @@ -159,7 +159,7 @@ void BitmapGroup::Family::loadBitmapByFilename() { if(!m_bitmapName) { - DEBUG_WARNING (true, ("BitmapGroup::Family::loadBitmapByFilename() - invalid image - m_bitmapName is NULL")); + DEBUG_WARNING (true, ("BitmapGroup::Family::loadBitmapByFilename() - invalid image - m_bitmapName is nullptr")); } else { diff --git a/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.cpp b/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.cpp index b511c3a4..cbb9562d 100755 --- a/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/generator/ShaderGroup.cpp @@ -671,7 +671,7 @@ void ShaderGroup::load_0000 (Iff& iff) //-- add family Family* family = new Family (familyId); - family->setName ("null"); + family->setName ("nullptr"); PackedRgb color; color.r = 255; diff --git a/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp b/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp index f48a7b5d..5206146a 100755 --- a/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.cpp @@ -159,7 +159,7 @@ TerrainObject::~TerrainObject () TerrainObject::removeFromWorld (); DEBUG_FATAL (ms_instance != this, ("TerrainObject instance is not this object")); - ms_instance = NULL; + ms_instance = nullptr; } //------------------------------------------------------------------- diff --git a/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp b/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp index 30bf9486..398ef20e 100755 --- a/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp +++ b/engine/shared/library/sharedUtility/src/shared/CachedFileManager.cpp @@ -69,7 +69,7 @@ namespace CachedFileManagerNamespace Tag const TAG_CACH = TAG (C,A,C,H); - char * ms_filenames = NULL; + char * ms_filenames = nullptr; size_t ms_filenamesLength = 0; size_t ms_filenamesCurrentPos = 0; unsigned long ms_totalTime; @@ -150,7 +150,7 @@ void CachedFileManager::install(bool const allowFileCaching) iff.enterForm (TAG_CACH); iff.enterChunk (TAG_0000); - //-- the entire chunk is filled with null terminated strings + //-- the entire chunk is filled with nullptr terminated strings ms_filenamesLength = iff.getChunkLengthLeft(); ms_filenames = iff.readRest_char(); @@ -168,7 +168,7 @@ void CachedFileManager::install(bool const allowFileCaching) void CachedFileManagerNamespace::remove () { delete[] ms_filenames; - ms_filenames = NULL; + ms_filenames = nullptr; ms_filenamesCurrentPos = 0; ms_filenamesLength = 0; @@ -255,7 +255,7 @@ void CachedFileManager::preloadSomeAssets () #endif delete[] ms_filenames; - ms_filenames = NULL; + ms_filenames = nullptr; ms_filenamesCurrentPos = 0; ms_filenamesLength = 0; } @@ -266,7 +266,7 @@ void CachedFileManager::preloadSomeAssets () bool CachedFileManager::donePreloading () { - return ms_filenames == NULL || (ms_filenamesCurrentPos >= ms_filenamesLength); + return ms_filenames == nullptr || (ms_filenamesCurrentPos >= ms_filenamesLength); } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedUtility/src/shared/CurrentUserOptionManager.cpp b/engine/shared/library/sharedUtility/src/shared/CurrentUserOptionManager.cpp index 626c7fcb..dfb11487 100755 --- a/engine/shared/library/sharedUtility/src/shared/CurrentUserOptionManager.cpp +++ b/engine/shared/library/sharedUtility/src/shared/CurrentUserOptionManager.cpp @@ -70,7 +70,7 @@ void CurrentUserOptionManager::load (char const * const userName) ms_optionManager->load (ms_userName.c_str ()); } else - DEBUG_WARNING (true, ("CurrentUserOptionManager::load: userName is null")); + DEBUG_WARNING (true, ("CurrentUserOptionManager::load: userName is nullptr")); } // ---------------------------------------------------------------------- @@ -82,7 +82,7 @@ void CurrentUserOptionManager::save () if (!ms_userName.empty ()) ms_optionManager->save (ms_userName.c_str ()); else - DEBUG_REPORT_LOG (s_verbose, ("CurrentUserOptionManager::save: userName is null\n")); + DEBUG_REPORT_LOG (s_verbose, ("CurrentUserOptionManager::save: userName is nullptr\n")); } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp index 0d08193b..2a0974c7 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp @@ -50,7 +50,7 @@ DataTable::~DataTable() if (*k) { delete static_cast *>(*k); - *k = NULL; + *k = nullptr; } } break; @@ -59,7 +59,7 @@ DataTable::~DataTable() if (*k) { delete static_cast *>(*k); - *k = NULL; + *k = nullptr; } } @@ -69,7 +69,7 @@ DataTable::~DataTable() if (*k) { delete static_cast, std::multimap > *>(*k); - *k = NULL; + *k = nullptr; } } @@ -83,7 +83,7 @@ DataTable::~DataTable() case DataTableColumnType::DT_PackedObjVars: default: { - WARNING_STRICT_FATAL((*k) != NULL, ("Bad column Index %d. Unsupported datatype. This may leak memory.", count)); + WARNING_STRICT_FATAL((*k) != nullptr, ("Bad column Index %d. Unsupported datatype. This may leak memory.", count)); } break; } @@ -112,7 +112,7 @@ DataTable::~DataTable() } delete m_columnIndexMap; - m_columnIndexMap = NULL; + m_columnIndexMap = nullptr; } //---------------------------------------------------------------------------- @@ -464,12 +464,12 @@ void DataTable::load(Iff & iff) for (int i = 0; i < count; ++i) { //initialize the table index used for searching. - m_index.push_back(NULL); + m_index.push_back(nullptr); } buildColumnIndexMap(); - if (NULL != iff.getFileName()) + if (nullptr != iff.getFileName()) m_name = iff.getFileName(); else m_name.clear(); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableColumnType.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableColumnType.cpp index e0ac3cf4..2f73061b 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableColumnType.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableColumnType.cpp @@ -148,7 +148,7 @@ DataTableColumnType::DataTableColumnType(std::string const &desc) : std::string::size_type endPos = enumList.find(','); std::string label = enumList.substr(0, eqPos); std::string val = enumList.substr(eqPos+1, endPos-eqPos-1); - (*m_enumMap)[label] = static_cast(strtol(val.c_str(), NULL, 0)); + (*m_enumMap)[label] = static_cast(strtol(val.c_str(), nullptr, 0)); enumList.erase(0, endPos+1); } // assure the default is a member of the enumeration @@ -173,7 +173,7 @@ DataTableColumnType::DataTableColumnType(std::string const &desc) : std::string::size_type endPos = enumList.find(','); std::string label = enumList.substr(0, eqPos); std::string val = enumList.substr(eqPos+1, endPos-eqPos-1); - int bit = static_cast(strtol(val.c_str(), NULL, 0)); + int bit = static_cast(strtol(val.c_str(), nullptr, 0)); if((bit < 1) || (bit > 32)) { WARNING(true, ("Flags value [%s] is not a whole number from 1 to 32", label.c_str())); @@ -247,7 +247,7 @@ void DataTableColumnType::createDefaultCell() switch(m_basicType) { case DT_Int: - m_defaultCell = new DataTableCell(static_cast(strtol(value.c_str(), NULL, 0))); + m_defaultCell = new DataTableCell(static_cast(strtol(value.c_str(), nullptr, 0))); break; case DT_Float: m_defaultCell = new DataTableCell(static_cast(atof(value.c_str()))); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp index 671a5b9c..f6f633c5 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp @@ -129,7 +129,7 @@ DataTable * DataTableManager::getTable(const std::string& table, bool openIfNotF if (!dt) { DEBUG_WARNING(true, ("Could not find table [%s]", table.c_str())); - return NULL; + return nullptr; } else { @@ -140,7 +140,7 @@ DataTable * DataTableManager::getTable(const std::string& table, bool openIfNotF } else { - return NULL; + return nullptr; } } @@ -158,7 +158,7 @@ DataTable* DataTableManager::reload(const std::string & table) DataTable * const dataTable = open(table); - if (dataTable != NULL) + if (dataTable != nullptr) { std::multimap::const_iterator i = m_reloadCallbacks.lower_bound(table); for (; i != m_reloadCallbacks.end() && (*i).first == table; ++i) @@ -175,7 +175,7 @@ DataTable* DataTableManager::reloadIfOpen(const std::string & table) if(isOpen(table)) return reload(table); else - return NULL; + return nullptr; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp index d3dc927c..795c8696 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp @@ -591,7 +591,7 @@ bool DataTableWriter::save(const char * outputFileName, bool optional) const { if (!outputFileName || outputFileName[0] != '\0') { - DEBUG_FATAL(true, ("OutputFileName is NULL or empty.")); + DEBUG_FATAL(true, ("OutputFileName is nullptr or empty.")); return false; } @@ -728,7 +728,7 @@ DataTableCell *DataTableWriter::_getNewCell(DataTableColumnType const &columnTyp switch (columnType.getBasicType()) { case DataTableColumnType::DT_Int: - return new DataTableCell(static_cast(strtol(value.c_str(), NULL, 0))); + return new DataTableCell(static_cast(strtol(value.c_str(), nullptr, 0))); break; case DataTableColumnType::DT_Float: return new DataTableCell(static_cast(atof(value.c_str()))); diff --git a/engine/shared/library/sharedUtility/src/shared/FileName.cpp b/engine/shared/library/sharedUtility/src/shared/FileName.cpp index 93b579cf..1e8936f4 100755 --- a/engine/shared/library/sharedUtility/src/shared/FileName.cpp +++ b/engine/shared/library/sharedUtility/src/shared/FileName.cpp @@ -52,14 +52,14 @@ FileName::FileName (FileName::Path path, const char* filename, const char* ext) // see if the filename already begins with the path const char *prePath = pathTable [path].path; - if (prePath != NULL && *prePath != '\0') + if (prePath != nullptr && *prePath != '\0') { if (strncmp(filename, prePath, strlen(prePath)) == 0) prePath = ""; } // see if the filename already ends in the extension - if (ext != NULL && *ext != '\0') + if (ext != nullptr && *ext != '\0') { int extLen = strlen(ext); int filenameLen = strlen(filename); diff --git a/engine/shared/library/sharedUtility/src/shared/RotaryCache.cpp b/engine/shared/library/sharedUtility/src/shared/RotaryCache.cpp index b406fe08..6292e0d3 100644 --- a/engine/shared/library/sharedUtility/src/shared/RotaryCache.cpp +++ b/engine/shared/library/sharedUtility/src/shared/RotaryCache.cpp @@ -42,7 +42,7 @@ void* RotaryCache::add(const CrcLowerString& keyString, void* valuePtr) { CacheListEntry listEntry; - void* returnVal = NULL; + void* returnVal = nullptr; listEntry.key = keyString; listEntry.value = valuePtr; @@ -93,7 +93,7 @@ RotaryCache::fetch(const CrcLowerString& keyString) return entryList.value; } - return NULL; + return nullptr; } void* @@ -103,7 +103,7 @@ RotaryCache::remove(const CrcLowerString& keyString) if(iterFind != mMap.end()) { - void* retVal = NULL; + void* retVal = nullptr; CacheMapEntry& entryFind = (*iterFind).second; RotaryList::iterator iterList = entryFind.iter; @@ -119,7 +119,7 @@ RotaryCache::remove(const CrcLowerString& keyString) return retVal; } - return NULL; + return nullptr; } @@ -143,7 +143,7 @@ RotaryCache::getNext() return retVal; } - return NULL; + return nullptr; } void diff --git a/engine/shared/library/sharedUtility/src/shared/SetupSharedUtility.cpp b/engine/shared/library/sharedUtility/src/shared/SetupSharedUtility.cpp index 3336890f..166f5548 100755 --- a/engine/shared/library/sharedUtility/src/shared/SetupSharedUtility.cpp +++ b/engine/shared/library/sharedUtility/src/shared/SetupSharedUtility.cpp @@ -109,7 +109,7 @@ void SetupSharedUtility::installFileManifestEntries () if (!fileName.empty()) FileManifest::addStoredManifestEntry(fileName.c_str(), sceneId.c_str(), fileSize); else - DEBUG_WARNING(true, ("SetupSharedUtility::installFileManifestEntries(): found an entry with a null filename: (row %i)\n", i)); + DEBUG_WARNING(true, ("SetupSharedUtility::installFileManifestEntries(): found an entry with a nullptr filename: (row %i)\n", i)); } } else diff --git a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp index 751aa045..93af0652 100755 --- a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.cpp @@ -951,7 +951,7 @@ DynamicVariableParamData::~DynamicVariableParamData() for (int i = 0; i < count; ++i) { DynamicVariableParamData *temp = m_data.lparam->at(i); - m_data.lparam->at(i) = NULL; + m_data.lparam->at(i) = nullptr; delete temp; } delete m_data.lparam; @@ -1134,15 +1134,15 @@ void DynamicVariableParam::cleanSingleParam(void) { case DynamicVariableParamData::INTEGER: delete m_dataSingle.m_data.iparam; - m_dataSingle.m_data.iparam = NULL; + m_dataSingle.m_data.iparam = nullptr; break; case DynamicVariableParamData::FLOAT: delete m_dataSingle.m_data.fparam; - m_dataSingle.m_data.fparam = NULL; + m_dataSingle.m_data.fparam = nullptr; break; case DynamicVariableParamData::STRING: delete m_dataSingle.m_data.sparam; - m_dataSingle.m_data.sparam = NULL; + m_dataSingle.m_data.sparam = nullptr; break; case DynamicVariableParamData::LIST: { @@ -1152,11 +1152,11 @@ void DynamicVariableParam::cleanSingleParam(void) ++iter) { delete *iter; - *iter = NULL; + *iter = nullptr; } } delete m_dataSingle.m_data.lparam; - m_dataSingle.m_data.lparam = NULL; + m_dataSingle.m_data.lparam = nullptr; break; case DynamicVariableParamData::UNKNOWN: default: diff --git a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h index e3db2210..9c86d90b 100755 --- a/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h +++ b/engine/shared/library/sharedUtility/src/shared/TemplateParameter.h @@ -210,19 +210,19 @@ inline void TemplateBase::cleanData(void) ++iter) { delete (*iter).value; - (*iter).value = NULL; + (*iter).value = nullptr; } delete m_data.weightedList; - m_data.weightedList = NULL; + m_data.weightedList = nullptr; } break; case RANGE: delete m_data.range; - m_data.range = NULL; + m_data.range = nullptr; break; case DIE_ROLL: delete m_data.dieRoll; - m_data.dieRoll = NULL; + m_data.dieRoll = nullptr; break; case NONE: default: @@ -288,7 +288,7 @@ inline const typename TemplateBase::Range * TemplateBase @@ -296,7 +296,7 @@ inline const typename TemplateBase::DieRoll * TemplateBase { if (m_dataType == DIE_ROLL) return m_data.dieRoll; - return NULL; + return nullptr; } template @@ -304,7 +304,7 @@ inline const typename TemplateBase::WeightedList * Templat { if (m_dataType == WEIGHTED_LIST) return m_data.weightedList; - return NULL; + return nullptr; } template @@ -541,7 +541,7 @@ inline const IntegerParam::DieRoll * IntegerParam::getDieRollStruct(void) const } else { - return NULL; + return nullptr; } } @@ -553,7 +553,7 @@ inline const IntegerParam::Range * IntegerParam::getRangeStruct(void) const } else { - return NULL; + return nullptr; } } @@ -637,7 +637,7 @@ inline const FloatParam::Range * FloatParam::getRangeStruct() const } else { - return NULL; + return nullptr; } } @@ -765,7 +765,7 @@ class TriggerVolumeData { friend class TriggerVolumeParam; public: - TriggerVolumeData(void) : m_name(NULL), m_radius(0.0f) {} + TriggerVolumeData(void) : m_name(nullptr), m_radius(0.0f) {} TriggerVolumeData(const std::string & name, float radius) : m_name(&name), m_radius(radius) {} const std::string & getName(void) const; @@ -962,7 +962,7 @@ inline TemplateBase *StructParam::createNewParam(void) template inline StructParam::StructParam(void) : TemplateBase() { - this->m_dataSingle = NULL; + this->m_dataSingle = nullptr; } // StructParam::StructParam /** @@ -974,7 +974,7 @@ inline StructParam::~StructParam() if (this->m_dataType == TemplateBase::SINGLE) { delete this->m_dataSingle; - this->m_dataSingle = NULL; + this->m_dataSingle = nullptr; this->m_dataType = TemplateBase::NONE; } } // StructParam::~StructParam @@ -986,7 +986,7 @@ template inline void StructParam::cleanSingleParam(void) { delete this->m_dataSingle; - this->m_dataSingle = NULL; + this->m_dataSingle = nullptr; } // StructParam::cleanSingleParam /** diff --git a/engine/shared/library/sharedUtility/src/shared/ValueDictionary.cpp b/engine/shared/library/sharedUtility/src/shared/ValueDictionary.cpp index cb90f847..5e12a64b 100755 --- a/engine/shared/library/sharedUtility/src/shared/ValueDictionary.cpp +++ b/engine/shared/library/sharedUtility/src/shared/ValueDictionary.cpp @@ -103,7 +103,7 @@ bool ValueDictionary::exists(std::string const & name) const ValueTypeBase * ValueDictionary::getCopy(std::string const & name) const { - ValueTypeBase * returnValue = NULL; + ValueTypeBase * returnValue = nullptr; DictionaryValueMap::const_iterator iter = m_valueMap.find(name); if (iter != m_valueMap.end()) diff --git a/engine/shared/library/sharedUtility/src/shared/ValueDictionaryArchive.cpp b/engine/shared/library/sharedUtility/src/shared/ValueDictionaryArchive.cpp index e6a638e0..f6ca8859 100755 --- a/engine/shared/library/sharedUtility/src/shared/ValueDictionaryArchive.cpp +++ b/engine/shared/library/sharedUtility/src/shared/ValueDictionaryArchive.cpp @@ -59,7 +59,7 @@ namespace Archive std::string name; std::string type; - ValueTypeBase * value = NULL; + ValueTypeBase * value = nullptr; ValueObjectUnpackHandlerMap::const_iterator iterFind; for (int i = 0; i < static_cast(count); ++i) { @@ -77,7 +77,7 @@ namespace Archive target.insert(name, *value); delete value; - value = NULL; + value = nullptr; } } diff --git a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp index 2a6d91d0..997a9dee 100755 --- a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp +++ b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocument.cpp @@ -92,7 +92,7 @@ XmlTreeDocument* XmlTreeDocument::createDocument(const char * rootNodeName) doc = xmlNewDoc(BAD_CAST "1.0"); DEBUG_FATAL( !doc, ("Attempted to make new xmlDoc but failed") ); - xmlNode * node = xmlNewNode( NULL, BAD_CAST rootNodeName ); + xmlNode * node = xmlNewNode( nullptr, BAD_CAST rootNodeName ); DEBUG_FATAL( !node, ("Attempted to make root node for new xml document, but failed")); xmlDocSetRootElement(doc, node); @@ -136,8 +136,8 @@ XmlTreeDocument::XmlTreeDocument(CrcString const &name, xmlDoc *xmlDocument) : m_referenceCount(0), m_track( true ) { - DEBUG_FATAL(m_xmlDocument == NULL, ("XmlTreeDocument(): tried to construct with a NULL xmlDocument.")); - WARNING(m_xmlDocument == NULL, ("XmlTreeDocument(): tried to construct with a NULL xmlDocument.")); + DEBUG_FATAL(m_xmlDocument == nullptr, ("XmlTreeDocument(): tried to construct with a nullptr xmlDocument.")); + WARNING(m_xmlDocument == nullptr, ("XmlTreeDocument(): tried to construct with a nullptr xmlDocument.")); } // ---------------------------------------------------------------------- @@ -148,14 +148,14 @@ m_xmlDocument(xmlDocument), m_referenceCount(0), m_track(false) // documents without names are temporary documents for creation of formatted xml { - DEBUG_FATAL(m_xmlDocument == NULL, ("XmlTreeDocument(): tried to construct with a NULL xmlDocument.")); + DEBUG_FATAL(m_xmlDocument == nullptr, ("XmlTreeDocument(): tried to construct with a nullptr xmlDocument.")); } // ---------------------------------------------------------------------- XmlTreeDocument::~XmlTreeDocument() { xmlFreeDoc(m_xmlDocument); - m_xmlDocument = NULL; + m_xmlDocument = nullptr; } // ====================================================================== diff --git a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocumentList.cpp b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocumentList.cpp index 6579b201..2299aaf5 100755 --- a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocumentList.cpp +++ b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeDocumentList.cpp @@ -61,7 +61,7 @@ void XmlTreeDocumentListNamespace::remove() NamedDocumentMap::iterator const endIt = s_documents.end(); for (NamedDocumentMap::iterator it = s_documents.begin(); it != endIt; ++it) { - DEBUG_REPORT_LOG(true, ("-- xml tree document name [%s], reference count [%d].\n", it->first ? it->first->getString() : "", it->second ? it->second->getReferenceCount() : -1)); + DEBUG_REPORT_LOG(true, ("-- xml tree document name [%s], reference count [%d].\n", it->first ? it->first->getString() : "", it->second ? it->second->getReferenceCount() : -1)); } } } @@ -95,7 +95,7 @@ XmlTreeDocument const *XmlTreeDocumentList::fetch(CrcString const &filename) //-- Handle existing entry. if (haveEntry) { - FATAL(!lowerBound->second, ("XmlTreeDocumentList::fetch() found an entry for filename [%s] but the mapped document was NULL.", filename.getString())); + FATAL(!lowerBound->second, ("XmlTreeDocumentList::fetch() found an entry for filename [%s] but the mapped document was nullptr.", filename.getString())); // Increment reference count and return. lowerBound->second->fetch(); @@ -121,7 +121,7 @@ XmlTreeDocument const *XmlTreeDocumentList::fetch(CrcString const &filename) #endif xmlDocPtr const xmlDocument = xmlParseMemory(reinterpret_cast(fileContents), fileSize); - FATAL(!xmlDocument, ("xmlParseMemory() returned NULL when parsing contents of file [%s].", cPathName)); + FATAL(!xmlDocument, ("xmlParseMemory() returned nullptr when parsing contents of file [%s].", cPathName)); #ifdef _DEBUG unsigned long const postDomBytesAllocated = MemoryManager::getCurrentNumberOfBytesAllocated(); @@ -148,7 +148,7 @@ XmlTreeDocument const *XmlTreeDocumentList::fetch(CrcString const &filename) void XmlTreeDocumentList::stopTracking(XmlTreeDocument const *document) { FATAL(!s_installed, ("XmlTreeDocumentList not installed.")); - FATAL(!document, ("XmlTreeDocumentList::stopTracking(): null document passed in.")); + FATAL(!document, ("XmlTreeDocumentList::stopTracking(): nullptr document passed in.")); //-- Find the map entry for the xml tree document. NamedDocumentMap::iterator const findIt = s_documents.find(&(document->getName())); diff --git a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeNode.cpp b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeNode.cpp index c91ff6f6..38692d89 100755 --- a/engine/shared/library/sharedXml/src/shared/tree/XmlTreeNode.cpp +++ b/engine/shared/library/sharedXml/src/shared/tree/XmlTreeNode.cpp @@ -42,7 +42,7 @@ XmlTreeNode::XmlTreeNode(const std::string &name, const std::string &content) : } xmlNode *textNode = xmlNewText(BAD_CAST contentCopy.c_str() ); - m_treeNode = xmlNewNode(NULL, BAD_CAST nameCopy.c_str()); + m_treeNode = xmlNewNode(nullptr, BAD_CAST nameCopy.c_str()); // verify new nodes DEBUG_FATAL(!textNode, ("Failed to create xml text node")); @@ -70,7 +70,7 @@ XmlTreeNode::XmlTreeNode(const std::string &name) : nameCopy = "garbage"; } - m_treeNode = xmlNewNode(NULL, BAD_CAST nameCopy.c_str()); + m_treeNode = xmlNewNode(nullptr, BAD_CAST nameCopy.c_str()); // verify new nodes DEBUG_FATAL(!m_treeNode, ("Failed to create new xml tree node")); @@ -80,7 +80,7 @@ XmlTreeNode::XmlTreeNode(const std::string &name) : XmlTreeNode XmlTreeNode::addChildNode(const char * name) { - DEBUG_FATAL( !m_treeNode, ("Attempted to add child to null xml node")); + DEBUG_FATAL( !m_treeNode, ("Attempted to add child to nullptr xml node")); XmlTreeNode node(name); if (m_treeNode) @@ -109,7 +109,7 @@ void XmlTreeNode::addChild( const XmlTreeNode& node ) bool XmlTreeNode::isNull() const { - return (m_treeNode == NULL); + return (m_treeNode == nullptr); } // ---------------------------------------------------------------------- @@ -140,7 +140,7 @@ void XmlTreeNode::assertIsElement(char const *const elementName) const char const *const nodeName = getName(); UNREF(elementName); UNREF(nodeName); - DEBUG_FATAL(!isElement(), ("expecting element named [%s], found non-element entity named [%s].", elementName ? elementName : "", nodeName)); + DEBUG_FATAL(!isElement(), ("expecting element named [%s], found non-element entity named [%s].", elementName ? elementName : "", nodeName)); DEBUG_FATAL(_stricmp(elementName, nodeName), ("expecting element named [%s], found element named [%s] instead.", nodeName)); } @@ -148,14 +148,14 @@ void XmlTreeNode::assertIsElement(char const *const elementName) const char const *XmlTreeNode::getName() const { - return (m_treeNode ? reinterpret_cast(m_treeNode->name) : ""); + return (m_treeNode ? reinterpret_cast(m_treeNode->name) : ""); } // ---------------------------------------------------------------------- XmlTreeNode XmlTreeNode::getNextSiblingElementNode() const { - xmlNode *siblingNode = m_treeNode ? m_treeNode->next : NULL; + xmlNode *siblingNode = m_treeNode ? m_treeNode->next : nullptr; while (siblingNode && (siblingNode->type != XML_ELEMENT_NODE)) siblingNode = siblingNode->next; @@ -166,16 +166,16 @@ XmlTreeNode XmlTreeNode::getNextSiblingElementNode() const XmlTreeNode XmlTreeNode::getFirstChildNode() const { - return XmlTreeNode(m_treeNode ? m_treeNode->children : NULL); + return XmlTreeNode(m_treeNode ? m_treeNode->children : nullptr); } // ---------------------------------------------------------------------- XmlTreeNode XmlTreeNode::getFirstChildElementNode() const { - //-- Check if we have a NULL node. + //-- Check if we have a nullptr node. if (!m_treeNode) - return XmlTreeNode(NULL); + return XmlTreeNode(nullptr); //-- Look for the first child node that is an element. xmlNode *childNode = m_treeNode->children; @@ -190,9 +190,9 @@ XmlTreeNode XmlTreeNode::getFirstChildElementNode() const XmlTreeNode XmlTreeNode::getFirstChildTextNode() const { - //-- Check if we have a NULL node. + //-- Check if we have a nullptr node. if (!m_treeNode) - return XmlTreeNode(NULL); + return XmlTreeNode(nullptr); //-- Look for the first child node that is a text node. xmlNode *childNode = m_treeNode->children; @@ -212,18 +212,18 @@ XmlTreeNode XmlTreeNode::getElementAttributeValueNode(char const *attributeName, //-- Validate parameters and preconditions. if (!isElement()) { - DEBUG_FATAL(!optional, ("getElementAttributeValueNode(): node [%s] is not an element.", m_treeNode ? reinterpret_cast(m_treeNode->name) : "")); - return XmlTreeNode(NULL); + DEBUG_FATAL(!optional, ("getElementAttributeValueNode(): node [%s] is not an element.", m_treeNode ? reinterpret_cast(m_treeNode->name) : "")); + return XmlTreeNode(nullptr); } if (!attributeName) { - DEBUG_FATAL(!optional, ("getElementAttributeValueNode(): attributeName is NULL.")); - return XmlTreeNode(NULL); + DEBUG_FATAL(!optional, ("getElementAttributeValueNode(): attributeName is nullptr.")); + return XmlTreeNode(nullptr); } //-- Check the attribute nodes for a match on the given name. Ignore case. - for (xmlAttr *attributeNode = m_treeNode ? m_treeNode->properties : NULL; attributeNode; attributeNode = attributeNode->next) + for (xmlAttr *attributeNode = m_treeNode ? m_treeNode->properties : nullptr; attributeNode; attributeNode = attributeNode->next) { if (!_stricmp(attributeName, reinterpret_cast(attributeNode->name))) { @@ -234,7 +234,7 @@ XmlTreeNode XmlTreeNode::getElementAttributeValueNode(char const *attributeName, //-- No attribute node matched the attribute name. DEBUG_FATAL(!optional, ("getElementAttributeValueNode(): failed to find attribute [%s] on element node [%s].", attributeName, getName())); - return XmlTreeNode(NULL); + return XmlTreeNode(nullptr); } // ---------------------------------------------------------------------- @@ -250,7 +250,7 @@ bool XmlTreeNode::getElementAttributeAsBool(char const *attributeName, bool &val char const *const contents = attributeValueNode.getTextValue(); if (!contents) { - DEBUG_FATAL(!contents, ("contents of attribute [%s] is NULL.", attributeName)); + DEBUG_FATAL(!contents, ("contents of attribute [%s] is nullptr.", attributeName)); return false; //lint !e527 // unreachable // reachable in release. } @@ -275,7 +275,7 @@ bool XmlTreeNode::getElementAttributeAsFloat(char const *attributeName, float &v char const *const contents = attributeValueNode.getTextValue(); if (!contents) { - DEBUG_FATAL(!contents, ("contents of attribute [%s] is NULL.", attributeName)); + DEBUG_FATAL(!contents, ("contents of attribute [%s] is nullptr.", attributeName)); return false; //lint !e527 // unreachable // reachable in release. } @@ -306,7 +306,7 @@ bool XmlTreeNode::getElementAttributeAsInt(char const *attributeName, int &value char const *const contents = attributeValueNode.getTextValue(); if (!contents) { - DEBUG_FATAL(!contents, ("contents of attribute [%s] is NULL.", attributeName)); + DEBUG_FATAL(!contents, ("contents of attribute [%s] is nullptr.", attributeName)); return false; //lint !e527 // unreachable // reachable in release. } @@ -366,12 +366,12 @@ char const *XmlTreeNode::getTextValue() const //-- Ensure we're a text node. if(!node.isText()) { - DEBUG_FATAL(true, ("node [%s] is not a text node", m_treeNode ? reinterpret_cast(m_treeNode->name) : "")); - return NULL; //lint !e527 // unreachable // reachable in release. + DEBUG_FATAL(true, ("node [%s] is not a text node", m_treeNode ? reinterpret_cast(m_treeNode->name) : "")); + return nullptr; //lint !e527 // unreachable // reachable in release. } //-- Return contents. - return node.m_treeNode ? reinterpret_cast(node.m_treeNode->content) : NULL; + return node.m_treeNode ? reinterpret_cast(node.m_treeNode->content) : nullptr; } // ---------------------------------------------------------------------- diff --git a/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.cpp b/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.cpp index 49aeee58..cbe80abf 100755 --- a/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.cpp +++ b/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.cpp @@ -51,7 +51,7 @@ MonitorObject::~MonitorObject() if( mConnection ) { - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); } @@ -75,10 +75,10 @@ char hold[214]; UdpConnection::DisconnectReasonText( mConnection->GetOtherSideDisconnectReason())); } } - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); - mConnection = NULL; + mConnection = nullptr; } } @@ -94,10 +94,10 @@ void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *da simpleMessage msg(data); - if( con == NULL ) + if( con == nullptr ) { if( mbprint) - fprintf(stderr,"MONITOR API: MonitorObject.OnRoutePacket, recived a NULL connection.?\n"); + fprintf(stderr,"MONITOR API: MonitorObject.OnRoutePacket, recived a nullptr connection.?\n"); return; } @@ -123,7 +123,7 @@ void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *da if( mHierarchySent == true ) { mMonitorData->processElementsRequest(con,mSequence,(char *)&data[6],dataLen,mlastUpdateTime ); - mlastUpdateTime = (long)time(NULL); + mlastUpdateTime = (long)time(nullptr); break; } @@ -261,7 +261,7 @@ MonitorManager::MonitorManager(const char *configFile, CMonitorData *_gamedata, { mManager = manager; mbprint = _bprint; - passString = NULL; + passString = nullptr; mMonitorData = _gamedata; mObjectCount = 0; @@ -291,7 +291,7 @@ void MonitorManager::OnConnectRequest(UdpConnection *con) { if( con ) { - con->SetHandler(NULL); + con->SetHandler(nullptr); con->Disconnect(); con->Release(); } @@ -313,7 +313,7 @@ void MonitorManager::GiveTime() // check if the monitor object is no longer connected for (int i = 0; i < mObjectCount; i++) { - if( mObject[i]->mConnection == NULL || + if( mObject[i]->mConnection == nullptr || mObject[i]->mConnection->GetStatus() == UdpConnection::cStatusDisconnected ) { MonitorObject *o = mObject[i]; @@ -345,7 +345,7 @@ int x; char buffer[1024]; FILE *fp = fopen(filename,"r"); - if (fp == NULL) + if (fp == nullptr) { fprintf(stderr,"Monitor API: could not open %s file\nTHIS FILE IS REQUIRED.\n", filename); return false; @@ -367,7 +367,7 @@ char buffer[1024]; x = 0; while(!feof(fp)) { - if (fgets( buffer, 1023, fp) != NULL) { + if (fgets( buffer, 1023, fp) != nullptr) { // get rid of '\n' and '\r' for comparisons strtok(buffer,"\r\n"); len = (int)strlen(buffer); @@ -403,17 +403,17 @@ CMonitorAPI::CMonitorAPI( const char *configFile, unsigned short Port, bool _bpr mbprint = _bprint; mPort = Port; - mAddress = NULL; + mAddress = nullptr; if( address ) { mAddress = (char *)malloc(strlen(address)+1); strcpy(mAddress,address); } - if( mang == NULL ) + if( mang == nullptr ) { UdpManager::Params params; - params.handler = NULL; + params.handler = nullptr; params.maxConnections = CONNECTION_MAX; params.outgoingBufferSize = 1000000; params.noDataTimeout = 130000; @@ -595,7 +595,7 @@ int err; unsigned long S = 4000000; unsigned char *p; - data = NULL; + data = nullptr; p = (unsigned char *)malloc(4000000); memset(p,0,4000000); err = uncompress(p,&S,(source+6),(long)getSize()); diff --git a/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.h b/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.h index d97079c7..975e2429 100755 --- a/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.h +++ b/external/3rd/library/platform/projects/MonAPI2/MonitorAPI.h @@ -42,14 +42,14 @@ public: * * debug = turn on/off debugging. * - * address = (NOT USED) Leave as NULL + * address = (NOT USED) Leave as nullptr * - * UdpManager * mang = (NOT USED) Leave as NULL + * UdpManager * mang = (NOT USED) Leave as nullptr * - * // GenericNotifier *notifier = (NOT USED) Leave as NULL + * // GenericNotifier *notifier = (NOT USED) Leave as nullptr * */ - CMonitorAPI( const char *configFile, unsigned short port, bool debug = false , char * address = NULL, UdpManager * mang = NULL ); + CMonitorAPI( const char *configFile, unsigned short port, bool debug = false , char * address = nullptr, UdpManager * mang = nullptr ); ~CMonitorAPI(); @@ -112,7 +112,7 @@ public: * Max Limited * #define ELEMENT_MAX_START 2000 */ - int add( const char *label, int Key, int mode = MON_HISTORY, const char *Description = NULL ); + int add( const char *label, int Key, int mode = MON_HISTORY, const char *Description = nullptr ); /**************** Set the description of an element ** diff --git a/external/3rd/library/platform/projects/MonAPI2/MonitorData.cpp b/external/3rd/library/platform/projects/MonAPI2/MonitorData.cpp index 4b283bc6..044c1a17 100755 --- a/external/3rd/library/platform/projects/MonAPI2/MonitorData.cpp +++ b/external/3rd/library/platform/projects/MonAPI2/MonitorData.cpp @@ -58,7 +58,7 @@ CMonitorData::CMonitorData() { m_sequence = 1; - m_buffer = NULL; + m_buffer = nullptr; m_nbuffer = 0; m_count = 0; m_max = ELEMENT_MAX_START; @@ -103,7 +103,7 @@ void CMonitorData::resize_buffer(int new_size) { char *temp; - if( m_buffer != NULL ) + if( m_buffer != nullptr ) { temp = m_buffer; m_buffer = new char[ new_size]; @@ -331,7 +331,7 @@ char *p; if( get_bit(mark,x) == 0 ) { set_bit( mark, x ); - if( m_data[x].discription != NULL ) + if( m_data[x].discription != nullptr ) { sprintf(tmp,"%d,%s|",m_data[x].id, m_data[x].discription); size += (int)strlen(tmp); @@ -360,7 +360,7 @@ char *p; { flag = 2; set_bit(mark,x); - if( m_data[x].discription != NULL ) + if( m_data[x].discription != nullptr ) { sprintf(tmp,"%d,%s|",m_data[x].id, m_data[x].discription); size += (int)strlen(tmp); @@ -412,7 +412,7 @@ int x; //******* Discription ****** delete [] m_data[x].discription; - m_data[x].discription = NULL; + m_data[x].discription = nullptr; if( des ) { m_data[x].discription = new char [strlen(des)+1]; @@ -459,10 +459,10 @@ int x; { if( Id == m_data[x].id ) { - if( Description == NULL ) + if( Description == nullptr ) { delete [] m_data[x].discription; - m_data[x].discription = NULL; + m_data[x].discription = nullptr; mode = 0; return x; } @@ -510,7 +510,7 @@ int high, i, low; if ( high < m_count && Id==m_data[high].id ) { if (m_data[high].ChangedTime == 0 || m_data[high].value != value) { - m_data[high].ChangedTime = (long)time(NULL); + m_data[high].ChangedTime = (long)time(nullptr); m_data[high].value = value; } } @@ -560,7 +560,7 @@ int CMonitorData::parseList( char **list, char *data, char tok , int max ) int count; int cnt; - if( data == NULL ) + if( data == nullptr ) return 0; list[0] = data; diff --git a/external/3rd/library/platform/projects/MonAPI2/MonitorData.h b/external/3rd/library/platform/projects/MonAPI2/MonitorData.h index 1146d83e..56e3f0b9 100755 --- a/external/3rd/library/platform/projects/MonAPI2/MonitorData.h +++ b/external/3rd/library/platform/projects/MonAPI2/MonitorData.h @@ -35,7 +35,7 @@ Usage 'L' - long long int (8) 'i' - int (4) 's' - short int (2) - 'S' - C-style, null-terminated string (n + null) + 'S' - C-style, nullptr-terminated string (n + nullptr) 'Bn' - buffer, of size n. Used for non-terminated strings, or other binary data. */ @@ -115,7 +115,7 @@ private: //---------------------------------------------------------------- // stringMessage -// This message type is used for passing messages that can consist of a NULL terminated string +// This message type is used for passing messages that can consist of a nullptr terminated string class stringMessage : public monMessage { public: @@ -252,7 +252,7 @@ class CMonitorData { public: -// CMonitorData(GenericNotifier *notifier=NULL ); +// CMonitorData(GenericNotifier *notifier=nullptr ); CMonitorData(); virtual ~CMonitorData(); @@ -266,7 +266,7 @@ public: bool processDescriptionRequest(UdpConnection *con, short & sequence, char * userData, int dataLen,unsigned char *mark); int add(const char *label, int id, int ping, const char *des ); int setDescription( int Id, const char *Description , int & mode); - char *getDescription(int x){ if( m_ndata >= x ) return NULL; return m_data[x].discription;} + char *getDescription(int x){ if( m_ndata >= x ) return nullptr; return m_data[x].discription;} int pingValue(int p); void set(int Id, int value); void remove(int Id); diff --git a/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp b/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp index 4856d6e2..f61f6464 100755 --- a/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp +++ b/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp @@ -42,7 +42,7 @@ CConnectionHandler::~CConnectionHandler() { if (mConnection) { - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); } @@ -79,7 +79,7 @@ void CConnectionHandler::OnTerminated(UdpConnection *) if (mConnection) { - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Release(); mConnection = 0; } diff --git a/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp b/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp index a9e2caf6..1cabca55 100755 --- a/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp +++ b/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp @@ -749,7 +749,7 @@ namespace LoginAPI else input.SetSessionID(sessionID); - // don't validate session type, there are clients that pass in NULL. + // don't validate session type, there are clients that pass in nullptr. input.SetSessionType(sessionType); //////////////////////////////////////// @@ -776,7 +776,7 @@ namespace LoginAPI else input.SetSessionID(sessionID); - // don't validate session type, there are clients that pass in NULL. + // don't validate session type, there are clients that pass in nullptr. input.SetSessionType(sessionType); //////////////////////////////////////// @@ -803,7 +803,7 @@ namespace LoginAPI else input.SetSessionID(sessionID); - // don't validate session type, there are clients that pass in NULL. + // don't validate session type, there are clients that pass in nullptr. input.SetSessionType(sessionType); //////////////////////////////////////// @@ -830,7 +830,7 @@ namespace LoginAPI else input.SetSessionID(sessionID); - // don't validate session type, there are clients that pass in NULL. + // don't validate session type, there are clients that pass in nullptr. input.SetSessionType(sessionType); //////////////////////////////////////// diff --git a/external/3rd/library/platform/utils/Base/Archive.cpp b/external/3rd/library/platform/utils/Base/Archive.cpp index 90f5f2f5..7d59c663 100755 --- a/external/3rd/library/platform/utils/Base/Archive.cpp +++ b/external/3rd/library/platform/utils/Base/Archive.cpp @@ -91,7 +91,7 @@ namespace Base ByteStream::ByteStream() : allocatedSize(0), beginReadIterator(), - data(NULL), + data(nullptr), size(0) { data = Data::getNewData(); @@ -187,7 +187,7 @@ namespace Base if(data->size < allocatedSize) { unsigned char * tmp = new unsigned char[newSize]; - if(data->buffer != NULL) + if(data->buffer != nullptr) memcpy(tmp, data->buffer, size); delete[] data->buffer; data->buffer = tmp; diff --git a/external/3rd/library/platform/utils/Base/AutoLog.cpp b/external/3rd/library/platform/utils/Base/AutoLog.cpp index 9b25380e..aa84b96f 100755 --- a/external/3rd/library/platform/utils/Base/AutoLog.cpp +++ b/external/3rd/library/platform/utils/Base/AutoLog.cpp @@ -35,7 +35,7 @@ bool CAutoLog::Open(const char * filename) //------------------------------------- { - if( NULL == filename) + if( nullptr == filename) return false; if (pFilename) @@ -49,13 +49,13 @@ bool CAutoLog::Open(const char * filename) // Sanitize slashes char *ptr; - while ((ptr = strchr(pFilename,WRONGSLASH)) != NULL) + while ((ptr = strchr(pFilename,WRONGSLASH)) != nullptr) *ptr = SLASHCHAR[0]; char strPath[1024]; strcpy(strPath,pFilename); ptr = strrchr(strPath, SLASHCHAR[0]); - if (ptr != NULL) + if (ptr != nullptr) { *ptr = 0; @@ -63,11 +63,11 @@ bool CAutoLog::Open(const char * filename) char curdir[128]; // remember current directory - if( _getcwd(curdir,sizeof(curdir)) == NULL ) + if( _getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } @@ -78,7 +78,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -98,7 +98,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -107,7 +107,7 @@ bool CAutoLog::Open(const char * filename) pFile = fopen(pFilename,"a+"); - if( pFile == NULL || pFile == (FILE *)-1) + if( pFile == nullptr || pFile == (FILE *)-1) { //fprintf(stderr,"CAutoLog::Open failed to open log file: %s\n",pFilename); Close(); @@ -127,14 +127,14 @@ bool CAutoLog::Open(const char * filename) void CAutoLog::Close(void) //------------------------------------- { - if( pFile != (FILE *)-1 && pFile != NULL) + if( pFile != (FILE *)-1 && pFile != nullptr) { fclose(pFile); } pFile = (FILE *)-1; free(pFilename); - pFilename = NULL; + pFilename = nullptr; } //------------------------------------- @@ -197,7 +197,7 @@ void CAutoLog::LogDebug(char * format, ...) void CAutoLog::Log(eLogLevel severity, char *fmt, ...) //------------------------------------- { - if (pFile == (FILE *)-1 || pFile == NULL) + if (pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Log called with no file open!\n"); return; @@ -253,7 +253,7 @@ void CAutoLog::Log(eLogLevel severity, char *fmt, ...) void CAutoLog::Archive(void) //------------------------------------- { - if( pFile == (FILE *)-1 || pFile == NULL) + if( pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Archive called with no file open!\n"); return; @@ -284,7 +284,7 @@ void CAutoLog::Archive(void) strcpy(strCurrent,pFilename); pCurrent = strrchr(strCurrent, SLASHCHAR[0]); - if (pCurrent != NULL) + if (pCurrent != nullptr) *pCurrent = 0; else sprintf(strCurrent,"."); @@ -293,7 +293,7 @@ void CAutoLog::Archive(void) #ifdef WIN32 // remember current directory - if( _getcwd(curdir,sizeof(curdir)) == NULL ) + if( _getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); return; // error, can't proceed @@ -327,7 +327,7 @@ void CAutoLog::Archive(void) #endif pCurrent = strrchr(pFilename, SLASHCHAR[0]); - if (pCurrent == NULL) + if (pCurrent == nullptr) pCurrent = pFilename; else pCurrent++; diff --git a/external/3rd/library/platform/utils/Base/AutoLog.h b/external/3rd/library/platform/utils/Base/AutoLog.h index 0a90a774..18871c7f 100755 --- a/external/3rd/library/platform/utils/Base/AutoLog.h +++ b/external/3rd/library/platform/utils/Base/AutoLog.h @@ -92,14 +92,14 @@ namespace Base //------------------------------------- inline CAutoLog::CAutoLog() { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; } //------------------------------------- inline CAutoLog::CAutoLog(const char * file) { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; Open(file); } diff --git a/external/3rd/library/platform/utils/Base/Config.cpp b/external/3rd/library/platform/utils/Base/Config.cpp index a305cb9c..6351686f 100755 --- a/external/3rd/library/platform/utils/Base/Config.cpp +++ b/external/3rd/library/platform/utils/Base/Config.cpp @@ -28,7 +28,7 @@ bool CConfig::LoadFile(char * file) // open file fp = fopen(file, "r"); - if (fp == NULL || fp == (FILE *)-1) + if (fp == nullptr || fp == (FILE *)-1) { //fprintf(stderr,"Failed to open config file %s!",file); delete fp; @@ -73,21 +73,21 @@ void CConfig::UnloadFile(void) //----------------------------------- { delete[] pConfig; - pConfig = NULL; + pConfig = nullptr; } //----------------------------------- /// finds a key of the config in memory // key argument is case-insensitive, but must be upper case in config file -// Returns true for success (passing NULL is a special case returned as success) +// Returns true for success (passing nullptr is a special case returned as success) bool CConfig::FindKey(char *key) //----------------------------------- { - if (pConfig == NULL) + if (pConfig == nullptr) return false; // special case...continue with existing key - if (key == NULL) + if (key == nullptr) return true; // form the search key @@ -98,12 +98,12 @@ bool CConfig::FindKey(char *key) // find the key heading pCursor = strstr(pConfig,strBuffer); - if (pCursor==NULL) + if (pCursor==nullptr) return false; // find the closing bracket of key heading pCursor = strchr(pCursor,']'); - if (pCursor==NULL) + if (pCursor==nullptr) return false; pCursor++; @@ -112,7 +112,7 @@ bool CConfig::FindKey(char *key) //----------------------------------- /// extract a number from the config string -// pass the key to find the first number in the list, else NULL to find the next number in the list +// pass the key to find the first number in the list, else nullptr to find the next number in the list // returns 0 if no number is found, else returns the number long CConfig::GetLong(char *key) //----------------------------------- @@ -135,20 +135,20 @@ long CConfig::GetLong(char *key) //----------------------------------- /// extract string (in double-quotes) from the list. -// pass the key to find the first string in the list, else NULL to find the next string in the list -// returns NULL if no string found, else returns a temporary copy of the string (without quotes) +// pass the key to find the first string in the list, else nullptr to find the next string in the list +// returns nullptr if no string found, else returns a temporary copy of the string (without quotes) char * CConfig::GetString(char *key) //----------------------------------- { if (!FindKey(key)) - return NULL; + return nullptr; // look for start of string or end of key while (*pCursor && *pCursor != '"' && *pCursor != '[') pCursor++; if (*(pCursor++) != '"') - return NULL; + return nullptr; // until closing quote int c = 0; @@ -162,7 +162,7 @@ char * CConfig::GetString(char *key) } } - return NULL; + return nullptr; } diff --git a/external/3rd/library/platform/utils/Base/Config.h b/external/3rd/library/platform/utils/Base/Config.h index 56ad96af..f577eef6 100755 --- a/external/3rd/library/platform/utils/Base/Config.h +++ b/external/3rd/library/platform/utils/Base/Config.h @@ -10,7 +10,7 @@ ; list of strings, with code example # config.FindKey("NUMBERS"); -# while (number = config.GetLong(NULL)) +# while (number = config.GetLong(nullptr)) # YourHandleNumber(number); [NUMBERS] 100 200, 300 ; formatting is very flexible as long as numbers are delimited by non-numbers @@ -23,7 +23,7 @@ ; list of strings, with code example # config.FindKey("HOSTS"); -# while (string = config.GetString(NULL)) +# while (string = config.GetString(nullptr)) # YourHandleString(string); [HOSTS] "206.19.151.173:5999" @@ -68,16 +68,16 @@ namespace Base // returns TRUE if key is found. bool FindKey(char *key); - // extract string from config. If key is NULL, extract next string in list, else extract first string. - // if key was not found, returns NULL - char * GetString(char *key = NULL); + // extract string from config. If key is nullptr, extract next string in list, else extract first string. + // if key was not found, returns nullptr + char * GetString(char *key = nullptr); - // extract number from config. If key is NULL, extract next number in list, else extract first number. + // extract number from config. If key is nullptr, extract next number in list, else extract first number. // if key was not found, returns 0 - long GetLong(char *key = NULL); // extract number from config. + long GetLong(char *key = nullptr); // extract number from config. // indicate if config file has been loaded - inline bool FileLoaded() { return pConfig == NULL ? false : true; } + inline bool FileLoaded() { return pConfig == nullptr ? false : true; } private: char * pConfig; // pointer to file memory @@ -87,14 +87,14 @@ namespace Base inline CConfig::CConfig() { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; } inline CConfig::CConfig(char * file) { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; LoadFile(file); } diff --git a/external/3rd/library/platform/utils/Base/Statistics.h b/external/3rd/library/platform/utils/Base/Statistics.h index 18e0579e..0856034b 100755 --- a/external/3rd/library/platform/utils/Base/Statistics.h +++ b/external/3rd/library/platform/utils/Base/Statistics.h @@ -34,9 +34,9 @@ namespace Base bool commit = false; if (!mLastSampleTime) - mLastSampleTime = time(NULL); + mLastSampleTime = time(nullptr); - if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(NULL)) + if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(nullptr)) { mSampleTotal++; mAggregateTotal += value; diff --git a/external/3rd/library/platform/utils/Base/TemplateObjectAllocator.h b/external/3rd/library/platform/utils/Base/TemplateObjectAllocator.h index 40227673..ed1a7937 100755 --- a/external/3rd/library/platform/utils/Base/TemplateObjectAllocator.h +++ b/external/3rd/library/platform/utils/Base/TemplateObjectAllocator.h @@ -93,7 +93,7 @@ namespace Base void Destroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; #ifdef USE_ALLOCATOR_MUTEX @@ -142,7 +142,7 @@ namespace Base void FastDestroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; object->~TYPE(); diff --git a/external/3rd/library/platform/utils/Base/linux/BlockAllocator.cpp b/external/3rd/library/platform/utils/Base/linux/BlockAllocator.cpp index 4cefb9e7..29d91074 100755 --- a/external/3rd/library/platform/utils/Base/linux/BlockAllocator.cpp +++ b/external/3rd/library/platform/utils/Base/linux/BlockAllocator.cpp @@ -12,7 +12,7 @@ namespace Base { for(unsigned i = 0; i < 31; i++) { - m_blocks[i] = NULL; + m_blocks[i] = nullptr; } } @@ -21,7 +21,7 @@ namespace Base // free all allocated memory blocks for(unsigned i = 0; i < 31; i++) { - while(m_blocks[i] != NULL) + while(m_blocks[i] != nullptr) { unsigned *tmp = m_blocks[i]; m_blocks[i] = (unsigned *)*m_blocks[i]; @@ -36,7 +36,7 @@ namespace Base void *BlockAllocator::getBlock(unsigned bytes) { unsigned accum = 16, bits = 16; - unsigned *handle = NULL; + unsigned *handle = nullptr; // Perform a binary search looking for the highest bit. @@ -96,7 +96,7 @@ namespace Base void BlockAllocator::returnBlock(unsigned *handle) { - // C++ allows for safe deletion of a NULL pointer + // C++ allows for safe deletion of a nullptr pointer if(handle) { // Update the allocator linked list, insert this entry at the head diff --git a/external/3rd/library/platform/utils/Base/linux/Event.cpp b/external/3rd/library/platform/utils/Base/linux/Event.cpp index a3cce3b1..72190595 100755 --- a/external/3rd/library/platform/utils/Base/linux/Event.cpp +++ b/external/3rd/library/platform/utils/Base/linux/Event.cpp @@ -26,8 +26,8 @@ namespace Base mCond(), mThreadCount(0) { - pthread_mutex_init(&mMutex, NULL); - pthread_cond_init(&mCond, NULL); + pthread_mutex_init(&mMutex, nullptr); + pthread_cond_init(&mCond, nullptr); } CEvent::~CEvent() @@ -74,7 +74,7 @@ namespace Base struct timeval now; struct timespec abs_timeout; - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); abs_timeout.tv_sec = now.tv_sec + timeout/1000; abs_timeout.tv_nsec = now.tv_usec * 1000 + (timeout%1000)*1000000; abs_timeout.tv_sec += abs_timeout.tv_nsec / 1000000000; diff --git a/external/3rd/library/platform/utils/Base/linux/Logger.cpp b/external/3rd/library/platform/utils/Base/linux/Logger.cpp index f305703d..1510e1c1 100755 --- a/external/3rd/library/platform/utils/Base/linux/Logger.cpp +++ b/external/3rd/library/platform/utils/Base/linux/Logger.cpp @@ -18,20 +18,20 @@ Logger::Logger(const char *prefix, int level, unsigned size, bool rollDate) : m_defaultLevel(level), m_defaultSize(size), m_dirPrefix(prefix), m_rollDate(rollDate) { char buf[1024]; - FILE *logDir = NULL; + FILE *logDir = nullptr; logDir = fopen(m_dirPrefix.c_str(), "r+"); if(errno == ENOENT) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } tm now; - time_t t = time(NULL); + time_t t = time(nullptr); localtime_r(&t, &now); memcpy(&m_lastDateTime, &now, sizeof(tm)); @@ -48,7 +48,7 @@ Logger::Logger(const char *prefix, int level, unsigned size, bool rollDate) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -178,7 +178,7 @@ void Logger::logSimple(unsigned logenum, int level, const char *message) { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) { @@ -241,7 +241,7 @@ void Logger::log(unsigned logenum, int level, const char *message, ...) { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) { @@ -294,14 +294,14 @@ void Logger::log(unsigned logenum, int level, const char *message, ...) void Logger::rollDate(time_t t) { char buf[80]; - FILE *logDir = NULL; + FILE *logDir = nullptr; logDir = fopen(m_dirPrefix.c_str(), "r+"); if(errno == ENOENT) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -316,7 +316,7 @@ void Logger::rollDate(time_t t) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } diff --git a/external/3rd/library/platform/utils/Base/linux/Thread.cpp b/external/3rd/library/platform/utils/Base/linux/Thread.cpp index 2bc4f26b..5cca2017 100755 --- a/external/3rd/library/platform/utils/Base/linux/Thread.cpp +++ b/external/3rd/library/platform/utils/Base/linux/Thread.cpp @@ -76,8 +76,8 @@ namespace Base CThreadPool::CMember::CMember(CThreadPool * parent) : mParent(parent), - mFunction(NULL), - mArgument(NULL), + mFunction(nullptr), + mArgument(nullptr), mSemaphore() { StartThread(); @@ -116,8 +116,8 @@ namespace Base if (mFunction) { mFunction(mArgument); - mArgument = NULL; - mFunction = NULL; + mArgument = nullptr; + mFunction = nullptr; } else if (mParent->OnDestory(this)) mThreadContinue = false; @@ -172,7 +172,7 @@ namespace Base } //////////////////////////////////////// - // (3) Delete the null member threads + // (3) Delete the nullptr member threads mMutex.Lock(); while (!mNullMember.empty()) { @@ -199,7 +199,7 @@ namespace Base } //////////////////////////////////////// - // (2) Delete any null member threads. + // (2) Delete any nullptr member threads. while (!mNullMember.empty()) { delete mNullMember.front(); diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp index c9d48ca3..dae431dd 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistStressTest/test.cpp @@ -376,8 +376,8 @@ void createTicket() Plat_Unicode::String xml = narrowToWide("Stress Test XML here"); t.setDetails(details.c_str()); t.setLocation(location.c_str()); - track = api->requestCreateTicket(NULL, &t, NULL, t.uid); - //track = api->requestCreateTicket(NULL, &t, xml.c_str(), t.uid); + track = api->requestCreateTicket(nullptr, &t, nullptr, t.uid); + //track = api->requestCreateTicket(nullptr, &t, xml.c_str(), t.uid); submitted++; printf("creating ticket\n"); @@ -478,7 +478,7 @@ int main(int argc, char **argv) gamep = argv[4]; gameserver = argv[5]; - if (serverhost == NULL || strlen(serverhost) == 0) + if (serverhost == nullptr || strlen(serverhost) == 0) { std::cout << "Missing hostname!\n"; return 0; @@ -493,12 +493,12 @@ int main(int argc, char **argv) std::cout << "Missing or invalid number of functions to run!\n"; return 0; } - if (gamep == NULL || strlen(gamep) == 0) + if (gamep == nullptr || strlen(gamep) == 0) { std::cout << "Missing game name!\n"; return 0; } - if (gameserver == NULL || strlen(gameserver) == 0) + if (gameserver == nullptr || strlen(gameserver) == 0) { std::cout << "Missing game server name!\n"; return 0; @@ -517,7 +517,7 @@ while(1) unsigned loginWait(500); unsigned loginAttempts(0); //api = new apiTest(serverhost, serverport, 60, CSASSIST_APIFLAG_ASSUME_RECONNECT); //, 0, CSASSIST_APIFLAG_ASSUME_RECONNECT); - //api->connectCSAssist(NULL, game.c_str(), server.c_str()); + //api->connectCSAssist(nullptr, game.c_str(), server.c_str()); //while (!ready) // api->Update(); @@ -530,7 +530,7 @@ while(1) if (api) delete api; //api = new apiTest(serverhost, serverport, 60, CSASSIST_APIFLAG_ASSUME_RECONNECT); api = new apiTest(serverhost, serverport, 60, CSASSIST_APIFLAG_ASSUME_RECONNECT|CSASSIST_APIFLAG_NO_REDIRECT); - track = api->connectCSAssist(NULL, game.c_str(), server.c_str()); + track = api->connectCSAssist(nullptr, game.c_str(), server.c_str()); loginFailed = false; std::cout <<"Trying to connect..."<requestNewTicketActivity(NULL, testUID, 0); + track = api->requestNewTicketActivity(nullptr, testUID, 0); else - track = api->requestNewTicketActivity(NULL, testUID, character.c_str()); + track = api->requestNewTicketActivity(nullptr, testUID, character.c_str()); submitted++; break; case CSASSIST_CALL_REGISTERCHARACTER: uid = rand(); - track = api->requestRegisterCharacter(NULL, uid, 0, 0); + track = api->requestRegisterCharacter(nullptr, uid, 0, 0); register_list.push(uid); submitted++; break; case CSASSIST_CALL_GETISSUEHIERARCHY: lang = narrowToWide("en"); - track = api->requestGetIssueHierarchy(NULL, hierarchy.c_str(), lang.c_str()); + track = api->requestGetIssueHierarchy(nullptr, hierarchy.c_str(), lang.c_str()); submitted++; break; case CSASSIST_CALL_CREATETICKET: @@ -597,33 +597,33 @@ while(1) case CSASSIST_CALL_APPENDCOMMENT: comment = narrowToWide("Unicode comment by player."); tid = randomTicketID(); - track = api->requestAppendTicketComment(NULL, tid, testUID, character.c_str(), comment.c_str()); + track = api->requestAppendTicketComment(nullptr, tid, testUID, character.c_str(), comment.c_str()); submitted++; break; case CSASSIST_CALL_GETTICKETBYID: tid = randomTicketID(); - track = api->requestGetTicketByID(NULL, tid, 1); + track = api->requestGetTicketByID(nullptr, tid, 1); submitted++; break; case CSASSIST_CALL_GETTICKETCOMMENTS: tid = randomTicketID(); - track = api->requestGetTicketComments(NULL, tid, 0, (rand() % 100)+1, CSASSIST_OFFSET_START); + track = api->requestGetTicketComments(nullptr, tid, 0, (rand() % 100)+1, CSASSIST_OFFSET_START); submitted++; break; case CSASSIST_CALL_GETTICKET: - track = api->requestGetTicketByCharacter(NULL, testUID, character.c_str(), 0, (rand() % 100)+1, 1); + track = api->requestGetTicketByCharacter(nullptr, testUID, character.c_str(), 0, (rand() % 100)+1, 1); submitted++; break; case CSASSIST_CALL_MARKREAD: tid = randomTicketID(); - track = api->requestMarkTicketRead(NULL, tid); + track = api->requestMarkTicketRead(nullptr, tid); submitted++; break; case CSASSIST_CALL_CANCELTICKET: if (firstTicketID != 0) { comment = narrowToWide("Ticket closed by player"); - track = api->requestCancelTicket(NULL, firstTicketID, testUID, comment.c_str()); + track = api->requestCancelTicket(nullptr, firstTicketID, testUID, comment.c_str()); if (++firstTicketID > lastTicketID) { firstTicketID = 0; @@ -634,33 +634,33 @@ while(1) break; case CSASSIST_CALL_COMMENTCOUNT: tid = randomTicketID(); - track = api->requestGetTicketCommentsCount(NULL, tid); + track = api->requestGetTicketCommentsCount(nullptr, tid); submitted++; break; case CSASSIST_CALL_GETDOCUMENTLIST: // lang = narrowToWide("en"); -// track = api->requestGetDocumentList(NULL, hierarchy.c_str(), lang.c_str()); +// track = api->requestGetDocumentList(nullptr, hierarchy.c_str(), lang.c_str()); // submitted++; break; case CSASSIST_CALL_GETDOCUMENT: -// track = api->requestGetDocument(NULL, 1); +// track = api->requestGetDocument(nullptr, 1); // submitted++; break; case CSASSIST_CALL_GETTICKETXMLBLOCK: tid = randomTicketID(); - track = api->requestGetTicketXMLBlock(NULL, tid); + track = api->requestGetTicketXMLBlock(nullptr, tid); submitted++; break; case CSASSIST_CALL_GETKBARTICLE: /*id = narrowToWide("soe1401"); lang = narrowToWide("en"); - track = api->requestGetKBArticle(NULL, id.c_str(), lang.c_str()); + track = api->requestGetKBArticle(nullptr, id.c_str(), lang.c_str()); submitted++; */break; case CSASSIST_CALL_SEARCHKB: /*Plat_Unicode::String searchStr = narrowToWide("video drivers"); lang = narrowToWide("en"); - track = api->requestSearchKB(NULL, searchStr.c_str(), lang.c_str()); + track = api->requestSearchKB(nullptr, searchStr.c_str(), lang.c_str()); submitted++; */break; } @@ -692,7 +692,7 @@ while(1) { uid = register_list.front(); register_list.pop(); - api->requestUnRegisterCharacter(NULL, uid, 0); + api->requestUnRegisterCharacter(nullptr, uid, 0); submitted++; } cout<<"Waiting for unregisters..."<disconnectCSAssist(NULL); + api->disconnectCSAssist(nullptr); submitted++; while (submitted > received) @@ -718,7 +718,7 @@ while(1) cout<<"Going to delete API now."<::iterator iter = servers.begin(); iter != servers.end(); iter++) { @@ -147,7 +147,7 @@ CSAssistGameAPIcore::CSAssistGameAPIcore(CSAssistGameAPI *api, const char *serve memset(host, 0, size); sprintf(host, "%s", strtok(p, ":")); int res(1); - char *pc = strtok(NULL, ":"); + char *pc = strtok(nullptr, ":"); if (pc) { port = atoi(pc);res++; } //if (res == 2) { @@ -212,7 +212,7 @@ CSAssistGameAPIcore::~CSAssistGameAPIcore() m_connection->Disconnect(false); #endif m_connection->Release(); - m_connection = NULL; + m_connection = nullptr; } m_conManager->Release(); delete m_receiver; @@ -298,13 +298,13 @@ void CSAssistGameAPIcore::SubmitRequest(Request *req, Response *res) { if (req->getType() != CSASSIST_CALL_CONNECTLB) { - m_timeout.push(new timeout(res->getTrack(), time(NULL) + m_userTimeout)); - req->setTimeout(time(NULL) + m_userTimeout); + m_timeout.push(new timeout(res->getTrack(), time(nullptr) + m_userTimeout)); + req->setTimeout(time(nullptr) + m_userTimeout); } else { - m_timeout.push(new timeout(res->getTrack(), time(NULL) + CONNECTLB_TIMEOUT)); - req->setTimeout(time(NULL) + CONNECTLB_TIMEOUT); + m_timeout.push(new timeout(res->getTrack(), time(nullptr) + CONNECTLB_TIMEOUT)); + req->setTimeout(time(nullptr) + CONNECTLB_TIMEOUT); } m_outQueue.push(req); m_pending.insert(pair(res->getTrack(), res)); @@ -316,13 +316,13 @@ void CSAssistGameAPIcore::SubmitRequestInt(Request *req, Response *res) { if (req->getType() != CSASSIST_CALL_CONNECTLB) { - m_timeoutInt.push(new timeout(res->getTrack(), time(NULL) + m_userTimeout)); - req->setTimeout(time(NULL) + m_userTimeout); + m_timeoutInt.push(new timeout(res->getTrack(), time(nullptr) + m_userTimeout)); + req->setTimeout(time(nullptr) + m_userTimeout); } else { - m_timeoutInt.push(new timeout(res->getTrack(), time(NULL) + CONNECTLB_TIMEOUT)); - req->setTimeout(time(NULL) + CONNECTLB_TIMEOUT); + m_timeoutInt.push(new timeout(res->getTrack(), time(nullptr) + CONNECTLB_TIMEOUT)); + req->setTimeout(time(nullptr) + CONNECTLB_TIMEOUT); } m_outQueueInt.push(req); m_pendingInt.insert(pair(res->getTrack(), res)); @@ -390,14 +390,14 @@ void CSAssistGameAPIcore::CSAssistGameCallback(Response *response) if (!m_receiver->m_firstConnection) m_api->OnConnectCSAssist(track, result, userData); // normal application layer connect else - m_api->OnConnectCSAssist(0, result, NULL); // internal re-connect + m_api->OnConnectCSAssist(0, result, nullptr); // internal re-connect m_receiver->m_firstConnection = true; } else { if (m_receiver->m_firstConnection) - m_api->OnConnectRejectedCSAssist(0, result, NULL); + m_api->OnConnectRejectedCSAssist(0, result, nullptr); else m_api->OnConnectRejectedCSAssist(track, result, userData); @@ -413,7 +413,7 @@ void CSAssistGameAPIcore::CSAssistGameCallback(Response *response) m_connection->Disconnect(false); #endif m_connection->Release(); - m_connection = NULL; + m_connection = nullptr; } GetLBHost(); m_receiver->m_firstConnection = true; @@ -436,7 +436,7 @@ void CSAssistGameAPIcore::CSAssistGameCallback(Response *response) m_connection->Disconnect(false); #endif m_connection->Release(); - m_connection = NULL; + m_connection = nullptr; } m_api->OnDisconnectCSAssist(track, result, userData); } @@ -624,7 +624,7 @@ Response * CSAssistGameAPIcore::getPending(CSAssistGameAPITrack track) map::iterator iter; iter = m_pending.find(track); if (iter == m_pending.end()) - return NULL; + return nullptr; return (*iter).second; } @@ -635,7 +635,7 @@ Response * CSAssistGameAPIcore::getPendingInt(CSAssistGameAPITrack track) map::iterator iter; iter = m_pendingInt.find(track); if (iter == m_pendingInt.end()) - return NULL; + return nullptr; return (*iter).second; } @@ -681,22 +681,22 @@ void CSAssistGameAPIcore::Update() // ----- Process timeout queue, send timeout messages when appropriate ----- - while((m_timeout.size() > 0) && ((t = m_timeout.front())->time <= time(NULL))) + while((m_timeout.size() > 0) && ((t = m_timeout.front())->time <= time(nullptr))) { Response *Res = getPending(t->track); //fprintf(stderr, "processing timeouts: track(%u) response(%p)\n", t->track, Res); - if(Res != NULL) + if(Res != nullptr) { CSAssistGameCallback(Res); } m_timeout.pop(); delete t; } - while((m_timeoutInt.size() > 0) && ((t = m_timeoutInt.front())->time <= time(NULL))) + while((m_timeoutInt.size() > 0) && ((t = m_timeoutInt.front())->time <= time(nullptr))) { Response *Res = getPendingInt(t->track); //fprintf(stderr, "processing internal timeouts: track(%u) response(%p)\n", t->track, Res); - if(Res != NULL) + if(Res != nullptr) { CSAssistGameCallback(Res); } @@ -705,14 +705,14 @@ void CSAssistGameAPIcore::Update() } // ----- process timeouts for requests ----- - while ((m_outQueue.size() > 0) && (m_outQueue.front()->getTimeout() <= (unsigned)time(NULL))) + while ((m_outQueue.size() > 0) && (m_outQueue.front()->getTimeout() <= (unsigned)time(nullptr))) { Request *R = m_outQueue.front(); //fprintf(stderr, "processing request timeouts: track(%u) request(%u)\n", R->getTrack(), R->getType()); m_outQueue.pop(); delete R; } - while ((m_outQueueInt.size() > 0) && (m_outQueueInt.front()->getTimeout() <= (unsigned)time(NULL))) + while ((m_outQueueInt.size() > 0) && (m_outQueueInt.front()->getTimeout() <= (unsigned)time(nullptr))) { Request *R = m_outQueueInt.front(); //fprintf(stderr, "processing internal request timeouts: track(%u) request(%u)\n", R->getTrack(), R->getType()); @@ -724,18 +724,18 @@ void CSAssistGameAPIcore::Update() { // API does not have a connection, begin connection handshake process //fprintf(stderr, "Going to connect to %s:%d\n", m_ip.c_str(), m_port); - m_reconnectTimeout = time(NULL) + 5; + m_reconnectTimeout = time(nullptr) + 5; m_connection = m_conManager->EstablishConnection(m_ip.c_str(), m_port); // set connected host/port before changing with GetLBHost. m_connectedIP = m_ip.c_str(); m_connectedPort = m_port; - if (m_connection != NULL) + if (m_connection != nullptr) m_connection->SetHandler(m_receiver); else { - m_api->OnConnectRejectedCSAssist(0, CSASSIST_RESULT_FAIL, NULL); + m_api->OnConnectRejectedCSAssist(0, CSASSIST_RESULT_FAIL, nullptr); // Connection failed. Try getting a new host. GetLBHost(); } @@ -777,7 +777,7 @@ void CSAssistGameAPIcore::Update() else { //fprintf(stderr,"Update(1): timing out response(%p) for track(%u)\n", Res, t->track); - if(Res != NULL) + if(Res != nullptr) { CSAssistGameCallback(Res); } @@ -795,18 +795,18 @@ void CSAssistGameAPIcore::Update() //fprintf(stderr, "Update(2) enter\n"); #ifdef USE_UDP_LIBRARY if((m_connection->GetStatus() == UdpConnection::cStatusDisconnected) || - (m_connection->GetStatus() == UdpConnection::cStatusNegotiating && m_reconnectTimeout < time(NULL))) + (m_connection->GetStatus() == UdpConnection::cStatusNegotiating && m_reconnectTimeout < time(nullptr))) { m_connection->Disconnect(); #else if((m_connection->GetStatus() == TcpConnection::StatusDisconnected) || - (m_connection->GetStatus() == TcpConnection::StatusNegotiating && m_reconnectTimeout < time(NULL))) + (m_connection->GetStatus() == TcpConnection::StatusNegotiating && m_reconnectTimeout < time(nullptr))) { m_connection->Disconnect(false); #endif m_connection->Release(); - m_connection = NULL; + m_connection = nullptr; //fprintf(stderr, "Update(2): Disconnected!! m_connectState=%u\n", m_connectState); switch(m_connectState) @@ -835,7 +835,7 @@ void CSAssistGameAPIcore::Update() //if (t-> Response *Res = getPendingInt(t->track); //fprintf(stderr, "Update(2) timing out connect: track(%u) response(%p)\n", t->track, Res); - if(Res != NULL) + if(Res != nullptr) { Res->setResult(CSASSIST_RESULT_FAIL); CSAssistGameCallback(Res); @@ -964,7 +964,7 @@ void CSAssistGameAPIcore::Update() Response *CSAssistGameAPIcore::createServerResponse(short msgtype) //------------------------------------------------------------- { - Response *res = NULL; + Response *res = nullptr; switch (msgtype) { diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h index 0f642423..d7dc8ac4 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h @@ -166,11 +166,11 @@ private: void GetLBHost(); void OnConnectLB(unsigned track, unsigned result, std::string serverName, unsigned serverPort, Request *, Response *); #ifdef USE_UDP_LIBRARY - inline bool actuallyConnected() { return (bool)((m_connection != NULL) && (m_connection->GetStatus() == UdpConnection::cStatusConnected)); } + inline bool actuallyConnected() { return (bool)((m_connection != nullptr) && (m_connection->GetStatus() == UdpConnection::cStatusConnected)); } UdpManager *m_conManager; UdpConnection *m_connection; #else - inline bool actuallyConnected() { return (bool)((m_connection != NULL) && (m_connection->GetStatus() == TcpConnection::StatusConnected)); } + inline bool actuallyConnected() { return (bool)((m_connection != nullptr) && (m_connection->GetStatus() == TcpConnection::StatusConnected)); } TcpManager *m_conManager; TcpConnection *m_connection; #endif diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistreceiver.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistreceiver.cpp index 5aa9430b..a1b03cf9 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistreceiver.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistreceiver.cpp @@ -99,7 +99,7 @@ void CSAssistReceiver::OnTerminated(TcpConnection *con) break; case CONNECT_BACKEND_CONNECTED_AND_AUTHED: - m_api->m_api->OnDisconnectCSAssist(0, CSASSIST_RESULT_SERVER_DISCONNECT, NULL); + m_api->m_api->OnDisconnectCSAssist(0, CSASSIST_RESULT_SERVER_DISCONNECT, nullptr); case CONNECT_BACKEND_CONNECTED: m_api->GetLBHost(); case CONNECT_BACKEND_NEGOTIATING: m_api->m_connectState = CONNECT_BACKEND_DISCONNECTED; break; @@ -110,7 +110,7 @@ void CSAssistReceiver::OnTerminated(TcpConnection *con) else { if (m_api->m_connectState == CONNECT_BACKEND_CONNECTED_AND_AUTHED) - m_api->m_api->OnDisconnectCSAssist(0, CSASSIST_RESULT_SERVER_DISCONNECT, NULL); + m_api->m_api->OnDisconnectCSAssist(0, CSASSIST_RESULT_SERVER_DISCONNECT, nullptr); m_api->m_connectState = CONNECT_BACKEND_DISCONNECTED; m_api->GetLBHost(); } @@ -156,7 +156,7 @@ void CSAssistReceiver::OnRoutePacket(TcpConnection *con, const uchar *data, int { res = m_api->getPending(track); } - if(res != NULL) + if(res != nullptr) { res->init(type, track, result); res->decode(iter); diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssisttest/test.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssisttest/test.cpp index c172511e..efbc0db4 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssisttest/test.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssisttest/test.cpp @@ -40,7 +40,7 @@ Plat_Unicode::String globalArticleID; //---------------------------------------------- CSAssistUnicodeChar *get_c_str(Plat_Unicode::String s) // This replaces c_str() by allocating a new buffer, erasing it, and then -// using the non-null terminated data() to copy the data into the buffer. +// using the non-nullptr terminated data() to copy the data into the buffer. //---------------------------------------------- { unsigned length = s.size() + 1; @@ -94,7 +94,7 @@ void DisplayTicket(const CSAssistGameAPITicket *t) std::cout << wideToNarrow(details) << "\n***\n"; } else - std::cout << "***Ticket IS NULL! ***\n"; + std::cout << "***Ticket IS nullptr! ***\n"; } //--------------------------------------------- @@ -110,7 +110,7 @@ void DisplayComment(const CSAssistGameAPITicketComment *t) std::cout << "\n " << wideToNarrow(comment) << "\n"; } else - std::cout << "***Comment IS NULL! ***\n"; + std::cout << "***Comment IS nullptr! ***\n"; } //--------------------------------------------- @@ -132,7 +132,7 @@ void DisplayDocumentHeader(const CSAssistGameAPIDocumentHeader *doc) std::cout << ", Modified: " << date2 << "\n"; } else - std::cout << "***Document Header IS NULL! ***\n"; + std::cout << "***Document Header IS nullptr! ***\n"; } //--------------------------------------------- @@ -148,7 +148,7 @@ void DisplaySearchResult(const CSAssistGameAPISearchResult *doc) std::cout << ", Title: " << wideToNarrow(title) << "\n"; } else - std::cout << "***Search Result IS NULL! ***\n"; + std::cout << "***Search Result IS nullptr! ***\n"; } @@ -360,7 +360,7 @@ void apiTest::OnRequestGameLocation(const CSAssistGameAPITrack sourceTrack, cons CSAssistUnicodeChar *rawLoc = get_c_str(loc); std::cout << "Request Game Location: Source Track(" << sourceTrack << "), uid(" << uid << "), character("; std::cout << wideToNarrow(charry) << "), CSR UID(" << CSRUID << ")\n"; - api->replyGameLocation(NULL, sourceTrack, uid, rawCharry, CSRUID, rawLoc); + api->replyGameLocation(nullptr, sourceTrack, uid, rawCharry, CSRUID, rawLoc); delete [] rawCharry; delete [] rawLoc; } diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp index 4c267fd4..9a8ef45e 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp @@ -30,7 +30,7 @@ using namespace Plat_Unicode; //---------------------------------------------- CSAssistUnicodeChar *get_c_str(Plat_Unicode::String s) // This replaces c_str() by allocating a new buffer, erasing it, and then -// using the non-null terminated data() to copy the data into the buffer. +// using the non-nullptr terminated data() to copy the data into the buffer. //---------------------------------------------- { unsigned length = s.size() + 1; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp index 1afab822..d55481a4 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.cpp @@ -94,7 +94,7 @@ namespace Base ByteStream::ByteStream() : allocatedSize(0), beginReadIterator(), - data(NULL), + data(nullptr), size(0), lastPutSize(0) { @@ -211,7 +211,7 @@ namespace Base if(data->size < allocatedSize) { unsigned char * tmp = new unsigned char[newSize]; - if(data->buffer != NULL) + if(data->buffer != nullptr) memcpy(tmp, data->buffer, size); delete[] data->buffer; data->buffer = tmp; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp index 687381ed..4a8dc976 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.cpp @@ -35,7 +35,7 @@ bool CAutoLog::Open(const char * filename) //------------------------------------- { - if( NULL == filename) + if( nullptr == filename) return false; if (pFilename) @@ -45,13 +45,13 @@ bool CAutoLog::Open(const char * filename) // Sanitize slashes char *ptr; - while ((ptr = strchr(pFilename,WRONGSLASH)) != NULL) + while ((ptr = strchr(pFilename,WRONGSLASH)) != nullptr) *ptr = SLASHCHAR[0]; char strPath[1024]; strcpy(strPath,pFilename); ptr = strrchr(strPath, SLASHCHAR[0]); - if (ptr != NULL) + if (ptr != nullptr) { *ptr = 0; @@ -59,11 +59,11 @@ bool CAutoLog::Open(const char * filename) char curdir[128]; // remember current directory - if( getcwd(curdir,sizeof(curdir)) == NULL ) + if( getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } @@ -74,7 +74,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -94,7 +94,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -103,7 +103,7 @@ bool CAutoLog::Open(const char * filename) pFile = fopen(pFilename,"a+"); - if( pFile == NULL || pFile == (FILE *)-1) + if( pFile == nullptr || pFile == (FILE *)-1) { //fprintf(stderr,"CAutoLog::Open failed to open log file: %s\n",pFilename); Close(); @@ -123,7 +123,7 @@ bool CAutoLog::Open(const char * filename) void CAutoLog::Close(void) //------------------------------------- { - if( pFile != (FILE *)-1 && pFile != NULL) + if( pFile != (FILE *)-1 && pFile != nullptr) { fclose(pFile); } @@ -131,7 +131,7 @@ void CAutoLog::Close(void) free(pFilename); - pFilename = NULL; + pFilename = nullptr; } //------------------------------------- @@ -194,7 +194,7 @@ void CAutoLog::LogDebug(char * format, ...) void CAutoLog::Log(eLogLevel severity, char *fmt, ...) //------------------------------------- { - if (pFile == (FILE *)-1 || pFile == NULL) + if (pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Log called with no file open!\n"); return; @@ -250,7 +250,7 @@ void CAutoLog::Log(eLogLevel severity, char *fmt, ...) void CAutoLog::Archive(void) //------------------------------------- { - if( pFile == (FILE *)-1 || pFile == NULL) + if( pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Archive called with no file open!\n"); return; @@ -281,7 +281,7 @@ void CAutoLog::Archive(void) strcpy(strCurrent,pFilename); pCurrent = strrchr(strCurrent, SLASHCHAR[0]); - if (pCurrent != NULL) + if (pCurrent != nullptr) *pCurrent = 0; else sprintf(strCurrent,"."); @@ -290,7 +290,7 @@ void CAutoLog::Archive(void) #ifdef WIN32 // remember current directory - if( getcwd(curdir,sizeof(curdir)) == NULL ) + if( getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); return; // error, can't proceed @@ -324,7 +324,7 @@ void CAutoLog::Archive(void) #endif pCurrent = strrchr(pFilename, SLASHCHAR[0]); - if (pCurrent == NULL) + if (pCurrent == nullptr) pCurrent = pFilename; else pCurrent++; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.h index 0a90a774..18871c7f 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/AutoLog.h @@ -92,14 +92,14 @@ namespace Base //------------------------------------- inline CAutoLog::CAutoLog() { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; } //------------------------------------- inline CAutoLog::CAutoLog(const char * file) { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; Open(file); } diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.cpp index a5b977fb..97abcd41 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.cpp @@ -28,7 +28,7 @@ bool CConfig::LoadFile(char * file) // open file fp = fopen(file, "r"); - if (fp == NULL || fp == (FILE *)-1) + if (fp == nullptr || fp == (FILE *)-1) { //fprintf(stderr,"Failed to open config file %s!",file); return false; @@ -72,21 +72,21 @@ void CConfig::UnloadFile(void) //----------------------------------- { delete[] pConfig; - pConfig = NULL; + pConfig = nullptr; } //----------------------------------- /// finds a key of the config in memory // key argument is case-insensitive, but must be upper case in config file -// Returns true for success (passing NULL is a special case returned as success) +// Returns true for success (passing nullptr is a special case returned as success) bool CConfig::FindKey(char *key) //----------------------------------- { - if (pConfig == NULL) + if (pConfig == nullptr) return false; // special case...continue with existing key - if (key == NULL) + if (key == nullptr) return true; // form the search key @@ -97,12 +97,12 @@ bool CConfig::FindKey(char *key) // find the key heading pCursor = strstr(pConfig,strBuffer); - if (pCursor==NULL) + if (pCursor==nullptr) return false; // find the closing bracket of key heading pCursor = strchr(pCursor,']'); - if (pCursor==NULL) + if (pCursor==nullptr) return false; pCursor++; @@ -111,7 +111,7 @@ bool CConfig::FindKey(char *key) //----------------------------------- /// extract a number from the config string -// pass the key to find the first number in the list, else NULL to find the next number in the list +// pass the key to find the first number in the list, else nullptr to find the next number in the list // returns 0 if no number is found, else returns the number long CConfig::GetLong(char *key) //----------------------------------- @@ -134,20 +134,20 @@ long CConfig::GetLong(char *key) //----------------------------------- /// extract string (in double-quotes) from the list. -// pass the key to find the first string in the list, else NULL to find the next string in the list -// returns NULL if no string found, else returns a temporary copy of the string (without quotes) +// pass the key to find the first string in the list, else nullptr to find the next string in the list +// returns nullptr if no string found, else returns a temporary copy of the string (without quotes) char * CConfig::GetString(char *key) //----------------------------------- { if (!FindKey(key)) - return NULL; + return nullptr; // look for start of string or end of key while (*pCursor && *pCursor != '"' && *pCursor != '[') pCursor++; if (*(pCursor++) != '"') - return NULL; + return nullptr; // until closing quote int c = 0; @@ -161,7 +161,7 @@ char * CConfig::GetString(char *key) } } - return NULL; + return nullptr; } diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h index 864506f3..6f6dc376 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.h @@ -10,7 +10,7 @@ ; list of strings, with code example # config.FindKey("NUMBERS"); -# while (number = config.GetLong(NULL)) +# while (number = config.GetLong(nullptr)) # YourHandleNumber(number); [NUMBERS] 100 200, 300 ; formatting is very flexible as long as numbers are delimited by non-numbers @@ -23,7 +23,7 @@ ; list of strings, with code example # config.FindKey("HOSTS"); -# while (string = config.GetString(NULL)) +# while (string = config.GetString(nullptr)) # YourHandleString(string); [HOSTS] "127.0.0.1:5999" @@ -68,16 +68,16 @@ namespace Base // returns TRUE if key is found. bool FindKey(char *key); - // extract string from config. If key is NULL, extract next string in list, else extract first string. - // if key was not found, returns NULL - char * GetString(char *key = NULL); + // extract string from config. If key is nullptr, extract next string in list, else extract first string. + // if key was not found, returns nullptr + char * GetString(char *key = nullptr); - // extract number from config. If key is NULL, extract next number in list, else extract first number. + // extract number from config. If key is nullptr, extract next number in list, else extract first number. // if key was not found, returns 0 - long GetLong(char *key = NULL); // extract number from config. + long GetLong(char *key = nullptr); // extract number from config. // indicate if config file has been loaded - inline bool FileLoaded() { return pConfig == NULL ? false : true; } + inline bool FileLoaded() { return pConfig == nullptr ? false : true; } private: char * pConfig; // pointer to file memory @@ -87,14 +87,14 @@ namespace Base inline CConfig::CConfig() { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; } inline CConfig::CConfig(char * file) { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; LoadFile(file); } diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp index 1ce102af..bf3dcc39 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp @@ -98,7 +98,7 @@ Logger::Logger(const char *programName, void Logger::LoggerInit(const char *programName) { char buf[1024]; - FILE *logDir = NULL; + FILE *logDir = nullptr; if (0 != (m_logType & eUseLocalFile)) { @@ -107,13 +107,13 @@ void Logger::LoggerInit(const char *programName) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } tm now; - time_t t = time(NULL); + time_t t = time(nullptr); LOGGER_GET_CURR_TIME(now, t); @@ -131,7 +131,7 @@ void Logger::LoggerInit(const char *programName) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -300,7 +300,7 @@ void Logger::logSimple(unsigned logenum, int level, const char *message) { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) { @@ -377,7 +377,7 @@ void Logger::logSimpleWithSys(unsigned logenum, unsigned priority, int level, co { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -447,7 +447,7 @@ void Logger::log(unsigned logenum, int level, const char *message, ...) // ensure that the buf does not contain any '%' characters. // prevent crash problem char *rv; - while((rv = strchr(buf, '%')) != NULL) + while((rv = strchr(buf, '%')) != nullptr) { *rv = ' '; // replace with space } @@ -478,7 +478,7 @@ void Logger::logWithSys(unsigned logenum, unsigned priority, int level, const ch { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -536,14 +536,14 @@ void Logger::logWithSys(unsigned logenum, unsigned priority, int level, const ch void Logger::rollDate(time_t t) { char buf[80]; - FILE *logDir = NULL; + FILE *logDir = nullptr; logDir = fopen(m_dirPrefix.c_str(), "r+"); if(errno == ENOENT) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -559,7 +559,7 @@ void Logger::rollDate(time_t t) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -643,7 +643,7 @@ void Logger::rollLog(LogInfo *logInfo) { std::string newLogName; char timeStampBuffer[256]; - time_t t = time(NULL); + time_t t = time(nullptr); tm now; int r; int nTries = 10; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Statistics.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/Statistics.h index 18e0579e..0856034b 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Statistics.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Statistics.h @@ -34,9 +34,9 @@ namespace Base bool commit = false; if (!mLastSampleTime) - mLastSampleTime = time(NULL); + mLastSampleTime = time(nullptr); - if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(NULL)) + if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(nullptr)) { mSampleTotal++; mAggregateTotal += value; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/TemplateObjectAllocator.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/TemplateObjectAllocator.h index 40227673..ed1a7937 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/TemplateObjectAllocator.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/TemplateObjectAllocator.h @@ -93,7 +93,7 @@ namespace Base void Destroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; #ifdef USE_ALLOCATOR_MUTEX @@ -142,7 +142,7 @@ namespace Base void FastDestroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; object->~TYPE(); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/WideString.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/WideString.h index 775f9713..28159b18 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/WideString.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/WideString.h @@ -94,12 +94,12 @@ namespace ucs2 } //////////////////////////////////////// - // target string is a null-terminated C string + // target string is a nullptr-terminated C string inline string::string(const char * copy) : mLength(0), mData(8,0) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!copy) { return; @@ -111,12 +111,12 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *copy++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; } //////////////////////////////////////// - // target string is a C string that may or may not include null characters + // target string is a C string that may or may not include nullptr characters inline string::string(const std::string & copy) : mLength(copy.length()), mData(8,0) @@ -126,17 +126,17 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(copy.begin(), copy.end(), mData.begin(), NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength] = 0; } //////////////////////////////////////// - // target string is a wide null-terminated C string + // target string is a wide nullptr-terminated C string inline string::string(const char_type * copy) : mLength(0), mData(8,0) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!copy) { return; @@ -148,7 +148,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *copy++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; } @@ -169,7 +169,7 @@ namespace ucs2 inline string & string::operator=(const char * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -182,7 +182,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -195,7 +195,7 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(rhs.begin(), rhs.end(), mData.begin(), NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength] = 0; return *this; } @@ -203,7 +203,7 @@ namespace ucs2 inline string & string::operator=(const char_type * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -216,7 +216,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -235,7 +235,7 @@ namespace ucs2 inline string & string::operator+=(const char * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -247,7 +247,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -259,7 +259,7 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(rhs.begin(), rhs.end(), mData.begin()+mLength, NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mLength += rhs.length(); mData[mLength] = 0; return *this; @@ -267,7 +267,7 @@ namespace ucs2 inline string & string::operator+=(const char_type * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -279,7 +279,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -388,7 +388,7 @@ namespace ucs2 inline string & string::assign(const char_type * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -401,7 +401,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -409,7 +409,7 @@ namespace ucs2 inline string & string::assign(const char_type * rhs, size_type count) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -422,7 +422,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -463,7 +463,7 @@ namespace ucs2 inline string & string::assign(const char_type * first, const char_type * last) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!first || !last) { mData[0] = 0; @@ -476,14 +476,14 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *first++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } inline string & string::append(const char_type * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -495,14 +495,14 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } inline string & string::append(const char_type * rhs, size_type count) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -514,7 +514,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -558,7 +558,7 @@ namespace ucs2 inline string & string::append(const char_type * first, const char_type * last) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!first || !last) { return *this; @@ -570,7 +570,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *first++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/BlockAllocator.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/BlockAllocator.cpp index 4cefb9e7..29d91074 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/BlockAllocator.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/BlockAllocator.cpp @@ -12,7 +12,7 @@ namespace Base { for(unsigned i = 0; i < 31; i++) { - m_blocks[i] = NULL; + m_blocks[i] = nullptr; } } @@ -21,7 +21,7 @@ namespace Base // free all allocated memory blocks for(unsigned i = 0; i < 31; i++) { - while(m_blocks[i] != NULL) + while(m_blocks[i] != nullptr) { unsigned *tmp = m_blocks[i]; m_blocks[i] = (unsigned *)*m_blocks[i]; @@ -36,7 +36,7 @@ namespace Base void *BlockAllocator::getBlock(unsigned bytes) { unsigned accum = 16, bits = 16; - unsigned *handle = NULL; + unsigned *handle = nullptr; // Perform a binary search looking for the highest bit. @@ -96,7 +96,7 @@ namespace Base void BlockAllocator::returnBlock(unsigned *handle) { - // C++ allows for safe deletion of a NULL pointer + // C++ allows for safe deletion of a nullptr pointer if(handle) { // Update the allocator linked list, insert this entry at the head diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Event.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Event.cpp index a3cce3b1..72190595 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Event.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Event.cpp @@ -26,8 +26,8 @@ namespace Base mCond(), mThreadCount(0) { - pthread_mutex_init(&mMutex, NULL); - pthread_cond_init(&mCond, NULL); + pthread_mutex_init(&mMutex, nullptr); + pthread_cond_init(&mCond, nullptr); } CEvent::~CEvent() @@ -74,7 +74,7 @@ namespace Base struct timeval now; struct timespec abs_timeout; - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); abs_timeout.tv_sec = now.tv_sec + timeout/1000; abs_timeout.tv_nsec = now.tv_usec * 1000 + (timeout%1000)*1000000; abs_timeout.tv_sec += abs_timeout.tv_nsec / 1000000000; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Thread.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Thread.cpp index 2bc4f26b..5cca2017 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Thread.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Thread.cpp @@ -76,8 +76,8 @@ namespace Base CThreadPool::CMember::CMember(CThreadPool * parent) : mParent(parent), - mFunction(NULL), - mArgument(NULL), + mFunction(nullptr), + mArgument(nullptr), mSemaphore() { StartThread(); @@ -116,8 +116,8 @@ namespace Base if (mFunction) { mFunction(mArgument); - mArgument = NULL; - mFunction = NULL; + mArgument = nullptr; + mFunction = nullptr; } else if (mParent->OnDestory(this)) mThreadContinue = false; @@ -172,7 +172,7 @@ namespace Base } //////////////////////////////////////// - // (3) Delete the null member threads + // (3) Delete the nullptr member threads mMutex.Lock(); while (!mNullMember.empty()) { @@ -199,7 +199,7 @@ namespace Base } //////////////////////////////////////// - // (2) Delete any null member threads. + // (2) Delete any nullptr member threads. while (!mNullMember.empty()) { delete mNullMember.front(); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/serialize.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/serialize.h index 650681b5..ed38802a 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/serialize.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/serialize.h @@ -501,8 +501,8 @@ namespace soe } else { - //find null terminator, if don't find it before maxLen, then err - const unsigned char *strEnd = NULL; + //find nullptr terminator, if don't find it before maxLen, then err + const unsigned char *strEnd = nullptr; unsigned strLen = 0; for (;strLenm_next; - tmp->m_next = NULL; + tmp->m_next = nullptr; m_numAvailBlocks--; return(tmp); } @@ -56,7 +56,7 @@ void TcpBlockAllocator::returnBlock(data_block *b) void TcpBlockAllocator::realloc() { - data_block *tmp = NULL, *cursor = NULL; + data_block *tmp = nullptr, *cursor = nullptr; tmp = new data_block; m_numAvailBlocks++; cursor = tmp; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.cpp b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.cpp index 97ca7fd1..c74eaca4 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.cpp @@ -11,28 +11,28 @@ namespace NAMESPACE //used when want to open new connection with this socket TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, const IPAddress &destIP, short destPort, unsigned timeout) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(INVALID_SOCKET), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusNegotiating), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(timeout), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -94,28 +94,28 @@ TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAllo //used when server mode creates new connection object representing a connect request TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, SOCKET socket, const IPAddress &destIP, short destPort) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(socket), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusConnected), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(0), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -205,7 +205,7 @@ int TcpConnection::finishConnect() t.tv_sec = 0; t.tv_usec = 0; - int err = select(m_socket + 1, NULL, &wrSet, NULL, &t); + int err = select(m_socket + 1, nullptr, &wrSet, nullptr, &t); if (err == 0) { @@ -300,7 +300,7 @@ TcpConnection::~TcpConnection() { delete [] m_recvBuff; - while(m_head != NULL) + while(m_head != nullptr) { data_block *tmp = m_head; m_head = m_head->m_next; @@ -324,22 +324,22 @@ void TcpConnection::Send(const char *data, unsigned int dataLen) { m_aliveListId = m_manager->m_keepAliveList.m_listID; - if (m_prevKeepAliveConnection != NULL) + if (m_prevKeepAliveConnection != nullptr) m_prevKeepAliveConnection->m_nextKeepAliveConnection = m_nextKeepAliveConnection; - if (m_nextKeepAliveConnection != NULL) + if (m_nextKeepAliveConnection != nullptr) m_nextKeepAliveConnection->m_prevKeepAliveConnection = m_prevKeepAliveConnection; if (m_manager->m_keepAliveList.m_beginList == this) m_manager->m_keepAliveList.m_beginList = m_nextKeepAliveConnection; m_nextKeepAliveConnection = m_manager->m_aliveList.m_beginList; - m_prevKeepAliveConnection = NULL; - if (m_manager->m_aliveList.m_beginList != NULL) + m_prevKeepAliveConnection = nullptr; + if (m_manager->m_aliveList.m_beginList != nullptr) m_manager->m_aliveList.m_beginList->m_prevKeepAliveConnection = this; m_manager->m_aliveList.m_beginList = this; } - data_block *work = NULL; + data_block *work = nullptr; // this connection has no send buffer. Get a block if(!m_tail) @@ -464,16 +464,16 @@ int TcpConnection::processIncoming() { m_recvDataListId = m_manager->m_noDataList.m_listID; - if (m_prevRecvDataConnection != NULL) + if (m_prevRecvDataConnection != nullptr) m_prevRecvDataConnection->m_nextRecvDataConnection = m_nextRecvDataConnection; - if (m_nextRecvDataConnection != NULL) + if (m_nextRecvDataConnection != nullptr) m_nextRecvDataConnection->m_prevRecvDataConnection = m_prevRecvDataConnection; if (m_manager->m_noDataList.m_beginList == this) m_manager->m_noDataList.m_beginList = m_nextRecvDataConnection; m_nextRecvDataConnection = m_manager->m_dataList.m_beginList; - m_prevRecvDataConnection = NULL; - if (m_manager->m_dataList.m_beginList != NULL) + m_prevRecvDataConnection = nullptr; + if (m_manager->m_dataList.m_beginList != nullptr) m_manager->m_dataList.m_beginList->m_prevRecvDataConnection = this; m_manager->m_dataList.m_beginList = this; } @@ -619,7 +619,7 @@ int TcpConnection::processOutgoing() int sendError = 1; - // If m_head is not null, then this connection has something to send + // If m_head is not nullptr, then this connection has something to send if(m_head) diff --git a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.h b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.h index 07eb4f42..92d631d1 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpConnection.h @@ -50,7 +50,7 @@ public: * connection is disconnected, you simply need to derive your class * (multiply if necessary) from TcpConnectionHandler, then you can use * this method to set the object the TcpConnection will call as appropriate. - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for notifications. */ diff --git a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.cpp b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.cpp index 29d51de0..86778910 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.cpp @@ -41,14 +41,14 @@ TcpManager::TcpParams::TcpParams(const TcpParams &cpy) } TcpManager::TcpManager(const TcpParams ¶ms) -: m_handler(NULL), - m_keepAliveList(NULL, 1), - m_aliveList(NULL, 2), - m_noDataList(NULL, 1), - m_dataList(NULL, 2), +: m_handler(nullptr), + m_keepAliveList(nullptr, 1), + m_aliveList(nullptr, 2), + m_noDataList(nullptr, 1), + m_dataList(nullptr, 2), m_params(params), m_refCount(1), - m_connectionList(NULL), + m_connectionList(nullptr), m_connectionListCount(0), m_socket(INVALID_SOCKET), m_boundAsServer(false), @@ -86,7 +86,7 @@ TcpManager::~TcpManager() close(m_socket); #endif } - while (m_connectionList != NULL) + while (m_connectionList != nullptr) { TcpConnection *con = m_connectionList; m_connectionList = m_connectionList->m_nextConnection; @@ -162,7 +162,7 @@ bool TcpManager::BindAsServer() { struct hostent * lphp; lphp = gethostbyname(m_params.bindAddress); - if (lphp != NULL) + if (lphp != nullptr) addr_loc.sin_addr.s_addr = ((struct in_addr *)(lphp->h_addr))->s_addr; } else @@ -187,7 +187,7 @@ bool TcpManager::BindAsServer() TcpConnection *TcpManager::acceptClient() { - TcpConnection *newConn = NULL; + TcpConnection *newConn = nullptr; if (m_boundAsServer && m_connectionListCount < m_params.maxConnections) { @@ -201,7 +201,7 @@ TcpConnection *TcpManager::acceptClient() { newConn = new TcpConnection(this, &m_allocator, m_params, sock, IPAddress(addr.sin_addr.s_addr), ntohs(addr.sin_port)); addNewConnection(newConn); - if (m_handler != NULL) + if (m_handler != nullptr) { m_handler->OnConnectRequest(newConn); } @@ -226,8 +226,8 @@ SOCKET TcpManager::getMaxFD() if (m_boundAsServer) maxfd = m_socket+1; - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->GetStatus() != TcpConnection::StatusDisconnected && con->m_socket > maxfd) @@ -241,8 +241,8 @@ SOCKET TcpManager::getMaxFD() TcpConnection *TcpManager::getConnection(SOCKET fd) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->m_socket == fd) @@ -251,7 +251,7 @@ TcpConnection *TcpManager::getConnection(SOCKET fd) } } //if get here ,couldn't find it - return NULL; + return nullptr; } bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendTimePerConnection, unsigned maxRecvTimePerConnection) @@ -273,8 +273,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT { // Send output from last heartbeat - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -341,7 +341,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT tmpfds = m_permfds; timeout.tv_sec = 0; timeout.tv_usec = 0; - int cnt = select(maxfd, &tmpfds, NULL, NULL, &timeout); // blocks for timeout + int cnt = select(maxfd, &tmpfds, nullptr, nullptr, &timeout); // blocks for timeout if (cnt > 0) @@ -367,8 +367,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //process incoming client messages if (maxRecvTimePerConnection != 0) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -433,8 +433,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT pollfds[0].events |= POLLIN; } - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next, idx++) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next, idx++) { next = con->m_nextConnection; pollfds[idx].fd = con->m_socket; @@ -474,7 +474,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT } //process regular msg(s) - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -506,7 +506,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT }//if(pollfds[... else if (pollfds[idx].revents & POLLHUP) { - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -524,21 +524,21 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any keepalives, if time to do that if (m_params.keepAliveDelay > 0 && m_keepAliveTimer.isDone(m_params.keepAliveDelay)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_keepAliveList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_keepAliveList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); next = con->m_nextKeepAliveConnection; if (next) next->AddRef(); - con->Send(NULL, 0); //note: this request will move the connection from the keepAliveList to the aliveList + con->Send(nullptr, 0); //note: this request will move the connection from the keepAliveList to the aliveList con->Release(); } //now move the complete alive list over to the keepalive list to reset those timers m_keepAliveList.m_beginList = m_aliveList.m_beginList; - m_aliveList.m_beginList = NULL; + m_aliveList.m_beginList = nullptr; //switch id's for those connections that were in the alive list last go - around int tmpID = m_aliveList.m_listID; @@ -552,8 +552,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any noDataCons, if time to do that if (m_params.noDataTimeout > 0 && m_noDataTimer.isDone(m_params.noDataTimeout)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_noDataList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_noDataList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -567,7 +567,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now move the complete data list over to the nodata list to reset those timers m_noDataList.m_beginList = m_dataList.m_beginList; - m_dataList.m_beginList = NULL; + m_dataList.m_beginList = nullptr; //switch id's for those connections that were in the data list last go - around int tmpID = m_dataList.m_listID; @@ -589,11 +589,11 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { //can't open outgoing connections when in server mode // use a different TcpManager to do that - return NULL; + return nullptr; } if (m_connectionListCount >= m_params.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); @@ -601,8 +601,8 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; } IPAddress destIP(address); @@ -622,22 +622,22 @@ void TcpManager::addNewConnection(TcpConnection *con) FD_SET(con->m_socket, &m_permfds); #endif con->m_nextConnection = m_connectionList; - con->m_prevConnection = NULL; - if (m_connectionList != NULL) + con->m_prevConnection = nullptr; + if (m_connectionList != nullptr) m_connectionList->m_prevConnection = con; m_connectionList = con; m_connectionListCount++; con->m_nextKeepAliveConnection = m_aliveList.m_beginList; - con->m_prevKeepAliveConnection = NULL; - if (m_aliveList.m_beginList != NULL) + con->m_prevKeepAliveConnection = nullptr; + if (m_aliveList.m_beginList != nullptr) m_aliveList.m_beginList->m_prevKeepAliveConnection = con; m_aliveList.m_beginList = con; con->m_aliveListId = m_keepAliveList.m_listID;//start it out thinking it's already in the alive list, since it is con->m_nextRecvDataConnection = m_dataList.m_beginList; - con->m_prevRecvDataConnection = NULL; - if (m_dataList.m_beginList != NULL) + con->m_prevRecvDataConnection = nullptr; + if (m_dataList.m_beginList != nullptr) m_dataList.m_beginList->m_prevRecvDataConnection = con; m_dataList.m_beginList = con; con->m_recvDataListId = m_noDataList.m_listID;//start it out thinking it's already in the data list, since it is @@ -655,40 +655,40 @@ void TcpManager::removeConnection(TcpConnection *con) FD_CLR(con->m_socket, &m_permfds); } #endif - if (con->m_prevConnection != NULL) + if (con->m_prevConnection != nullptr) con->m_prevConnection->m_nextConnection = con->m_nextConnection; - if (con->m_nextConnection != NULL) + if (con->m_nextConnection != nullptr) con->m_nextConnection->m_prevConnection = con->m_prevConnection; if (m_connectionList == con) m_connectionList = con->m_nextConnection; - con->m_nextConnection = NULL; - con->m_prevConnection = NULL; + con->m_nextConnection = nullptr; + con->m_prevConnection = nullptr; - if (con->m_prevKeepAliveConnection != NULL) + if (con->m_prevKeepAliveConnection != nullptr) con->m_prevKeepAliveConnection->m_nextKeepAliveConnection = con->m_nextKeepAliveConnection; - if (con->m_nextKeepAliveConnection != NULL) + if (con->m_nextKeepAliveConnection != nullptr) con->m_nextKeepAliveConnection->m_prevKeepAliveConnection = con->m_prevKeepAliveConnection; if (m_aliveList.m_beginList == con) m_aliveList.m_beginList = con->m_nextKeepAliveConnection; else if (m_keepAliveList.m_beginList == con) m_keepAliveList.m_beginList = con->m_nextKeepAliveConnection; - con->m_nextKeepAliveConnection = NULL; - con->m_prevKeepAliveConnection = NULL; + con->m_nextKeepAliveConnection = nullptr; + con->m_prevKeepAliveConnection = nullptr; - if (con->m_prevRecvDataConnection != NULL) + if (con->m_prevRecvDataConnection != nullptr) con->m_prevRecvDataConnection->m_nextRecvDataConnection = con->m_nextRecvDataConnection; - if (con->m_nextRecvDataConnection != NULL) + if (con->m_nextRecvDataConnection != nullptr) con->m_nextRecvDataConnection->m_prevRecvDataConnection = con->m_prevRecvDataConnection; if (m_dataList.m_beginList == con) m_dataList.m_beginList = con->m_nextRecvDataConnection; else if (m_noDataList.m_beginList == con) m_noDataList.m_beginList = con->m_nextRecvDataConnection; - con->m_nextRecvDataConnection = NULL; - con->m_prevRecvDataConnection = NULL; + con->m_nextRecvDataConnection = nullptr; + con->m_prevRecvDataConnection = nullptr; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.h b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.h index 32132069..cdc01daa 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TcpManager.h @@ -156,7 +156,7 @@ public: * simply need to derive your class (multiply if necessary) from TcpManagerHandler, then you can use * this method to set the object the TcpManager will call as appropriate. The TcpConnection object * also has a handler mechanism that replaces the other callback functions below, see TcpConnection::SetHandler - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for manager related notifications. */ @@ -211,7 +211,7 @@ public: * the connect-complete callback to be called if the connection is succesfull. * * @return A pointer to a TcpConnection object. - * NULL if the manager object has exceeded its maximum number of connections + * nullptr if the manager object has exceeded its maximum number of connections * or if the serverAddress cannot be resolved to an IP address. */ TcpConnection *EstablishConnection(const char *serverAddress, unsigned short serverPort, unsigned timeout = 0); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TestClient/TestClient.cpp b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TestClient/TestClient.cpp index 075062d5..35423e88 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TestClient/TestClient.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/TcpLibrary/TestClient/TestClient.cpp @@ -42,7 +42,7 @@ void TestClient::process() { m_con->SetHandler(this); m_conState = CON_NEGOTIATE; - m_conTimeout = time(NULL) + 20;//m_reconnectTimeout; + m_conTimeout = time(nullptr) + 20;//m_reconnectTimeout; } break; case CON_NEGOTIATE: @@ -51,10 +51,10 @@ void TestClient::process() m_conState = CON_CONNECT; printf("callback here.... connected\n"); } - else if(time(NULL) > 20) + else if(time(nullptr) > 20) { m_con->Release(); - m_con = NULL; + m_con = nullptr; m_conState = CON_DISCONNECT; } break; @@ -63,7 +63,7 @@ void TestClient::process() default: m_conState = CON_DISCONNECT; m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_manager->GiveTime(); } @@ -95,7 +95,7 @@ void TestClient::OnTerminated(TcpConnection *con) if (m_con) { m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; } diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.h b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.h index 741a6e80..493c5a2d 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeCharacterDataMap.h @@ -122,7 +122,7 @@ namespace Plat_Unicode /** * Find a CharData for the given code point. - * @return null if no CharData exists for this code point + * @return nullptr if no CharData exists for this code point */ inline const CharData * CharDataMap::findCharData (const unicode_char_t code) const diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/utf8.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/utf8.cpp index 527f246d..e7df40e2 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/utf8.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/utf8.cpp @@ -87,7 +87,7 @@ int UTF8_convertCharToUTF16( char * ptr , UTF16 * ret ) int UTF8_convertToUTF16( char * ptr , UTF16 * ret, int limit ) { int len = 0; - while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the null terminator + while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the nullptr terminator { int clen = UTF8_convertCharToUTF16( ptr, ret ); ptr += clen; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.cpp index e3400df0..8ad45428 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.cpp @@ -91,7 +91,7 @@ namespace Base ByteStream::ByteStream() : allocatedSize(0), beginReadIterator(), - data(NULL), + data(nullptr), size(0), lastPutSize(0) { @@ -208,7 +208,7 @@ namespace Base if(data->size < allocatedSize) { unsigned char * tmp = new unsigned char[newSize]; - if(data->buffer != NULL) + if(data->buffer != nullptr) memcpy(tmp, data->buffer, size); delete[] data->buffer; data->buffer = tmp; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.cpp index 2f68dd50..527f5b69 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericApiCore.cpp @@ -117,7 +117,7 @@ unsigned GenericAPICore::submitRequest(GenericRequest *req, GenericResponse *res } req->setTrack(m_currTrack); res->setTrack(m_currTrack); - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -136,7 +136,7 @@ void GenericAPICore::process() if (!m_suspended) { // Process timeout on pending requests - while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(NULL))) + while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(nullptr))) { --m_outCount; res = m_outboundQueue.front().second; @@ -148,7 +148,7 @@ void GenericAPICore::process() } // Process timeout on pending responses - while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(NULL))) + while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(nullptr))) { --m_pendingCount; m_pending.erase(m_pending.begin()); @@ -161,7 +161,7 @@ void GenericAPICore::process() pair out_pair = m_outboundQueue.front(); req = out_pair.first; res = out_pair.second; - GenericConnection *con = NULL; + GenericConnection *con = nullptr; if (req->getMappedServerTrack() == 0) // request has no originating "owner" server { con = getNextActiveConnection(); // it does not matter which server we send this to @@ -178,7 +178,7 @@ void GenericAPICore::process() } } - if (con != NULL) + if (con != nullptr) { Base::ByteStream msg; req->pack(msg); @@ -213,7 +213,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() unsigned startIndex = m_nextConnectionIndex; unsigned maxIndex = m_serverConnections.size() - 1; - GenericConnection *con = NULL; + GenericConnection *con = nullptr; //loop until we find an active connection, or until we get back // to where we started @@ -233,7 +233,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() //went past end of vector, start back at 0 m_nextConnectionIndex = 0; } - }while (con == NULL && m_nextConnectionIndex != startIndex); + }while (con == nullptr && m_nextConnectionIndex != startIndex); return con; } @@ -259,7 +259,7 @@ ServerTrackObject *GenericAPICore::findServer(unsigned server_track) { std::map::iterator iter = m_serverTracks.find(server_track); if (iter == m_serverTracks.end()) - return NULL; + return nullptr; ServerTrackObject *stobj = (*iter).second; m_serverTracks.erase(server_track); return stobj; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericConnection.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericConnection.cpp index ef652f08..2fd9ca45 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericConnection.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/CTGenericAPI/GenericConnection.cpp @@ -22,7 +22,7 @@ using namespace Base; GenericConnection::GenericConnection(const char *host, short port, GenericAPICore *apiCore, unsigned reconnectTimeout, unsigned noDataTimeoutSecs, unsigned noAckTimeoutSecs, unsigned incomingBufSizeInKB, unsigned outgoingBufSizeInKB, unsigned keepAlive, unsigned maxRecvMessageSizeInKB) : m_bConnected(CON_NONE), m_apiCore(apiCore), - m_con(NULL), + m_con(nullptr), m_host(host), m_port(port), m_lastTrack(123455), //random choice != 1 @@ -47,8 +47,8 @@ GenericConnection::~GenericConnection() { if(m_con) { - m_con->SetHandler(NULL); - m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to null, so it wont + m_con->SetHandler(nullptr); + m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to nullptr, so it wont m_con->Release(); } @@ -61,7 +61,7 @@ void GenericConnection::disconnect() { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; @@ -74,7 +74,7 @@ void GenericConnection::OnTerminated(TcpConnection *con) if(m_con) { m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; @@ -90,7 +90,7 @@ void GenericConnection::OnRoutePacket(TcpConnection *con, const unsigned char *d get(iter, type); get(iter, track); - GenericResponse *res = NULL; + GenericResponse *res = nullptr; // the following if block is a temporary fix that prevents // a crash with a game team in which they occasionally find @@ -148,7 +148,7 @@ void GenericConnection::process() { m_con->SetHandler(this); m_conState = CON_NEGOTIATE; - m_conTimeout = time(NULL) + m_reconnectTimeout; + m_conTimeout = time(nullptr) + m_reconnectTimeout; } break; case CON_NEGOTIATE: @@ -169,12 +169,12 @@ void GenericConnection::process() put(msg, m_apiCore->getGameCode()); Send(msg); } - else if(time(NULL) > m_conTimeout) + else if(time(nullptr) > m_conTimeout) { // we did not connect m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; m_conState = CON_DISCONNECT; m_bConnected = CON_NONE; } @@ -190,7 +190,7 @@ void GenericConnection::process() { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } } m_manager->GiveTime(); diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp index 57f9b409..4e6b0954 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/CTServiceAPI.cpp @@ -23,7 +23,7 @@ CTServiceAPI::CTServiceAPI(const char *hostName, const char *game) std::vector hostArray; std::vector portArray; char hostConfig[4096]; - if (hostName == NULL) + if (hostName == nullptr) hostName = DEFAULT_HOST; if (!game) game = DEFAULT_GAMECODE; @@ -47,7 +47,7 @@ CTServiceAPI::CTServiceAPI(const char *hostName, const char *game) portArray.push_back(port); } } - while ((ptr = strtok(NULL, " ")) != NULL); + while ((ptr = strtok(nullptr, " ")) != nullptr); } if (hostArray.empty()) { diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/IPAddress.h b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/IPAddress.h index f6d5f886..03b59e8d 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/IPAddress.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/IPAddress.h @@ -32,7 +32,7 @@ public: * @brief Used to retreive the the dot-notation represenatatiion of this address. * * @param buffer A pointer to the buffer to place the ip address into. - * Must be at least 17 characters long, will be null terminated. + * Must be at least 17 characters long, will be nullptr terminated. * * @return A pointer to the buffer the address was placed into. */ diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpBlockAllocator.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpBlockAllocator.cpp index 6d476d78..b7da0f27 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpBlockAllocator.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpBlockAllocator.cpp @@ -6,7 +6,7 @@ namespace NAMESPACE #endif TcpBlockAllocator::TcpBlockAllocator(const unsigned initSize, const unsigned initCount) -: m_freeHead(NULL), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) +: m_freeHead(nullptr), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) { realloc(); } @@ -33,7 +33,7 @@ data_block *TcpBlockAllocator::getBlock() tmp = m_freeHead; m_freeHead = m_freeHead->m_next; - tmp->m_next = NULL; + tmp->m_next = nullptr; m_numAvailBlocks--; return(tmp); } @@ -56,7 +56,7 @@ void TcpBlockAllocator::returnBlock(data_block *b) void TcpBlockAllocator::realloc() { - data_block *tmp = NULL, *cursor = NULL; + data_block *tmp = nullptr, *cursor = nullptr; tmp = new data_block; m_numAvailBlocks++; cursor = tmp; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.cpp index 0b3366a8..cd2c1f20 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.cpp @@ -11,28 +11,28 @@ namespace NAMESPACE //used when want to open new connection with this socket TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, const IPAddress &destIP, short destPort, unsigned timeout) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(INVALID_SOCKET), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusNegotiating), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(timeout), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -94,28 +94,28 @@ TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAllo //used when server mode creates new connection object representing a connect request TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, SOCKET socket, const IPAddress &destIP, short destPort) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(socket), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusConnected), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(0), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -205,7 +205,7 @@ int TcpConnection::finishConnect() t.tv_sec = 0; t.tv_usec = 0; - int err = select(m_socket + 1, NULL, &wrSet, NULL, &t); + int err = select(m_socket + 1, nullptr, &wrSet, nullptr, &t); if (err == 0) { @@ -300,7 +300,7 @@ TcpConnection::~TcpConnection() { delete [] m_recvBuff; - while(m_head != NULL) + while(m_head != nullptr) { data_block *tmp = m_head; m_head = m_head->m_next; @@ -324,22 +324,22 @@ void TcpConnection::Send(const char *data, unsigned int dataLen) { m_aliveListId = m_manager->m_keepAliveList.m_listID; - if (m_prevKeepAliveConnection != NULL) + if (m_prevKeepAliveConnection != nullptr) m_prevKeepAliveConnection->m_nextKeepAliveConnection = m_nextKeepAliveConnection; - if (m_nextKeepAliveConnection != NULL) + if (m_nextKeepAliveConnection != nullptr) m_nextKeepAliveConnection->m_prevKeepAliveConnection = m_prevKeepAliveConnection; if (m_manager->m_keepAliveList.m_beginList == this) m_manager->m_keepAliveList.m_beginList = m_nextKeepAliveConnection; m_nextKeepAliveConnection = m_manager->m_aliveList.m_beginList; - m_prevKeepAliveConnection = NULL; - if (m_manager->m_aliveList.m_beginList != NULL) + m_prevKeepAliveConnection = nullptr; + if (m_manager->m_aliveList.m_beginList != nullptr) m_manager->m_aliveList.m_beginList->m_prevKeepAliveConnection = this; m_manager->m_aliveList.m_beginList = this; } - data_block *work = NULL; + data_block *work = nullptr; // this connection has no send buffer. Get a block if(!m_tail) @@ -464,16 +464,16 @@ int TcpConnection::processIncoming() { m_recvDataListId = m_manager->m_noDataList.m_listID; - if (m_prevRecvDataConnection != NULL) + if (m_prevRecvDataConnection != nullptr) m_prevRecvDataConnection->m_nextRecvDataConnection = m_nextRecvDataConnection; - if (m_nextRecvDataConnection != NULL) + if (m_nextRecvDataConnection != nullptr) m_nextRecvDataConnection->m_prevRecvDataConnection = m_prevRecvDataConnection; if (m_manager->m_noDataList.m_beginList == this) m_manager->m_noDataList.m_beginList = m_nextRecvDataConnection; m_nextRecvDataConnection = m_manager->m_dataList.m_beginList; - m_prevRecvDataConnection = NULL; - if (m_manager->m_dataList.m_beginList != NULL) + m_prevRecvDataConnection = nullptr; + if (m_manager->m_dataList.m_beginList != nullptr) m_manager->m_dataList.m_beginList->m_prevRecvDataConnection = this; m_manager->m_dataList.m_beginList = this; } @@ -619,7 +619,7 @@ int TcpConnection::processOutgoing() int sendError = 1; - // If m_head is not null, then this connection has something to send + // If m_head is not nullptr, then this connection has something to send if(m_head) diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.h b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.h index 07eb4f42..92d631d1 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpConnection.h @@ -50,7 +50,7 @@ public: * connection is disconnected, you simply need to derive your class * (multiply if necessary) from TcpConnectionHandler, then you can use * this method to set the object the TcpConnection will call as appropriate. - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for notifications. */ diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.cpp index fa4d61a4..2586fa64 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.cpp @@ -41,14 +41,14 @@ TcpManager::TcpParams::TcpParams(const TcpParams &cpy) } TcpManager::TcpManager(const TcpParams ¶ms) -: m_handler(NULL), - m_keepAliveList(NULL, 1), - m_aliveList(NULL, 2), - m_noDataList(NULL, 1), - m_dataList(NULL, 2), +: m_handler(nullptr), + m_keepAliveList(nullptr, 1), + m_aliveList(nullptr, 2), + m_noDataList(nullptr, 1), + m_dataList(nullptr, 2), m_params(params), m_refCount(1), - m_connectionList(NULL), + m_connectionList(nullptr), m_connectionListCount(0), m_socket(INVALID_SOCKET), m_boundAsServer(false), @@ -86,7 +86,7 @@ TcpManager::~TcpManager() close(m_socket); #endif } - while (m_connectionList != NULL) + while (m_connectionList != nullptr) { TcpConnection *con = m_connectionList; m_connectionList = m_connectionList->m_nextConnection; @@ -162,7 +162,7 @@ bool TcpManager::BindAsServer() { struct hostent * lphp; lphp = gethostbyname(m_params.bindAddress); - if (lphp != NULL) + if (lphp != nullptr) addr_loc.sin_addr.s_addr = ((struct in_addr *)(lphp->h_addr))->s_addr; } else @@ -187,7 +187,7 @@ bool TcpManager::BindAsServer() TcpConnection *TcpManager::acceptClient() { - TcpConnection *newConn = NULL; + TcpConnection *newConn = nullptr; if (m_boundAsServer && m_connectionListCount < m_params.maxConnections) { @@ -201,7 +201,7 @@ TcpConnection *TcpManager::acceptClient() { newConn = new TcpConnection(this, &m_allocator, m_params, sock, IPAddress(addr.sin_addr.s_addr), ntohs(addr.sin_port)); addNewConnection(newConn); - if (m_handler != NULL) + if (m_handler != nullptr) { m_handler->OnConnectRequest(newConn); } @@ -226,8 +226,8 @@ SOCKET TcpManager::getMaxFD() if (m_boundAsServer) maxfd = m_socket+1; - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->GetStatus() != TcpConnection::StatusDisconnected && con->m_socket > maxfd) @@ -241,8 +241,8 @@ SOCKET TcpManager::getMaxFD() TcpConnection *TcpManager::getConnection(SOCKET fd) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->m_socket == fd) @@ -251,7 +251,7 @@ TcpConnection *TcpManager::getConnection(SOCKET fd) } } //if get here ,couldn't find it - return NULL; + return nullptr; } bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendTimePerConnection, unsigned maxRecvTimePerConnection) @@ -273,8 +273,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT { // Send output from last heartbeat - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -341,7 +341,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT tmpfds = m_permfds; timeout.tv_sec = 0; timeout.tv_usec = 0; - int cnt = select(maxfd, &tmpfds, NULL, NULL, &timeout); // blocks for timeout + int cnt = select(maxfd, &tmpfds, nullptr, nullptr, &timeout); // blocks for timeout if (cnt > 0) @@ -367,8 +367,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //process incoming client messages if (maxRecvTimePerConnection != 0) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -433,8 +433,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT pollfds[0].events |= POLLIN; } - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next, idx++) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next, idx++) { next = con->m_nextConnection; pollfds[idx].fd = con->m_socket; @@ -474,7 +474,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT } //process regular msg(s) - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -506,7 +506,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT }//if(pollfds[... else if (pollfds[idx].revents & POLLHUP) { - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -524,21 +524,21 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any keepalives, if time to do that if (m_params.keepAliveDelay > 0 && m_keepAliveTimer.isDone(m_params.keepAliveDelay)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_keepAliveList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_keepAliveList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); next = con->m_nextKeepAliveConnection; if (next) next->AddRef(); - con->Send(NULL, 0); //note: this request will move the connection from the keepAliveList to the aliveList + con->Send(nullptr, 0); //note: this request will move the connection from the keepAliveList to the aliveList con->Release(); } //now move the complete alive list over to the keepalive list to reset those timers m_keepAliveList.m_beginList = m_aliveList.m_beginList; - m_aliveList.m_beginList = NULL; + m_aliveList.m_beginList = nullptr; //switch id's for those connections that were in the alive list last go - around int tmpID = m_aliveList.m_listID; @@ -552,8 +552,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any noDataCons, if time to do that if (m_params.noDataTimeout > 0 && m_noDataTimer.isDone(m_params.noDataTimeout)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_noDataList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_noDataList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -567,7 +567,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now move the complete data list over to the nodata list to reset those timers m_noDataList.m_beginList = m_dataList.m_beginList; - m_dataList.m_beginList = NULL; + m_dataList.m_beginList = nullptr; //switch id's for those connections that were in the data list last go - around int tmpID = m_dataList.m_listID; @@ -589,11 +589,11 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { //can't open outgoing connections when in server mode // use a different TcpManager to do that - return NULL; + return nullptr; } if (m_connectionListCount >= m_params.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); @@ -601,8 +601,8 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; } IPAddress destIP(address); @@ -622,22 +622,22 @@ void TcpManager::addNewConnection(TcpConnection *con) FD_SET(con->m_socket, &m_permfds); #endif con->m_nextConnection = m_connectionList; - con->m_prevConnection = NULL; - if (m_connectionList != NULL) + con->m_prevConnection = nullptr; + if (m_connectionList != nullptr) m_connectionList->m_prevConnection = con; m_connectionList = con; m_connectionListCount++; con->m_nextKeepAliveConnection = m_aliveList.m_beginList; - con->m_prevKeepAliveConnection = NULL; - if (m_aliveList.m_beginList != NULL) + con->m_prevKeepAliveConnection = nullptr; + if (m_aliveList.m_beginList != nullptr) m_aliveList.m_beginList->m_prevKeepAliveConnection = con; m_aliveList.m_beginList = con; con->m_aliveListId = m_keepAliveList.m_listID;//start it out thinking it's already in the alive list, since it is con->m_nextRecvDataConnection = m_dataList.m_beginList; - con->m_prevRecvDataConnection = NULL; - if (m_dataList.m_beginList != NULL) + con->m_prevRecvDataConnection = nullptr; + if (m_dataList.m_beginList != nullptr) m_dataList.m_beginList->m_prevRecvDataConnection = con; m_dataList.m_beginList = con; con->m_recvDataListId = m_noDataList.m_listID;//start it out thinking it's already in the data list, since it is @@ -655,40 +655,40 @@ void TcpManager::removeConnection(TcpConnection *con) FD_CLR(con->m_socket, &m_permfds); } #endif - if (con->m_prevConnection != NULL) + if (con->m_prevConnection != nullptr) con->m_prevConnection->m_nextConnection = con->m_nextConnection; - if (con->m_nextConnection != NULL) + if (con->m_nextConnection != nullptr) con->m_nextConnection->m_prevConnection = con->m_prevConnection; if (m_connectionList == con) m_connectionList = con->m_nextConnection; - con->m_nextConnection = NULL; - con->m_prevConnection = NULL; + con->m_nextConnection = nullptr; + con->m_prevConnection = nullptr; - if (con->m_prevKeepAliveConnection != NULL) + if (con->m_prevKeepAliveConnection != nullptr) con->m_prevKeepAliveConnection->m_nextKeepAliveConnection = con->m_nextKeepAliveConnection; - if (con->m_nextKeepAliveConnection != NULL) + if (con->m_nextKeepAliveConnection != nullptr) con->m_nextKeepAliveConnection->m_prevKeepAliveConnection = con->m_prevKeepAliveConnection; if (m_aliveList.m_beginList == con) m_aliveList.m_beginList = con->m_nextKeepAliveConnection; else if (m_keepAliveList.m_beginList == con) m_keepAliveList.m_beginList = con->m_nextKeepAliveConnection; - con->m_nextKeepAliveConnection = NULL; - con->m_prevKeepAliveConnection = NULL; + con->m_nextKeepAliveConnection = nullptr; + con->m_prevKeepAliveConnection = nullptr; - if (con->m_prevRecvDataConnection != NULL) + if (con->m_prevRecvDataConnection != nullptr) con->m_prevRecvDataConnection->m_nextRecvDataConnection = con->m_nextRecvDataConnection; - if (con->m_nextRecvDataConnection != NULL) + if (con->m_nextRecvDataConnection != nullptr) con->m_nextRecvDataConnection->m_prevRecvDataConnection = con->m_prevRecvDataConnection; if (m_dataList.m_beginList == con) m_dataList.m_beginList = con->m_nextRecvDataConnection; else if (m_noDataList.m_beginList == con) m_noDataList.m_beginList = con->m_nextRecvDataConnection; - con->m_nextRecvDataConnection = NULL; - con->m_prevRecvDataConnection = NULL; + con->m_nextRecvDataConnection = nullptr; + con->m_prevRecvDataConnection = nullptr; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.h b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.h index 75eb6df4..c4e8b1cf 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/TcpManager.h @@ -156,7 +156,7 @@ public: * simply need to derive your class (multiply if necessary) from TcpManagerHandler, then you can use * this method to set the object the TcpManager will call as appropriate. The TcpConnection object * also has a handler mechanism that replaces the other callback functions below, see TcpConnection::SetHandler - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for manager related notifications. */ @@ -211,7 +211,7 @@ public: * the connect-complete callback to be called if the connection is succesfull. * * @return A pointer to a TcpConnection object. - * NULL if the manager object has exceeded its maximum number of connections + * nullptr if the manager object has exceeded its maximum number of connections * or if the serverAddress cannot be resolved to an IP address. */ TcpConnection *EstablishConnection(const char *serverAddress, unsigned short serverPort, unsigned timeout = 0); diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TestClient/Main.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/TestClient/Main.cpp index eb7a09ab..188be18e 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TestClient/Main.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TestClient/Main.cpp @@ -10,7 +10,7 @@ using namespace CTService; unsigned openRequests = 0; -CTServiceAPI *waitclient = NULL; +CTServiceAPI *waitclient = nullptr; std::map m_tests; std::string game_code; diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.h index 741a6e80..493c5a2d 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Unicode/UnicodeCharacterDataMap.h @@ -122,7 +122,7 @@ namespace Plat_Unicode /** * Find a CharData for the given code point. - * @return null if no CharData exists for this code point + * @return nullptr if no CharData exists for this code point */ inline const CharData * CharDataMap::findCharData (const unicode_char_t code) const diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/test/main.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/test/main.cpp index 4f91d382..e24b265e 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/test/main.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/test/main.cpp @@ -135,7 +135,7 @@ namespace CTService const char *game, const char *param) { - printf("onServerTest(%u, %s, %s)\n", server_track, game ? game : "(null)", param ? param : "(null)"); + printf("onServerTest(%u, %s, %s)\n", server_track, game ? game : "(nullptr)", param ? param : "(nullptr)"); replyTest(server_track, 999, 0); } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarIteratorCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarIteratorCore.cpp index 3786718c..9548bc9f 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarIteratorCore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarIteratorCore.cpp @@ -9,7 +9,7 @@ namespace ChatSystem // AVATAR ITERATOR CORE AvatarIteratorCore::AvatarIteratorCore() -: m_map(NULL) +: m_map(nullptr) { } @@ -33,7 +33,7 @@ AvatarIteratorCore &AvatarIteratorCore::operator=(const AvatarIteratorCore& rhs) ChatAvatar *AvatarIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { @@ -87,7 +87,7 @@ bool AvatarIteratorCore::outOfBounds() // MODERATOR ITERATOR CORE ModeratorIteratorCore::ModeratorIteratorCore() -: m_set(NULL) +: m_set(nullptr) { } @@ -111,7 +111,7 @@ ModeratorIteratorCore &ModeratorIteratorCore::operator=(const ModeratorIteratorC ChatAvatar *ModeratorIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { @@ -165,7 +165,7 @@ bool ModeratorIteratorCore::outOfBounds() // TEMPORARY MODERATOR ITERATOR CORE TemporaryModeratorIteratorCore::TemporaryModeratorIteratorCore() -: m_set(NULL) +: m_set(nullptr) { } @@ -189,7 +189,7 @@ TemporaryModeratorIteratorCore &TemporaryModeratorIteratorCore::operator=(const ChatAvatar *TemporaryModeratorIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { @@ -243,7 +243,7 @@ bool TemporaryModeratorIteratorCore::outOfBounds() // VOICE ITERATOR CORE VoiceIteratorCore::VoiceIteratorCore() -: m_set(NULL) +: m_set(nullptr) { } @@ -267,7 +267,7 @@ VoiceIteratorCore &VoiceIteratorCore::operator=(const VoiceIteratorCore& rhs) ChatAvatar *VoiceIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { @@ -321,7 +321,7 @@ bool VoiceIteratorCore::outOfBounds() // INVITE ITERATOR CORE InviteIteratorCore::InviteIteratorCore() -: m_set(NULL) +: m_set(nullptr) { } @@ -345,7 +345,7 @@ InviteIteratorCore &InviteIteratorCore::operator=(const InviteIteratorCore& rhs) ChatAvatar *InviteIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { @@ -399,7 +399,7 @@ bool InviteIteratorCore::outOfBounds() // BAN ITERATOR CORE BanIteratorCore::BanIteratorCore() -: m_set(NULL) +: m_set(nullptr) { } @@ -423,7 +423,7 @@ BanIteratorCore &BanIteratorCore::operator=(const BanIteratorCore& rhs) ChatAvatar *BanIteratorCore::getCurAvatar() { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; if (!outOfBounds()) { diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarListItemCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarListItemCore.cpp index 15e9af48..6bbc82e9 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarListItemCore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarListItemCore.cpp @@ -7,7 +7,7 @@ namespace ChatSystem using namespace Plat_Unicode; AvatarListItem::AvatarListItem() - : m_core(NULL) + : m_core(nullptr) { } @@ -16,7 +16,7 @@ namespace ChatSystem } AvatarListItemCore::AvatarListItemCore() - : m_interface(NULL) + : m_interface(nullptr) { } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.cpp index 021afd5d..9b1e1cd0 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.cpp @@ -13,7 +13,7 @@ namespace ChatSystem { ChatAPI::ChatAPI(const char *registrar_host, short registrar_port, const char *server_host, short server_port) -: m_defaultRoomParams(NULL), +: m_defaultRoomParams(nullptr), m_defaultLoginPriority(0), m_defaultEntryType(false) { @@ -25,13 +25,13 @@ ChatAPI::ChatAPI(const char *registrar_host, short registrar_port, const char *s ChatAPI::~ChatAPI() { delete m_defaultRoomParams; - m_defaultRoomParams = NULL; + m_defaultRoomParams = nullptr; delete m_core; - m_core = NULL; + m_core = nullptr; } ChatAPI::ChatAPI(ChatAPICore *core) -: m_defaultRoomParams(NULL) +: m_defaultRoomParams(nullptr) { m_core = core; m_core->setAPI(this); @@ -721,7 +721,7 @@ void ChatAPI::setDefaultRoomParams(RoomParams *roomParams) { if (roomParams) { - if (m_defaultRoomParams == NULL) + if (m_defaultRoomParams == nullptr) { m_defaultRoomParams = new RoomParams; } @@ -732,7 +732,7 @@ void ChatAPI::setDefaultRoomParams(RoomParams *roomParams) else { delete m_defaultRoomParams; - m_defaultRoomParams = NULL; + m_defaultRoomParams = nullptr; } } void ChatAPI::setDefaultLoginLocation(const ChatUnicodeString &defaultLoginLocation) diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.h b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.h index 00533e05..0d255ca2 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.h +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.h @@ -105,7 +105,7 @@ namespace ChatSystem // will be connected to, as well as the hostname and port of the Registrar // ChatServer (which will automatically reroute the ChatAPI connection to // a hotspare ChatServer if the provided choice is unavailable). - // NULL pointers are NOT valid input. + // nullptr pointers are NOT valid input. ChatAPI(const char *registrar_host, short registrar_port, const char *server_host, short server_port); virtual ~ChatAPI(); @@ -209,7 +209,7 @@ namespace ChatSystem // getAvatar // Requests immediate return of a ChatAvatar object that this API // has cached due to a RequestLoginAvatar. Request does not go - // to ChatServer. Returns NULL if API does not have object locally. + // to ChatServer. Returns nullptr if API does not have object locally. ChatAvatar *getAvatar(const ChatUnicodeString &avatarName, const ChatUnicodeString &avatarAddress); ChatAvatar *getAvatar(unsigned avatarID); @@ -286,7 +286,7 @@ namespace ChatSystem // Requests immediate return of a ChatRoom object that this API // has cached due to a RequestGetRoom, RequestCreateRoom, or // RequestEnterRoom. Request does not go to ChatServer. Returns - // NULL if API does not have object locally. + // nullptr if API does not have object locally. ChatRoom *getRoom(const ChatUnicodeString &roomAddress); ChatRoom *getRoom(unsigned roomID); @@ -298,13 +298,13 @@ namespace ChatSystem // getDefaultRoomParams // Requests the ChatAPI's current default RoomParams object. Used for - // the EnterRoom call. If NULL, EnterRoom will not do passive room + // the EnterRoom call. If nullptr, EnterRoom will not do passive room // creation if the room to enter does not yet exist. Initial value - // is NULL (no RoomParams object defined). + // is nullptr (no RoomParams object defined). const RoomParams *getDefaultRoomParams(void); // setDefaultRoomParams - // Sets the ChatAPI's current default RoomParams object. Passing a NULL + // Sets the ChatAPI's current default RoomParams object. Passing a nullptr // pointer will cause the default params not to be used by EnterRoom. void setDefaultRoomParams(RoomParams *roomParams); diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp index 5724a68f..99cfe621 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp @@ -67,7 +67,7 @@ const char * const ChatAPICore::ms_errorStringsEnglish[] = "UID node already exists", "Wrong chat server for request", "Succeeded, but local data is invalid", - "Login with null name", + "Login with nullptr name", "No server assigned to this identity", // 45 "Another server already assumed this identity", "Remote server is down", @@ -82,9 +82,9 @@ const char * const ChatAPICore::ms_errorStringsEnglish[] = "Duplicate voice", "Chat avatar must first be logged out", "No work to do", - "Cannot perform rename to NULL avatar name", + "Cannot perform rename to nullptr avatar name", "Cannot perform station acct transfer to stationID = 0", // 60 - "Cannot perform avatar move to NULL avatar address", + "Cannot perform avatar move to nullptr avatar address", "Failed to obtain an ID for a new room or avatar", "Room is local to namespace/world; cannot enter from other worlds", "Room is local to game; cannot enter from other game namespaces", @@ -122,7 +122,7 @@ ChatAPICore::ChatAPICore(const char *registrar_host, short registrar_port, const m_registrarPort(registrar_port), m_defaultServerPort(server_port), m_assignedServerPort(server_port), - m_timeSinceLastDisconnect(time(NULL)), + m_timeSinceLastDisconnect(time(nullptr)), m_rcvdRegistrarResponse(false), m_shouldSendVersion(true) { @@ -132,7 +132,7 @@ ChatAPICore::ChatAPICore(const char *registrar_host, short registrar_port, const ChatAPICore::~ChatAPICore() { - m_api = NULL; + m_api = nullptr; std::map::iterator iter = m_avatarCoreCache.begin(); for (; iter != m_avatarCoreCache.end(); ++iter) @@ -209,7 +209,7 @@ void ChatAPICore::cacheAvatar(ChatAvatarCore *avatarCore) ChatAvatarCore *ChatAPICore::getAvatarCore(unsigned avatarID) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; std::map::iterator iter = m_avatarCoreCache.find(avatarID); if(iter != m_avatarCoreCache.end()) @@ -221,7 +221,7 @@ ChatAvatarCore *ChatAPICore::getAvatarCore(unsigned avatarID) ChatAvatar *ChatAPICore::getAvatar(unsigned avatarID) { - ChatAvatar *returnAvatar = NULL; + ChatAvatar *returnAvatar = nullptr; std::map::iterator iter = m_avatarCache.find(avatarID); if(iter != m_avatarCache.end()) @@ -233,7 +233,7 @@ ChatAvatar *ChatAPICore::getAvatar(unsigned avatarID) ChatAvatarCore *ChatAPICore::decacheAvatar(unsigned avatarID) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; std::map::iterator iterCore = m_avatarCoreCache.find(avatarID); if(iterCore != m_avatarCoreCache.end()) { @@ -267,7 +267,7 @@ void ChatAPICore::cacheRoom(ChatRoomCore *roomCore) ChatRoomCore *ChatAPICore::getRoomCore(unsigned roomID) { - ChatRoomCore *returnRoom = NULL; + ChatRoomCore *returnRoom = nullptr; std::map::iterator iter = m_roomCoreCache.find(roomID); if(iter != m_roomCoreCache.end()) { @@ -279,7 +279,7 @@ ChatRoomCore *ChatAPICore::getRoomCore(unsigned roomID) ChatRoom *ChatAPICore::getRoom(unsigned roomID) { - ChatRoom *returnRoom = NULL; + ChatRoom *returnRoom = nullptr; std::map::iterator iter = m_roomCache.find(roomID); if(iter != m_roomCache.end()) { @@ -291,7 +291,7 @@ ChatRoom *ChatAPICore::getRoom(unsigned roomID) ChatRoomCore *ChatAPICore::decacheRoom(unsigned roomID) { - ChatRoomCore *returnRoom = NULL; + ChatRoomCore *returnRoom = nullptr; std::map::iterator iterCore = m_roomCoreCache.find(roomID); if(iterCore != m_roomCoreCache.end()) @@ -315,7 +315,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_LOGINAVATAR: { ResLoginAvatar *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getAvatar()) { @@ -338,7 +338,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_TEMPORARYAVATAR: { ResTemporaryAvatar* R = static_cast(res); - ChatAvatar* avatar = NULL; + ChatAvatar* avatar = nullptr; if ( R->getAvatar() ) { @@ -394,8 +394,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_GETAVATAR: { ResGetAvatar *R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -403,7 +403,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatarCore->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { // update cached information with returned data cachedAvatar->setAttributes(avatarCore->getAttributes()); @@ -427,7 +427,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) m_api->OnGetAvatar(R->getTrack(), R->getResult(), avatar, R->getUser()); - if (cachedAvatar == NULL) + if (cachedAvatar == nullptr) { delete avatar; } @@ -438,8 +438,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_GETANYAVATAR: { ResGetAnyAvatar *R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -447,7 +447,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatarCore->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { // update cached information with returned data cachedAvatar->setAttributes(avatarCore->getAttributes()); @@ -471,7 +471,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) m_api->OnGetAnyAvatar(R->getTrack(), R->getResult(), avatar, R->isLoggedIn(), R->getUser()); - if (cachedAvatar == NULL) + if (cachedAvatar == nullptr) { delete avatar; } @@ -490,8 +490,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SETAVATARATTRIBUTES: { ResSetAvatarAttributes *R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -502,14 +502,14 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatar->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar->setAttributes(avatar->getAttributes()); } } } - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar = avatar; m_api->OnSetAvatarAttributes(R->getTrack(), R->getResult(), cachedAvatar, R->getUser()); @@ -531,8 +531,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SETSTATUSMESSAGE: { ResSetAvatarStatusMessage *R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -543,14 +543,14 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatar->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar->setStatusMessage(avatar->getStatusMessage()); } } } - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar = avatar; m_api->OnSetAvatarStatusMessage(R->getTrack(), R->getResult(), cachedAvatar, R->getUser()); @@ -572,8 +572,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SETAVATAREMAIL: { ResSetAvatarForwardingEmail*R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -584,14 +584,14 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatar->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar->setForwardingEmail(avatar->getForwardingEmail()); } } } - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar = avatar; m_api->OnSetAvatarForwardingEmail(R->getTrack(), R->getResult(), cachedAvatar, R->getUser()); @@ -613,8 +613,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SETAVATARINBOXLIMIT: { ResSetAvatarInboxLimit *R = static_cast(res); - ChatAvatar *cachedAvatar = NULL; - ChatAvatar *avatar = NULL; + ChatAvatar *cachedAvatar = nullptr; + ChatAvatar *avatar = nullptr; ChatAvatarCore *avatarCore = R->getAvatar(); if (R->getResult() == 0 && avatarCore) // if success @@ -625,14 +625,14 @@ void ChatAPICore::responseCallback(GenericResponse *res) // attempt to return locally cached avatar, if available cachedAvatar = getAvatar(avatar->getAvatarID()); - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar->setInboxLimit(avatar->getInboxLimit()); } } } - if (cachedAvatar != NULL) + if (cachedAvatar != nullptr) { cachedAvatar = avatar; m_api->OnSetAvatarInboxLimit(R->getTrack(), R->getResult(), cachedAvatar, R->getUser()); @@ -654,13 +654,13 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_GETROOM: { ResGetRoom *R = static_cast(res); - ChatRoom *room = NULL; + ChatRoom *room = nullptr; ChatRoomCore *roomCore = R->getRoom(); if (R->getResult() == 0 && roomCore) // if success { unsigned roomid = roomCore->getRoomID(); - if (getRoomCore(roomid) == NULL) + if (getRoomCore(roomid) == nullptr) { // we need to cache this room first cacheRoom(roomCore); @@ -708,8 +708,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) { ResCreateRoom *R = static_cast(res); - ChatRoom *room = NULL; - ChatRoomCore* roomCore = NULL; + ChatRoom *room = nullptr; + ChatRoomCore* roomCore = nullptr; if (R->getResult() == 0) // if success { @@ -939,7 +939,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) else if (!room && !roomCore) { // we didn't have room cached, and we didn't get one to cache, - // thus we'll have trouble giving a callback with a NULL pointer. + // thus we'll have trouble giving a callback with a nullptr pointer. _chatdebug_("ChatAPI:BadData: RESPONSE_ENTERROOM: avatar=%p, room=%p , roomCore=%p\n", avatar, room, roomCore); } } @@ -1175,8 +1175,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_FINDAVATARBYUID: { ResFindAvatarByUID *R = static_cast(res); - ChatAvatar **avatarMatches = NULL; - ChatAvatarCore **avatarCoreMatches = NULL; + ChatAvatar **avatarMatches = nullptr; + ChatAvatarCore **avatarCoreMatches = nullptr; unsigned numAvatarsOnline = R->getNumAvatarsOnline(); @@ -1374,7 +1374,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) // duplicate login from this API, then effectively // our API must consider him logged out because he's now // no longer logged in to his AID controller. - m_api->OnLogoutAvatar(0, 0, avatar, NULL); + m_api->OnLogoutAvatar(0, 0, avatar, nullptr); } } @@ -1476,7 +1476,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_GETAVATARKEYWORDS: { ResGetAvatarKeywords *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { @@ -1494,7 +1494,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SETAVATARKEYWORDS: { ResSetAvatarKeywords *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getAvatarID()); @@ -1510,8 +1510,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_SEARCHAVATARKEYWORDS: { ResSearchAvatarKeywords *R = static_cast(res); - ChatAvatar **avatarMatches = NULL; - ChatAvatarCore **avatarCoreMatches = NULL; + ChatAvatar **avatarMatches = nullptr; + ChatAvatarCore **avatarCoreMatches = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { @@ -1530,7 +1530,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_CONFIRMFRIEND: { ResFriendConfirm *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getAvatarID()); @@ -1546,7 +1546,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_CONFIRMFRIEND_RECIPROCATE: { ResFriendConfirmReciprocate *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getAvatarID()); @@ -1616,7 +1616,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_ADDSNOOPAVATAR: { ResAddSnoopAvatar *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getSrcAvatarID()); @@ -1632,7 +1632,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_REMOVESNOOPAVATAR: { ResRemoveSnoopAvatar *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getSrcAvatarID()); @@ -1648,7 +1648,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_ADDSNOOPROOM: { ResAddSnoopRoom *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getSrcAvatarID()); @@ -1664,7 +1664,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_REMOVESNOOPROOM: { ResRemoveSnoopRoom *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getSrcAvatarID()); @@ -1680,7 +1680,7 @@ void ChatAPICore::responseCallback(GenericResponse *res) case RESPONSE_GETSNOOPLIST: { ResGetSnoopList *R = static_cast(res); - ChatAvatar *avatar = NULL; + ChatAvatar *avatar = nullptr; if(R->getResult() == CHATRESULT_SUCCESS) { avatar = getAvatar(R->getSrcAvatarID()); @@ -1691,8 +1691,8 @@ void ChatAPICore::responseCallback(GenericResponse *res) _chatdebug_("ChatAPI:BadData: RESPONSE_REMOVESNOOPROOM: avatar=%p\n", avatar); } - AvatarSnoopPair **avatarList = NULL; - ChatUnicodeString **roomList = NULL; + AvatarSnoopPair **avatarList = nullptr; + ChatUnicodeString **roomList = nullptr; unsigned numAvatars = R->getAvatarSnoopListLength(); unsigned numRooms = R->getRoomSnoopListLength(); @@ -1763,7 +1763,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatAvatar *destAvatar = getAvatar(M.getDestList()[i]); if (!destAvatar) { - _chatdebug_("ChatAPI:BadData: MESSAGE_ROOMMESSAGE: destAvatar[%i]=NULL\n", i); + _chatdebug_("ChatAPI:BadData: MESSAGE_ROOMMESSAGE: destAvatar[%i]=nullptr\n", i); continue; } m_api->OnReceiveRoomMessage(srcAvatar, destAvatar, destRoom, ChatUnicodeString(M.getMsg().data(), M.getMsg().size()), ChatUnicodeString(M.getOOB().data(), M.getOOB().size())); @@ -1797,7 +1797,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatAvatar *destAvatar = getAvatar(M.getDestList()[i]); if (!destAvatar) { - _chatdebug_("ChatAPI:BadData: MESSAGE_BROADCASTMESSAGE: destAvatar[%i]=NULL\n", i); + _chatdebug_("ChatAPI:BadData: MESSAGE_BROADCASTMESSAGE: destAvatar[%i]=nullptr\n", i); continue; } m_api->OnReceiveBroadcastMessage(srcAvatar, ChatUnicodeString(M.getSrcAddress().data(), M.getSrcAddress().size()), destAvatar, ChatUnicodeString(M.getMsg().data(), M.getMsg().size()), ChatUnicodeString(M.getOOB().data(), M.getOOB().size())); @@ -1877,7 +1877,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID()); if (!destRoomCore) { - _chatdebug_("ChatAPI:destroomCore is null!"); + _chatdebug_("ChatAPI:destroomCore is nullptr!"); break; } @@ -1889,7 +1889,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatAvatar *destAvatar = M.getDestAvatar()->getNewChatAvatar(); ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); - ChatAvatarCore *kickedAvatar = destRoomCore ? destRoomCore->removeAvatar(destAvatar->getAvatarID()) : NULL; + ChatAvatarCore *kickedAvatar = destRoomCore ? destRoomCore->removeAvatar(destAvatar->getAvatarID()) : nullptr; ChatRoom *destRoom = getRoom(M.getRoomID()); if (!srcAvatar || !destAvatar || !kickedAvatar || !destRoom) @@ -2439,12 +2439,12 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); if (!srcAvatar) { - _chatdebug_("ChatAPI:BadData: MESSAGE_ENTERROOM: srcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_ENTERROOM: srcAvatar=nullptr\n"); delete M.getSrcAvatar(); break; } - bool isLocalAvatar = (getAvatar(srcAvatar->getAvatarID()) != NULL); + bool isLocalAvatar = (getAvatar(srcAvatar->getAvatarID()) != nullptr); if(!destRoomCore->addAvatar(M.getSrcAvatar(),isLocalAvatar)) { delete M.getSrcAvatar(); @@ -2492,10 +2492,10 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) if (destRoomCore) { ChatRoom *destRoom = getRoom(M.getRoomID()); - ChatAvatar *srcAvatar = NULL; + ChatAvatar *srcAvatar = nullptr; if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_DESTROYROOM: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_DESTROYROOM: M.getSrcAvatar=nullptr\n"); } else { @@ -2527,7 +2527,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID()); if (!destRoomCore) { - _chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: destRoomCore=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: destRoomCore=nullptr\n"); break; } @@ -2544,7 +2544,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: M.getSrcAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); @@ -2686,7 +2686,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) { MAddAdmin M(iter); ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID()); - if (destRoomCore && (destRoomCore->addAdministrator(M.getAvatar()) == NULL)) + if (destRoomCore && (destRoomCore->addAdministrator(M.getAvatar()) == nullptr)) { delete (M.getAvatar()); } @@ -2696,7 +2696,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) { MRemoveAdmin M(iter); ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID()); - ChatAvatarCore *admin = NULL; + ChatAvatarCore *admin = nullptr; if (destRoomCore) admin = destRoomCore->removeAdministrator(M.getAvatarID()); delete admin; @@ -2707,7 +2707,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) MFriendConfirmRequest M(iter); if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMREQUEST: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMREQUEST: M.getSrcAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); @@ -2730,7 +2730,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRESPONSE: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRESPONSE: M.getSrcAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); @@ -2752,7 +2752,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) MFriendConfirmReciprocateRequest M(iter); if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_REQUEST: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_REQUEST: M.getSrcAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); @@ -2775,7 +2775,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) if (!M.getSrcAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_RESPONSE: M.getSrcAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_RESPONSE: M.getSrcAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar(); @@ -2799,7 +2799,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) ChatRoomCore *destRoomCore = getRoomCore(M.getDestRoomID()); if (!destRoomCore) { - _chatdebug_("ChatAPI:BadData: MESSAGE_CHANGEROOMOWNER: destRoomCore=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_CHANGEROOMOWNER: destRoomCore=nullptr\n"); break; } @@ -2822,7 +2822,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter) if (!M.getRequestorAvatar()) { - _chatdebug_("ChatAPI:BadData: MESSAGE_REQUESTROOMENTRY: M.getRequestorAvatar=NULL\n"); + _chatdebug_("ChatAPI:BadData: MESSAGE_REQUESTROOMENTRY: M.getRequestorAvatar=nullptr\n"); break; } ChatAvatar *srcAvatar = M.getRequestorAvatar()->getNewChatAvatar(); @@ -3025,7 +3025,7 @@ void ChatAPICore::processAPI() } // if we've been disconnected for at least a minute... else if (!m_connected && - time(NULL) - m_timeSinceLastDisconnect >= 60) + time(nullptr) - m_timeSinceLastDisconnect >= 60) { if (m_setToRegistrar) { @@ -3043,7 +3043,7 @@ void ChatAPICore::processAPI() m_setToRegistrar = true; } - m_timeSinceLastDisconnect = time(NULL); + m_timeSinceLastDisconnect = time(nullptr); } @@ -3072,7 +3072,7 @@ void ChatAPICore::OnConnect(const char *host, short port) res->setTrack(m_currTrack); m_currTrack++; - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -3103,7 +3103,7 @@ void ChatAPICore::OnConnect(const char *host, short port) res->setTrack(m_currTrack); m_currTrack++; - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -3147,7 +3147,7 @@ void ChatAPICore::OnDisconnect(const char *host, short port) // stop processing immediately suspendProcessing(); - m_timeSinceLastDisconnect = time(NULL); + m_timeSinceLastDisconnect = time(nullptr); // determine who we disconnected from and take appropriate action if (strcmp(host, m_registrarHost.c_str()) == 0 && @@ -3214,7 +3214,7 @@ void ChatAPICore::failoverReloginOneAvatar(ChatAvatarCore * avatarCore) res->setTrack(m_currTrack); m_currTrack++; - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -3241,7 +3241,7 @@ void ChatAPICore::failoverRecreateRooms() { // first build multimap of rooms keyed by their node level (ascending order is default). multimap levelMap; - ChatRoomCore *roomCore = NULL; + ChatRoomCore *roomCore = nullptr; for (roomIter = m_roomCoreCache.begin(); roomIter != m_roomCoreCache.end(); ++roomIter) { roomCore = (*roomIter).second; @@ -3268,7 +3268,7 @@ void ChatAPICore::failoverRecreateRooms() res->setTrack(m_currTrack); m_currTrack++; - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -3296,7 +3296,7 @@ void ChatAPICore::failoverRecreateRooms() ChatAvatar *ChatAPICore::getAvatar(const ChatUnicodeString &avatarName, const ChatUnicodeString &avatarAddress) { - ChatAvatar *returnVal = NULL; + ChatAvatar *returnVal = nullptr; map::iterator iter = m_avatarCache.begin(); @@ -3317,7 +3317,7 @@ ChatAvatar *ChatAPICore::getAvatar(const ChatUnicodeString &avatarName, const Ch ChatRoom *ChatAPICore::getRoom(const ChatUnicodeString &roomAddress) { - ChatRoom *returnVal = NULL; + ChatRoom *returnVal = nullptr; map::iterator iter = m_roomCache.begin(); diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatEnum.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatEnum.cpp index fba1bc17..f18fac5d 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatEnum.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatEnum.cpp @@ -43,7 +43,7 @@ ChatUnicodeString::ChatUnicodeString(const std::string& nSrc) ChatUnicodeString::ChatUnicodeString(const char *nStrSrc) { - if (nStrSrc==NULL) + if (nStrSrc==nullptr) { m_wideString = getEmptyString(); m_cString = wideToNarrow(m_wideString); diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatFriendStatusCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatFriendStatusCore.cpp index c6eea945..653f0cbd 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatFriendStatusCore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatFriendStatusCore.cpp @@ -7,7 +7,7 @@ namespace ChatSystem using namespace Base; using namespace Plat_Unicode; ChatFriendStatusCore::ChatFriendStatusCore() -: m_interface(NULL), +: m_interface(nullptr), m_status(0) { } @@ -31,7 +31,7 @@ ChatFriendStatusCore::~ChatFriendStatusCore() } ChatFriendStatus::ChatFriendStatus() -: m_core(NULL) +: m_core(nullptr) { } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatIgnoreStatusCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatIgnoreStatusCore.cpp index 06717992..a3fefe08 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatIgnoreStatusCore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatIgnoreStatusCore.cpp @@ -7,7 +7,7 @@ namespace ChatSystem using namespace Plat_Unicode; ChatIgnoreStatus::ChatIgnoreStatus() - : m_core(NULL) + : m_core(nullptr) { } @@ -16,7 +16,7 @@ namespace ChatSystem } ChatIgnoreStatusCore::ChatIgnoreStatusCore() - : m_interface(NULL) + : m_interface(nullptr) { } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoom.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoom.cpp index d022aafa..cdd0238a 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoom.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoom.cpp @@ -581,7 +581,7 @@ unsigned RoomSummary::getRoomMaxSize() const ChatRoom::ChatRoom() { - m_core = NULL; + m_core = nullptr; } ChatRoom::ChatRoom(ChatRoomCore *core) diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoomCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoomCore.cpp index 715a943a..d0c70f68 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoomCore.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoomCore.cpp @@ -189,7 +189,7 @@ ChatRoomCore::~ChatRoomCore() ChatAvatarCore *ChatRoomCore::getAvatarCore(unsigned avatarID) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; map::iterator iterCore = m_inroomAvatarsCore.find(avatarID); @@ -202,7 +202,7 @@ ChatAvatarCore *ChatRoomCore::getAvatarCore(unsigned avatarID) ChatAvatar *ChatRoomCore::getAvatar(unsigned avatarID) { - ChatAvatar *returnAvatar = NULL; + ChatAvatar *returnAvatar = nullptr; map::iterator iter = m_inroomAvatars.find(avatarID); @@ -215,7 +215,7 @@ ChatAvatar *ChatRoomCore::getAvatar(unsigned avatarID) ChatAvatarCore *ChatRoomCore::getModeratorCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_moderatorAvatarsCore.begin(); @@ -238,7 +238,7 @@ ChatAvatarCore *ChatRoomCore::getModeratorCore(const Plat_Unicode::String &name, ChatAvatar *ChatRoomCore::getModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatar *returnAvatar = NULL; + ChatAvatar *returnAvatar = nullptr; set::iterator iter = m_moderatorAvatars.begin(); @@ -263,7 +263,7 @@ ChatAvatar *ChatRoomCore::getModerator(const Plat_Unicode::String &name, const P ChatAvatarCore *ChatRoomCore::getBannedCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_banAvatarsCore.begin(); @@ -286,7 +286,7 @@ ChatAvatarCore *ChatRoomCore::getBannedCore(const Plat_Unicode::String &name, co ChatAvatar *ChatRoomCore::getBanned(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatar *returnAvatar = NULL; + ChatAvatar *returnAvatar = nullptr; set::iterator iter = m_banAvatars.begin(); @@ -311,7 +311,7 @@ ChatAvatar *ChatRoomCore::getBanned(const Plat_Unicode::String &name, const Plat ChatAvatarCore *ChatRoomCore::getInvitedCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_inviteAvatarsCore.begin(); @@ -334,7 +334,7 @@ ChatAvatarCore *ChatRoomCore::getInvitedCore(const Plat_Unicode::String &name, c ChatAvatar *ChatRoomCore::getInvited(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatar *returnAvatar = NULL; + ChatAvatar *returnAvatar = nullptr; set::iterator iter = m_inviteAvatars.begin(); @@ -359,7 +359,7 @@ ChatAvatar *ChatRoomCore::getInvited(const Plat_Unicode::String &name, const Pla ChatAvatarCore *ChatRoomCore::addAvatar(ChatAvatarCore *newAvatar, bool local) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -394,7 +394,7 @@ void ChatRoomCore::addLocalAvatar(unsigned avatarID) ChatAvatarCore *ChatRoomCore::removeAvatar(unsigned avatarID) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; map::iterator iterCore = m_inroomAvatarsCore.find(avatarID); @@ -422,7 +422,7 @@ ChatAvatarCore *ChatRoomCore::removeAvatar(unsigned avatarID) ChatAvatarCore *ChatRoomCore::addBan(ChatAvatarCore *newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -446,7 +446,7 @@ ChatAvatarCore *ChatRoomCore::addBan(ChatAvatarCore *newAvatar) ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_banAvatarsCore.begin(); @@ -494,7 +494,7 @@ ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const ChatAvatarCore *ChatRoomCore::addAdministrator(ChatAvatarCore *newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -518,7 +518,7 @@ ChatAvatarCore *ChatRoomCore::addAdministrator(ChatAvatarCore *newAvatar) ChatAvatarCore *ChatRoomCore::removeAdministrator(unsigned avatarID) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; map::iterator iterCore = m_adminAvatarsCore.find(avatarID); @@ -541,7 +541,7 @@ ChatAvatarCore *ChatRoomCore::removeAdministrator(unsigned avatarID) ChatAvatarCore *ChatRoomCore::addModerator(ChatAvatarCore *newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -565,7 +565,7 @@ ChatAvatarCore *ChatRoomCore::addModerator(ChatAvatarCore *newAvatar) ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_moderatorAvatarsCore.begin(); @@ -613,7 +613,7 @@ ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name, ChatAvatarCore *ChatRoomCore::addTempModerator(ChatAvatarCore *newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -637,7 +637,7 @@ ChatAvatarCore *ChatRoomCore::addTempModerator(ChatAvatarCore *newAvatar) ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_tempModeratorAvatarsCore.begin(); @@ -685,7 +685,7 @@ ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &na ChatAvatarCore *ChatRoomCore::addInvite(ChatAvatarCore* newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -709,7 +709,7 @@ ChatAvatarCore *ChatRoomCore::addInvite(ChatAvatarCore* newAvatar) ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_inviteAvatarsCore.begin(); @@ -757,7 +757,7 @@ ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, con ChatAvatarCore *ChatRoomCore::addVoice(ChatAvatarCore* newAvatar) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; if(newAvatar) { @@ -781,7 +781,7 @@ ChatAvatarCore *ChatRoomCore::addVoice(ChatAvatarCore* newAvatar) ChatAvatarCore *ChatRoomCore::removeVoice(const Plat_Unicode::String &name, const Plat_Unicode::String &address) { - ChatAvatarCore *returnAvatar = NULL; + ChatAvatarCore *returnAvatar = nullptr; set::iterator iterCore = m_voiceAvatarsCore.begin(); @@ -1053,7 +1053,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg) for (avatarIter = m_inroomAvatarsCore.begin(); avatarIter != m_inroomAvatarsCore.end(); ++avatarIter) { // include only the avatars that are on this API - if ( this->getAvatar((*avatarIter).second->getAvatarID()) != NULL ) + if ( this->getAvatar((*avatarIter).second->getAvatarID()) != nullptr ) { avatarsToSend.insert((*avatarIter).second); } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Message.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Message.cpp index d38defbc..93e7e8e5 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Message.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Message.cpp @@ -21,7 +21,7 @@ namespace ChatSystem MRoomMessage::MRoomMessage(ByteStream::ReadIterator &iter) : GenericMessage(MESSAGE_ROOMMESSAGE), - m_destList(NULL), + m_destList(nullptr), m_srcAvatar(iter), m_messageID(0) { @@ -45,13 +45,13 @@ namespace ChatSystem MRoomMessage::~MRoomMessage() { delete[] m_destList; - m_destList = NULL; + m_destList = nullptr; } MBroadcastMessage::MBroadcastMessage(ByteStream::ReadIterator &iter) : GenericMessage(MESSAGE_BROADCASTMESSAGE), m_srcAvatar(iter), - m_destList(NULL) + m_destList(nullptr) { ASSERT_VALID_STRING_LENGTH(get(iter, m_srcAddress)); get(iter, m_listLength); @@ -68,7 +68,7 @@ namespace ChatSystem MBroadcastMessage::~MBroadcastMessage() { delete[] m_destList; - m_destList = NULL; + m_destList = nullptr; } MFilterMessage::MFilterMessage(ByteStream::ReadIterator &iter) diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/PersistentMessage.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/PersistentMessage.cpp index ca4b509e..bb9cfb82 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/PersistentMessage.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/PersistentMessage.cpp @@ -8,7 +8,7 @@ using namespace Base; using namespace Plat_Unicode; PersistentHeader::PersistentHeader() -: m_core(NULL) +: m_core(nullptr) { } @@ -66,7 +66,7 @@ PersistentHeaderCore::PersistentHeaderCore() m_avatarID(0), m_sentTime(0), m_status(0), - m_interface(NULL) + m_interface(nullptr) { } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp index 01afbcf7..2f7600ac 100644 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp @@ -127,7 +127,7 @@ void RGetAvatarKeywords::pack(ByteStream &msg) RSearchAvatarKeywords::RSearchAvatarKeywords(const ChatUnicodeString &nodeAddress, const ChatUnicodeString *keywordsList, unsigned keywordsLength) : GenericRequest(REQUEST_SEARCHAVATARKEYWORDS), m_keywordsLength(keywordsLength), - m_keywordsList(NULL) + m_keywordsList(nullptr) { m_nodeAddress.assign(nodeAddress.string_data); m_keywordsList = new String[keywordsLength]; @@ -898,7 +898,7 @@ m_srcAddress(srcAddress.string_data, srcAddress.string_length), m_destRoomAddress(destRoomAddress.string_data, destRoomAddress.string_length) { // we take in a const RoomParams, so make our own and guarantee - // null-terminated char buffers. + // nullptr-terminated char buffers. m_newRoomName.assign(params->getRoomName().string_data, params->getRoomName().string_length); m_newRoomTopic.assign(params->getRoomTopic().string_data, params->getRoomTopic().string_length); m_newRoomPassword.assign(params->getRoomPassword().string_data, params->getRoomPassword().string_length); diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp index 25d587fc..44a2f0dd 100755 --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp @@ -20,7 +20,7 @@ using namespace Plat_Unicode; ResLoginAvatar::ResLoginAvatar(void *user, int avatarLoginPriority) : GenericResponse(RESPONSE_LOGINAVATAR, CHATRESULT_TIMEOUT, user), - m_avatar(NULL), + m_avatar(nullptr), m_submittedPriority(avatarLoginPriority), m_requiredPriority(INT_MAX) { @@ -63,7 +63,7 @@ void ResLoginAvatar::unpack(ByteStream::ReadIterator &iter) ResTemporaryAvatar::ResTemporaryAvatar(void *user) : GenericResponse(RESPONSE_TEMPORARYAVATAR, CHATRESULT_TIMEOUT, user) -, m_avatar(NULL) +, m_avatar(nullptr) { } @@ -110,7 +110,7 @@ void ResDestroyAvatar::unpack(ByteStream::ReadIterator &iter) ResGetAvatar::ResGetAvatar(void *user) : GenericResponse(RESPONSE_GETAVATAR, CHATRESULT_TIMEOUT, user), - m_avatar(NULL) + m_avatar(nullptr) { } @@ -144,7 +144,7 @@ void ResGetAvatar::unpack(ByteStream::ReadIterator &iter) ResGetAnyAvatar::ResGetAnyAvatar(void* user) : GenericResponse( RESPONSE_GETANYAVATAR, CHATRESULT_TIMEOUT, user ) - , m_avatar( NULL ) + , m_avatar( nullptr ) { } @@ -181,8 +181,8 @@ void ResGetAnyAvatar::unpack(Base::ByteStream::ReadIterator& iter) ResAvatarList::ResAvatarList(void *user) : GenericResponse(RESPONSE_AVATARLIST, CHATRESULT_TIMEOUT, user) , m_listLength(0) -, m_avatarList(NULL) -, m_cores(NULL) +, m_avatarList(nullptr) +, m_cores(nullptr) { } @@ -214,7 +214,7 @@ void ResAvatarList::unpack(ByteStream::ReadIterator &iter) ResSetAvatarAttributes::ResSetAvatarAttributes(void *user) : GenericResponse(RESPONSE_SETAVATARATTRIBUTES, CHATRESULT_TIMEOUT, user), - m_avatar(NULL) + m_avatar(nullptr) { } @@ -248,7 +248,7 @@ void ResSetAvatarAttributes::unpack(ByteStream::ReadIterator &iter) ResSetAvatarStatusMessage::ResSetAvatarStatusMessage(void *user) : GenericResponse(RESPONSE_SETSTATUSMESSAGE, CHATRESULT_TIMEOUT, user), -m_avatar(NULL) +m_avatar(nullptr) { } @@ -285,7 +285,7 @@ void ResSetAvatarStatusMessage::unpack(ByteStream::ReadIterator &iter) ResSetAvatarForwardingEmail::ResSetAvatarForwardingEmail(void *user) : GenericResponse(RESPONSE_SETAVATAREMAIL, CHATRESULT_TIMEOUT, user), - m_avatar(NULL) + m_avatar(nullptr) { } @@ -312,7 +312,7 @@ void ResSetAvatarForwardingEmail::unpack(ByteStream::ReadIterator &iter) ResSetAvatarInboxLimit::ResSetAvatarInboxLimit(void *user) : GenericResponse(RESPONSE_SETAVATARINBOXLIMIT, CHATRESULT_TIMEOUT, user), - m_avatar(NULL) + m_avatar(nullptr) { } @@ -340,7 +340,7 @@ void ResSetAvatarInboxLimit::unpack(ByteStream::ReadIterator &iter) ResSearchAvatarKeywords::ResSearchAvatarKeywords(void *user) : GenericResponse(RESPONSE_SETAVATARKEYWORDS, CHATRESULT_TIMEOUT, user), m_numMatches(0), - m_avatarMatches(NULL) + m_avatarMatches(nullptr) { } @@ -388,8 +388,8 @@ void ResSetAvatarKeywords::unpack(ByteStream::ReadIterator &iter) ResGetAvatarKeywords::ResGetAvatarKeywords(void *user, unsigned avatarID) : GenericResponse(RESPONSE_GETAVATARKEYWORDS, CHATRESULT_TIMEOUT, user), m_avatarID(avatarID), - m_keywordList(NULL), - m_chatStrList(NULL) + m_keywordList(nullptr), + m_chatStrList(nullptr) { } @@ -420,7 +420,7 @@ void ResGetAvatarKeywords::unpack(ByteStream::ReadIterator &iter) ResGetRoom::ResGetRoom(void *user) : GenericResponse(RESPONSE_GETROOM, CHATRESULT_TIMEOUT, user), - m_room(NULL), + m_room(nullptr), m_numExtraRooms(0) { } @@ -448,7 +448,7 @@ void ResGetRoom::unpack(ByteStream::ReadIterator &iter) ResCreateRoom::ResCreateRoom(void *user, unsigned avatarID) : GenericResponse(RESPONSE_CREATEROOM, CHATRESULT_TIMEOUT, user), m_srcAvatarID(avatarID), - m_room(NULL), + m_room(nullptr), m_numExtraRooms(0) { } @@ -637,8 +637,8 @@ ResFriendStatus::ResFriendStatus(void *user, unsigned avatarID) : GenericResponse(RESPONSE_FRIENDSTATUS, CHATRESULT_TIMEOUT, user), m_avatarID(avatarID), m_listLength(0), - m_friendList(NULL), - m_cores(NULL) + m_friendList(nullptr), + m_cores(nullptr) { } @@ -704,8 +704,8 @@ ResIgnoreStatus::ResIgnoreStatus(void *user, unsigned avatarID) : GenericResponse(RESPONSE_IGNORESTATUS, CHATRESULT_TIMEOUT, user), m_avatarID(avatarID), m_listLength(0), - m_ignoreList(NULL), - m_cores(NULL) + m_ignoreList(nullptr), + m_cores(nullptr) { } @@ -740,7 +740,7 @@ ResEnterRoom::ResEnterRoom(void *user, unsigned avatarID, const ChatUnicodeStrin m_avatarID(avatarID), m_destAddress(destAddress.string_data, destAddress.string_length), m_gotRoomObj(false), - m_room(NULL), + m_room(nullptr), m_numExtraRooms(0) { } @@ -1012,7 +1012,7 @@ void ResChangeRoomOwner::unpack(ByteStream::ReadIterator &iter) ResGetRoomSummaries::ResGetRoomSummaries(void *user) : GenericResponse(RESPONSE_GETROOMSUMMARIES, CHATRESULT_TIMEOUT, user), m_numRooms(0), - m_roomSummaries(NULL) + m_roomSummaries(nullptr) { } @@ -1132,8 +1132,8 @@ ResGetPersistentMessage::ResGetPersistentMessage(void *user, unsigned srcAvatarI : GenericResponse(RESPONSE_GETPERSISTENTMESSAGE, CHATRESULT_TIMEOUT, user), m_srcAvatarID(srcAvatarID), m_messageID(messageID), - m_core(NULL), - m_header(NULL) + m_core(nullptr), + m_header(nullptr) { } @@ -1167,7 +1167,7 @@ void ResGetPersistentMessage::unpack(ByteStream::ReadIterator &iter) ResGetMultiplePersistentMessages::ResGetMultiplePersistentMessages(void *user, unsigned srcAvatarID) : GenericResponse(RESPONSE_GETMULTIPLEPERSISTENTMESSAGES, CHATRESULT_TIMEOUT, user), m_srcAvatarID(srcAvatarID), - m_messages(NULL) + m_messages(nullptr) { } @@ -1217,8 +1217,8 @@ ResGetPersistentHeaders::ResGetPersistentHeaders(void *user, unsigned srcAvatarI : GenericResponse(RESPONSE_GETPERSISTENTHEADERS, CHATRESULT_TIMEOUT, user), m_srcAvatarID(srcAvatarID), m_listLength(0), - m_headers(NULL), - m_cores(NULL) + m_headers(nullptr), + m_cores(nullptr) { } @@ -1263,8 +1263,8 @@ ResGetPartialPersistentHeaders::ResGetPartialPersistentHeaders(void *user, unsig : GenericResponse(RESPONSE_PARTIALPERSISTENTHEADERS, CHATRESULT_TIMEOUT, user), m_srcAvatarID(srcAvatarID), m_listLength(0), - m_headers(NULL), - m_cores(NULL) + m_headers(nullptr), + m_cores(nullptr) { } @@ -1396,7 +1396,7 @@ void ResUnregisterRoom::unpack(ByteStream::ReadIterator &iter) } ResFailoverReloginAvatar::ResFailoverReloginAvatar(unsigned avatarID) -: GenericResponse(RESPONSE_FAILOVER_RELOGINAVATAR, CHATRESULT_TIMEOUT, NULL), +: GenericResponse(RESPONSE_FAILOVER_RELOGINAVATAR, CHATRESULT_TIMEOUT, nullptr), m_avatarID(avatarID) { } @@ -1414,9 +1414,9 @@ void ResFailoverReloginAvatar::unpack(ByteStream::ReadIterator &iter) } ResFailoverRecreateRoom::ResFailoverRecreateRoom(unsigned roomID, bool forced) -: GenericResponse(RESPONSE_FAILOVER_RECREATEROOM, CHATRESULT_TIMEOUT, NULL), +: GenericResponse(RESPONSE_FAILOVER_RECREATEROOM, CHATRESULT_TIMEOUT, nullptr), m_roomID(roomID), - m_room(NULL), + m_room(nullptr), m_forced(forced) { } @@ -1478,7 +1478,7 @@ void ResGetFanClubHandle::unpack(ByteStream::ReadIterator &iter) ResFindAvatarByUID::ResFindAvatarByUID(void *user) : GenericResponse(RESPONSE_FINDAVATARBYUID, CHATRESULT_TIMEOUT, user), m_numAvatarsOnline(0), - m_avatars(NULL) + m_avatars(nullptr) { } @@ -1512,7 +1512,7 @@ void ResFindAvatarByUID::unpack(ByteStream::ReadIterator &iter) } ResRegistrarGetChatServer::ResRegistrarGetChatServer() -: GenericResponse(RESPONSE_REGISTRAR_GETCHATSERVER, CHATRESULT_TIMEOUT, NULL) +: GenericResponse(RESPONSE_REGISTRAR_GETCHATSERVER, CHATRESULT_TIMEOUT, nullptr) { } @@ -1527,7 +1527,7 @@ void ResRegistrarGetChatServer::unpack(ByteStream::ReadIterator &iter) } ResSendApiVersion::ResSendApiVersion() -: GenericResponse(RESPONSE_SETAPIVERSION, CHATRESULT_TIMEOUT, NULL) +: GenericResponse(RESPONSE_SETAPIVERSION, CHATRESULT_TIMEOUT, nullptr) { } @@ -1600,8 +1600,8 @@ void ResRemoveSnoopRoom::unpack(ByteStream::ReadIterator &iter) ResGetSnoopList::ResGetSnoopList(void *user, unsigned srcAvatarID) : GenericResponse(RESPONSE_GETSNOOPLIST, CHATRESULT_TIMEOUT, user), m_srcAvatarID(srcAvatarID), - m_avatarSnoops(NULL), - m_roomSnoops(NULL) + m_avatarSnoops(nullptr), + m_roomSnoops(nullptr) { } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.cpp index c7a1b9a8..2d6b1839 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.cpp @@ -107,7 +107,7 @@ namespace Base ByteStream::ByteStream() : allocatedSize(0), beginReadIterator(), - data(NULL), + data(nullptr), size(0), lastPutSize(0) { @@ -224,7 +224,7 @@ namespace Base if(data->size < allocatedSize) { unsigned char * tmp = new unsigned char[newSize]; - if(data->buffer != NULL) + if(data->buffer != nullptr) memcpy(tmp, data->buffer, size); delete[] data->buffer; data->buffer = tmp; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.cpp index 660d838d..24292a4e 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.cpp @@ -35,7 +35,7 @@ bool CAutoLog::Open(const char * filename) //------------------------------------- { - if( NULL == filename) + if( nullptr == filename) return false; if (pFilename) @@ -45,13 +45,13 @@ bool CAutoLog::Open(const char * filename) // Sanitize slashes char *ptr; - while ((ptr = strchr(pFilename,WRONGSLASH)) != NULL) + while ((ptr = strchr(pFilename,WRONGSLASH)) != nullptr) *ptr = SLASHCHAR[0]; char strPath[1024]; strcpy(strPath,pFilename); ptr = strrchr(strPath, SLASHCHAR[0]); - if (ptr != NULL) + if (ptr != nullptr) { *ptr = 0; @@ -59,11 +59,11 @@ bool CAutoLog::Open(const char * filename) char curdir[128]; // remember current directory - if( getcwd(curdir,sizeof(curdir)) == NULL ) + if( getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } @@ -74,7 +74,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -94,7 +94,7 @@ bool CAutoLog::Open(const char * filename) { fprintf(stderr,"CAutoLog::Archive failed to make directory: %s\n", strPath); free(pFilename); - pFilename = NULL; + pFilename = nullptr; return false; // error, can't proceed } } @@ -103,7 +103,7 @@ bool CAutoLog::Open(const char * filename) pFile = fopen(pFilename,"a+"); - if( pFile == NULL || pFile == (FILE *)-1) + if( pFile == nullptr || pFile == (FILE *)-1) { //fprintf(stderr,"CAutoLog::Open failed to open log file: %s\n",pFilename); Close(); @@ -123,7 +123,7 @@ bool CAutoLog::Open(const char * filename) void CAutoLog::Close(void) //------------------------------------- { - if( pFile != (FILE *)-1 && pFile != NULL) + if( pFile != (FILE *)-1 && pFile != nullptr) { fclose(pFile); } @@ -131,7 +131,7 @@ void CAutoLog::Close(void) free(pFilename); - pFilename = NULL; + pFilename = nullptr; } //------------------------------------- @@ -194,7 +194,7 @@ void CAutoLog::LogDebug(char * format, ...) void CAutoLog::Log(eLogLevel severity, char *fmt, ...) //------------------------------------- { - if (pFile == (FILE *)-1 || pFile == NULL) + if (pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Log called with no file open!\n"); return; @@ -250,7 +250,7 @@ void CAutoLog::Log(eLogLevel severity, char *fmt, ...) void CAutoLog::Archive(void) //------------------------------------- { - if( pFile == (FILE *)-1 || pFile == NULL) + if( pFile == (FILE *)-1 || pFile == nullptr) { //fprintf(stderr,"CAutoLog::Archive called with no file open!\n"); return; @@ -281,7 +281,7 @@ void CAutoLog::Archive(void) strcpy(strCurrent,pFilename); pCurrent = strrchr(strCurrent, SLASHCHAR[0]); - if (pCurrent != NULL) + if (pCurrent != nullptr) *pCurrent = 0; else sprintf(strCurrent,"."); @@ -290,7 +290,7 @@ void CAutoLog::Archive(void) #ifdef WIN32 // remember current directory - if( getcwd(curdir,sizeof(curdir)) == NULL ) + if( getcwd(curdir,sizeof(curdir)) == nullptr ) { fprintf(stderr,"CAutoLog::Archive failed to get current directory!\n"); return; // error, can't proceed @@ -324,7 +324,7 @@ void CAutoLog::Archive(void) #endif pCurrent = strrchr(pFilename, SLASHCHAR[0]); - if (pCurrent == NULL) + if (pCurrent == nullptr) pCurrent = pFilename; else pCurrent++; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.h index 0a90a774..18871c7f 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/AutoLog.h @@ -92,14 +92,14 @@ namespace Base //------------------------------------- inline CAutoLog::CAutoLog() { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; } //------------------------------------- inline CAutoLog::CAutoLog(const char * file) { - pFilename = NULL; + pFilename = nullptr; pFile = (FILE *)-1; Open(file); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/CmdLine.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/CmdLine.cpp index b9d5b3e3..dcaf025a 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/CmdLine.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/CmdLine.cpp @@ -135,7 +135,7 @@ int CCmdLine::SplitLine(int argc, char **argv) bool CCmdLine::IsSwitch(const char *pParam) { - if (pParam==NULL) + if (pParam==nullptr) return false; // switches must non-empty @@ -204,7 +204,7 @@ StringType CCmdLine::GetSafeArgument(const char *pSwitch, int iIdx, const char * { StringType sRet; - if (pDefault!=NULL) + if (pDefault!=nullptr) sRet = pDefault; try diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.cpp index c5dd63d8..eb6dc55e 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.cpp @@ -28,7 +28,7 @@ bool CConfig::LoadFile(char * file) // open file fp = fopen(file, "r"); - if (fp == NULL || fp == (FILE *)-1) + if (fp == nullptr || fp == (FILE *)-1) { //fprintf(stderr,"Failed to open config file %s!",file); return false; @@ -71,21 +71,21 @@ void CConfig::UnloadFile(void) //----------------------------------- { delete[] pConfig; - pConfig = NULL; + pConfig = nullptr; } //----------------------------------- /// finds a key of the config in memory // key argument is case-insensitive, but must be upper case in config file -// Returns true for success (passing NULL is a special case returned as success) +// Returns true for success (passing nullptr is a special case returned as success) bool CConfig::FindKey(char *key) //----------------------------------- { - if (pConfig == NULL) + if (pConfig == nullptr) return false; // special case...continue with existing key - if (key == NULL) + if (key == nullptr) return true; // form the search key @@ -96,12 +96,12 @@ bool CConfig::FindKey(char *key) // find the key heading pCursor = strstr(pConfig,strBuffer); - if (pCursor==NULL) + if (pCursor==nullptr) return false; // find the closing bracket of key heading pCursor = strchr(pCursor,']'); - if (pCursor==NULL) + if (pCursor==nullptr) return false; pCursor++; @@ -110,7 +110,7 @@ bool CConfig::FindKey(char *key) //----------------------------------- /// extract a number from the config string -// pass the key to find the first number in the list, else NULL to find the next number in the list +// pass the key to find the first number in the list, else nullptr to find the next number in the list // returns 0 if no number is found, else returns the number long CConfig::GetLong(char *key) //----------------------------------- @@ -133,20 +133,20 @@ long CConfig::GetLong(char *key) //----------------------------------- /// extract string (in double-quotes) from the list. -// pass the key to find the first string in the list, else NULL to find the next string in the list -// returns NULL if no string found, else returns a temporary copy of the string (without quotes) +// pass the key to find the first string in the list, else nullptr to find the next string in the list +// returns nullptr if no string found, else returns a temporary copy of the string (without quotes) char * CConfig::GetString(char *key) //----------------------------------- { if (!FindKey(key)) - return NULL; + return nullptr; // look for start of string or end of key while (*pCursor && *pCursor != '"' && *pCursor != '[') pCursor++; if (*(pCursor++) != '"') - return NULL; + return nullptr; // until closing quote int c = 0; @@ -160,7 +160,7 @@ char * CConfig::GetString(char *key) } } - return NULL; + return nullptr; } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.h index 864506f3..6f6dc376 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Config.h @@ -10,7 +10,7 @@ ; list of strings, with code example # config.FindKey("NUMBERS"); -# while (number = config.GetLong(NULL)) +# while (number = config.GetLong(nullptr)) # YourHandleNumber(number); [NUMBERS] 100 200, 300 ; formatting is very flexible as long as numbers are delimited by non-numbers @@ -23,7 +23,7 @@ ; list of strings, with code example # config.FindKey("HOSTS"); -# while (string = config.GetString(NULL)) +# while (string = config.GetString(nullptr)) # YourHandleString(string); [HOSTS] "127.0.0.1:5999" @@ -68,16 +68,16 @@ namespace Base // returns TRUE if key is found. bool FindKey(char *key); - // extract string from config. If key is NULL, extract next string in list, else extract first string. - // if key was not found, returns NULL - char * GetString(char *key = NULL); + // extract string from config. If key is nullptr, extract next string in list, else extract first string. + // if key was not found, returns nullptr + char * GetString(char *key = nullptr); - // extract number from config. If key is NULL, extract next number in list, else extract first number. + // extract number from config. If key is nullptr, extract next number in list, else extract first number. // if key was not found, returns 0 - long GetLong(char *key = NULL); // extract number from config. + long GetLong(char *key = nullptr); // extract number from config. // indicate if config file has been loaded - inline bool FileLoaded() { return pConfig == NULL ? false : true; } + inline bool FileLoaded() { return pConfig == nullptr ? false : true; } private: char * pConfig; // pointer to file memory @@ -87,14 +87,14 @@ namespace Base inline CConfig::CConfig() { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; } inline CConfig::CConfig(char * file) { - pConfig = NULL; - pCursor = NULL; + pConfig = nullptr; + pCursor = nullptr; LoadFile(file); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Logger.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Logger.cpp index 8942bfdd..4cdc4532 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Logger.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Logger.cpp @@ -120,7 +120,7 @@ Logger::Logger(const char *programName, void Logger::LoggerInit(const char *programName) { char buf[1024]; - FILE *logDir = NULL; + FILE *logDir = nullptr; if (0 != (m_combinedLogType & eUseLocalFile)) { @@ -129,13 +129,13 @@ void Logger::LoggerInit(const char *programName) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } tm now; - time_t t = time(NULL); + time_t t = time(nullptr); LOGGER_GET_CURR_TIME(now, t); @@ -153,7 +153,7 @@ void Logger::LoggerInit(const char *programName) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -279,7 +279,7 @@ void Logger::addLog(const char *id, unsigned logenum, int level, unsigned size) else { newLog->file = fopen(newLog->filename.c_str(), "a+"); - if(newLog->file == NULL) + if(newLog->file == nullptr) { printf("Open file %s failed\n", newLog->filename.c_str()); } @@ -313,7 +313,7 @@ void Logger::addLog(const char *id, unsigned logenum) else { newLog->file = fopen(newLog->filename.c_str(), "a+"); - if(newLog->file == NULL) + if(newLog->file == nullptr) { printf("Open file %s failed\n", newLog->filename.c_str()); } @@ -368,7 +368,7 @@ void Logger::logSimple(unsigned logenum, int level, const char *message) { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) { @@ -444,7 +444,7 @@ void Logger::logSimpleWithSys(unsigned logenum, unsigned priority, int level, co { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -514,7 +514,7 @@ void Logger::log(unsigned logenum, int level, const char *message, ...) // ensure that the buf does not contain any '%' characters. // prevent crash problem char *rv; - while((rv = strchr(buf, '%')) != NULL) + while((rv = strchr(buf, '%')) != nullptr) { *rv = ' '; // replace with space } @@ -546,7 +546,7 @@ void Logger::logWithSys(unsigned logenum, unsigned priority, int level, const ch { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -604,14 +604,14 @@ void Logger::logWithSys(unsigned logenum, unsigned priority, int level, const ch void Logger::rollDate(time_t t) { char buf[80]; - FILE *logDir = NULL; + FILE *logDir = nullptr; logDir = fopen(m_dirPrefix.c_str(), "r+"); if(errno == ENOENT) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -627,7 +627,7 @@ void Logger::rollDate(time_t t) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -711,7 +711,7 @@ void Logger::rollLog(LogInfo *logInfo) { std::string newLogName; char timeStampBuffer[256]; - time_t t = time(NULL); + time_t t = time(nullptr); tm now; int r; int nTries = 10; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Statistics.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Statistics.h index 18e0579e..0856034b 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Statistics.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Statistics.h @@ -34,9 +34,9 @@ namespace Base bool commit = false; if (!mLastSampleTime) - mLastSampleTime = time(NULL); + mLastSampleTime = time(nullptr); - if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(NULL)) + if (!mSampleFrequency || mLastSampleTime + mSampleFrequency < (unsigned)time(nullptr)) { mSampleTotal++; mAggregateTotal += value; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/TemplateObjectAllocator.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/TemplateObjectAllocator.h index 40227673..ed1a7937 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/TemplateObjectAllocator.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/TemplateObjectAllocator.h @@ -93,7 +93,7 @@ namespace Base void Destroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; #ifdef USE_ALLOCATOR_MUTEX @@ -142,7 +142,7 @@ namespace Base void FastDestroy(TYPE *object) { - if (object == NULL) + if (object == nullptr) return; object->~TYPE(); diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/WideString.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/WideString.h index 775f9713..28159b18 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/WideString.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/WideString.h @@ -94,12 +94,12 @@ namespace ucs2 } //////////////////////////////////////// - // target string is a null-terminated C string + // target string is a nullptr-terminated C string inline string::string(const char * copy) : mLength(0), mData(8,0) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!copy) { return; @@ -111,12 +111,12 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *copy++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; } //////////////////////////////////////// - // target string is a C string that may or may not include null characters + // target string is a C string that may or may not include nullptr characters inline string::string(const std::string & copy) : mLength(copy.length()), mData(8,0) @@ -126,17 +126,17 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(copy.begin(), copy.end(), mData.begin(), NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength] = 0; } //////////////////////////////////////// - // target string is a wide null-terminated C string + // target string is a wide nullptr-terminated C string inline string::string(const char_type * copy) : mLength(0), mData(8,0) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!copy) { return; @@ -148,7 +148,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *copy++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; } @@ -169,7 +169,7 @@ namespace ucs2 inline string & string::operator=(const char * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -182,7 +182,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -195,7 +195,7 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(rhs.begin(), rhs.end(), mData.begin(), NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength] = 0; return *this; } @@ -203,7 +203,7 @@ namespace ucs2 inline string & string::operator=(const char_type * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -216,7 +216,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -235,7 +235,7 @@ namespace ucs2 inline string & string::operator+=(const char * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -247,7 +247,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -259,7 +259,7 @@ namespace ucs2 // (2) perform transform to copy the narrow string to our // wide string std::transform(rhs.begin(), rhs.end(), mData.begin()+mLength, NarrowToWide); - // (3) ensure null termination + // (3) ensure nullptr termination mLength += rhs.length(); mData[mLength] = 0; return *this; @@ -267,7 +267,7 @@ namespace ucs2 inline string & string::operator+=(const char_type * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -279,7 +279,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -388,7 +388,7 @@ namespace ucs2 inline string & string::assign(const char_type * rhs) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -401,7 +401,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -409,7 +409,7 @@ namespace ucs2 inline string & string::assign(const char_type * rhs, size_type count) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { mData[0] = 0; @@ -422,7 +422,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -463,7 +463,7 @@ namespace ucs2 inline string & string::assign(const char_type * first, const char_type * last) { mLength = 0; - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!first || !last) { mData[0] = 0; @@ -476,14 +476,14 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *first++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } inline string & string::append(const char_type * rhs) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -495,14 +495,14 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } inline string & string::append(const char_type * rhs, size_type count) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!rhs) { return *this; @@ -514,7 +514,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *rhs++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } @@ -558,7 +558,7 @@ namespace ucs2 inline string & string::append(const char_type * first, const char_type * last) { - // (1) protect from null pointer + // (1) protect from nullptr pointer if (!first || !last) { return *this; @@ -570,7 +570,7 @@ namespace ucs2 reserve(mLength+1); mData[mLength++] = *first++; } - // (3) ensure null termination + // (3) ensure nullptr termination mData[mLength]=0; return *this; } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/BlockAllocator.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/BlockAllocator.cpp index 4cefb9e7..29d91074 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/BlockAllocator.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/BlockAllocator.cpp @@ -12,7 +12,7 @@ namespace Base { for(unsigned i = 0; i < 31; i++) { - m_blocks[i] = NULL; + m_blocks[i] = nullptr; } } @@ -21,7 +21,7 @@ namespace Base // free all allocated memory blocks for(unsigned i = 0; i < 31; i++) { - while(m_blocks[i] != NULL) + while(m_blocks[i] != nullptr) { unsigned *tmp = m_blocks[i]; m_blocks[i] = (unsigned *)*m_blocks[i]; @@ -36,7 +36,7 @@ namespace Base void *BlockAllocator::getBlock(unsigned bytes) { unsigned accum = 16, bits = 16; - unsigned *handle = NULL; + unsigned *handle = nullptr; // Perform a binary search looking for the highest bit. @@ -96,7 +96,7 @@ namespace Base void BlockAllocator::returnBlock(unsigned *handle) { - // C++ allows for safe deletion of a NULL pointer + // C++ allows for safe deletion of a nullptr pointer if(handle) { // Update the allocator linked list, insert this entry at the head diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Event.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Event.cpp index a3cce3b1..72190595 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Event.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Event.cpp @@ -26,8 +26,8 @@ namespace Base mCond(), mThreadCount(0) { - pthread_mutex_init(&mMutex, NULL); - pthread_cond_init(&mCond, NULL); + pthread_mutex_init(&mMutex, nullptr); + pthread_cond_init(&mCond, nullptr); } CEvent::~CEvent() @@ -74,7 +74,7 @@ namespace Base struct timeval now; struct timespec abs_timeout; - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); abs_timeout.tv_sec = now.tv_sec + timeout/1000; abs_timeout.tv_nsec = now.tv_usec * 1000 + (timeout%1000)*1000000; abs_timeout.tv_sec += abs_timeout.tv_nsec / 1000000000; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Thread.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Thread.cpp index a4b1e3a2..f5bc4629 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Thread.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Thread.cpp @@ -77,8 +77,8 @@ namespace Base CThreadPool::CMember::CMember(CThreadPool * parent) : mParent(parent), - mFunction(NULL), - mArgument(NULL), + mFunction(nullptr), + mArgument(nullptr), mSemaphore() { StartThread(); @@ -117,8 +117,8 @@ namespace Base if (mFunction) { mFunction(mArgument); - mArgument = NULL; - mFunction = NULL; + mArgument = nullptr; + mFunction = nullptr; } else if (mParent->OnDestory(this)) mThreadContinue = false; @@ -173,7 +173,7 @@ namespace Base } //////////////////////////////////////// - // (3) Delete the null member threads + // (3) Delete the nullptr member threads mMutex.Lock(); while (!mNullMember.empty()) { @@ -224,7 +224,7 @@ namespace Base } //////////////////////////////////////// - // (2) Delete any null member threads. + // (2) Delete any nullptr member threads. while (!mNullMember.empty()) { delete mNullMember.front(); diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/serialize.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/serialize.h index 650681b5..ed38802a 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/serialize.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/serialize.h @@ -501,8 +501,8 @@ namespace soe } else { - //find null terminator, if don't find it before maxLen, then err - const unsigned char *strEnd = NULL; + //find nullptr terminator, if don't find it before maxLen, then err + const unsigned char *strEnd = nullptr; unsigned strLen = 0; for (;strLensetTrack(m_currTrack); res->setTrack(m_currTrack); - time_t timeout = time(NULL) + m_requestTimeout; + time_t timeout = time(nullptr) + m_requestTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -125,7 +125,7 @@ unsigned GenericAPICore::submitRequest(GenericRequest *req, GenericResponse *res } req->setTrack(m_currTrack); res->setTrack(m_currTrack); - time_t timeout = time(NULL) + reqTimeout; + time_t timeout = time(nullptr) + reqTimeout; req->setTimeout(timeout); res->setTimeout(timeout); @@ -140,7 +140,7 @@ void GenericAPICore::process() GenericResponse *res; // Process timeout on pending requests - regardless of whether processing is suspended or not - while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(NULL))) + while((m_outCount > 0) && ((req = m_outboundQueue.front().first)->getTimeout() <= time(nullptr))) { --m_outCount; res = m_outboundQueue.front().second; @@ -152,7 +152,7 @@ void GenericAPICore::process() } // Process timeout on pending responses - while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(NULL))) + while((m_pendingCount > 0) && ((res = (*m_pending.begin()).second)->getTimeout() <= time(nullptr))) { --m_pendingCount; m_pending.erase(m_pending.begin()); @@ -165,7 +165,7 @@ void GenericAPICore::process() while(m_outCount > 0) { GenericConnection *con = getNextActiveConnection(); - if (con != NULL) + if (con != nullptr) { pair out_pair = m_outboundQueue.front(); @@ -184,7 +184,7 @@ void GenericAPICore::process() else { #ifdef USE_SERIALIZE_LIB - const unsigned char *msgBuf = NULL; + const unsigned char *msgBuf = nullptr; unsigned msgSize = 0; msgBuf = req->pack(msgSize); con->Send(msgBuf, msgSize); @@ -222,7 +222,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() unsigned startIndex = m_nextConnectionIndex; unsigned maxIndex = m_serverConnections.size() - 1; - GenericConnection *con = NULL; + GenericConnection *con = nullptr; //loop until we find an active connection, or until we get back // to where we started @@ -242,7 +242,7 @@ GenericConnection *GenericAPICore::getNextActiveConnection() //went past end of vector, start back at 0 m_nextConnectionIndex = 0; } - }while (con == NULL && m_nextConnectionIndex != startIndex); + }while (con == nullptr && m_nextConnectionIndex != startIndex); return con; } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/GenericAPI/GenericConnection.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/GenericAPI/GenericConnection.cpp index 3b677c70..3c878e0a 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/GenericAPI/GenericConnection.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/GenericAPI/GenericConnection.cpp @@ -28,7 +28,7 @@ unsigned GenericConnection::ms_crcBytes = 0; GenericConnection::GenericConnection(const char *host, short port, GenericAPICore *apiCore, unsigned reconnectTimeout, unsigned noDataTimeoutSecs, unsigned noAckTimeoutSecs, unsigned incomingBufSizeInKB, unsigned outgoingBufSizeInKB, unsigned keepAlive, unsigned maxRecvMessageSizeInKB, unsigned holdTime) : m_bConnected(false), m_apiCore(apiCore), - m_con(NULL), + m_con(nullptr), m_host(host), m_nextHost(host), m_port(port), @@ -72,8 +72,8 @@ GenericConnection::~GenericConnection() { if(m_con) { - m_con->SetHandler(NULL); - m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to null, so it wont + m_con->SetHandler(nullptr); + m_con->Disconnect();//don't worry about onterminated being called, we've set it's handler to nullptr, so it wont m_con->Release(); } @@ -96,7 +96,7 @@ void GenericConnection::disconnect() { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = false; @@ -112,7 +112,7 @@ void GenericConnection::OnTerminated(UdpConnection *con) if(m_con) { m_con->Release(); - m_con = NULL; + m_con = nullptr; } m_conState = CON_DISCONNECT; m_bConnected = false; @@ -146,7 +146,7 @@ void GenericConnection::OnRoutePacket(UdpConnection *con, const unsigned char *d get(iter, type); get(iter, track); #endif - GenericResponse *res = NULL; + GenericResponse *res = nullptr; // the following if block is a temporary fix that prevents // a crash with a game team in which they occasionally find @@ -208,7 +208,7 @@ void GenericConnection::process(bool giveTime) { m_con->SetHandler(this); m_conState = CON_NEGOTIATE; - m_conTimeout = time(NULL) + m_reconnectTimeout; + m_conTimeout = time(nullptr) + m_reconnectTimeout; } break; case CON_NEGOTIATE: @@ -225,12 +225,12 @@ void GenericConnection::process(bool giveTime) m_apiCore->OnConnect(m_host.c_str(), m_port); m_bConnected = true; } - else if(time(NULL) > m_conTimeout) + else if(time(nullptr) > m_conTimeout) { // we did not connect m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; m_conState = CON_DISCONNECT; m_bConnected = false; } @@ -246,7 +246,7 @@ void GenericConnection::process(bool giveTime) { m_con->Disconnect(); //no need to release, since callback to onTerminated releases it, and callback is allways made m_con->Release(); - m_con = NULL; + m_con = nullptr; } } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.cpp index c9952e9a..df2137bd 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.cpp @@ -96,7 +96,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpPlatformAddress destIp, int mLastClockSyncTime = 0; mDataHoldTime = 0; mGettingTime = false; - mHandler = NULL; + mHandler = nullptr; mOtherSideProtocolVersion = 0; mNoDataTimeout = mUdpManager->mParams.noDataTimeout; @@ -108,7 +108,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpPlatformAddress destIp, int mIcmpErrorRetryStartStamp = 0; // when the timer started for ICMP error retry delay (gets reset on a successful packet receive) mPortRemapRequestStartStamp = 0; - mEncryptXorBuffer = NULL; + mEncryptXorBuffer = nullptr; mEncryptExpansionBytes = 0; mOrderedCountOutgoing = 0; mOrderedCountOutgoing2 = 0; @@ -120,7 +120,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpPlatformAddress destIp, int mConnectAttemptTimeout = 0; mConnectionCreateTime = mUdpManager->CachedClock(); mSimulateOutgoingQueueBytes = 0; - mPassThroughData = NULL; + mPassThroughData = nullptr; mSilentDisconnect = false; mLastSendBin = 0; @@ -140,7 +140,7 @@ UdpConnection::~UdpConnection() { UdpGuard myGuard(&mGuard); - assert(mUdpManager == NULL); // this should not be possible, since the UdpManager holds a reference to us until we are disconnected and disassociated from the manager. If you are hitting this, then odds are the application is releasing the UdpConnection object more times than it should + assert(mUdpManager == nullptr); // this should not be possible, since the UdpManager holds a reference to us until we are disconnected and disassociated from the manager. If you are hitting this, then odds are the application is releasing the UdpConnection object more times than it should for (int i = 0; i < cReliableChannelCount; i++) delete mChannel[i]; @@ -189,7 +189,7 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason if (mStatus == cStatusNegotiating) flushTimeout = 0; - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { if (flushTimeout > 0) { @@ -219,7 +219,7 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason } UdpManager *holdUdpManager = mUdpManager; - mUdpManager = NULL; + mUdpManager = nullptr; mStatus = cStatusDisconnected; // only hold a reference to the UdpManager if it is not currently being destructed. @@ -274,7 +274,7 @@ bool UdpConnection::Send(UdpChannel channel, const void *data, int dataLen) if (dataLen == 0) // zero length packets are ignored return(false); - assert(data != NULL); // can't send a null packet + assert(data != nullptr); // can't send a nullptr packet // zero-escape application packets that start with 0 if ((*(const udp_uchar *)data) == 0) @@ -290,7 +290,7 @@ bool UdpConnection::Send(UdpChannel channel, const LogicalPacket *packet) { UdpGuard myGuard(&mGuard); - assert(packet != NULL); // can't send a null packet + assert(packet != nullptr); // can't send a nullptr packet if (mStatus != cStatusConnected) // if we are no longer connected return(false); @@ -337,7 +337,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const udp_uchar *data, int { udp_uchar *bufPtr = tempBuffer; memcpy(bufPtr, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen, true); return(true); @@ -350,9 +350,9 @@ bool UdpConnection::InternalSend(UdpChannel channel, const udp_uchar *data, int bufPtr[1] = cUdpPacketOrdered; UdpMisc::PutValue16(bufPtr + 2, (udp_ushort)(++mOrderedCountOutgoing & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); - BufferedSend(bufPtr, totalDataLen + 4, NULL, 0, true); + BufferedSend(bufPtr, totalDataLen + 4, nullptr, 0, true); return(true); break; } @@ -363,7 +363,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const udp_uchar *data, int bufPtr[1] = cUdpPacketOrdered2; UdpMisc::PutValue16(bufPtr + 2, (udp_ushort)(++mOrderedCountOutgoing2 & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen + 4, true); return(true); @@ -375,7 +375,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const udp_uchar *data, int case cUdpChannelReliable4: { int num = channel - cUdpChannelReliable1; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->Send(data, dataLen, data2, dataLen2); return(true); @@ -410,9 +410,9 @@ void UdpConnection::GetStats(UdpConnectionStatistics *cs) { UdpGuard myGuard(&mGuard); - assert(cs != NULL); + assert(cs != nullptr); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; *cs = mConnectionStats; @@ -428,7 +428,7 @@ void UdpConnection::GetStats(UdpConnectionStatistics *cs) if (cs->syncTheirSent > 0) cs->percentReceivedSuccess = (float)cs->syncOurReceived / (float)cs->syncTheirSent; cs->reliableAveragePing = 0; - if (mChannel[0] != NULL) + if (mChannel[0] != nullptr) cs->reliableAveragePing = mChannel[0]->GetAveragePing(); } @@ -437,7 +437,7 @@ void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) UdpRef ref(this); UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (e->mLen == 0) @@ -572,7 +572,7 @@ void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) *decryptPtr++ = finalStart[1]; int len = (this->*(mDecryptFunction[j]))(decryptPtr, finalStart + 2, finalLen - 2); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (len == -1) @@ -627,7 +627,7 @@ void UdpConnection::ProcessCookedPacket(const udp_uchar *data, int dataLen) { udp_uchar buf[256]; udp_uchar *bufPtr; - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (data[0] == 0 && dataLen > 1) @@ -826,7 +826,7 @@ void UdpConnection::ProcessCookedPacket(const udp_uchar *data, int dataLen) // (while processing this packet) ended up touching the packet-data and corrupting the next // packet in the multi-sequence. CallbackCorruptPacket(data, dataLen, cUdpCorruptionReasonMultiPacket); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; } else @@ -943,7 +943,7 @@ void UdpConnection::ProcessCookedPacket(const udp_uchar *data, int dataLen) case cUdpPacketFragment4: { int num = (data[1] - cUdpPacketReliable1) % cReliableChannelCount; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->ReliablePacket(data, dataLen); break; @@ -954,7 +954,7 @@ void UdpConnection::ProcessCookedPacket(const udp_uchar *data, int dataLen) case cUdpPacketAck4: { int num = data[1] - cUdpPacketAck1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckPacket(data, dataLen); break; } @@ -964,7 +964,7 @@ void UdpConnection::ProcessCookedPacket(const udp_uchar *data, int dataLen) case cUdpPacketAckAll4: { int num = data[1] - cUdpPacketAckAll1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckAllPacket(data, dataLen); break; } @@ -1015,7 +1015,7 @@ void UdpConnection::FlagPortUnreachable() void UdpConnection::GiveTime(bool fromManager) { UdpGuard myGuard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (fromManager && GetRefCount() == 2) @@ -1115,11 +1115,11 @@ void UdpConnection::InternalGiveTime() int totalPendingBytes = 0; for (int i = 0; i < cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { totalPendingBytes += mChannel[i]->TotalPendingBytes(); int myNext = mChannel[i]->GiveTime(); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // giving the reliable channel time caused it to callback the application which may disconnect us nextSchedule = udpMin(nextSchedule, myNext); } @@ -1208,7 +1208,7 @@ void UdpConnection::InternalGiveTime() break; } - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { // safety to prevent us for scheduling ourselves for a time period that has already passed, // as doing so could result in infinite looping in the priority queue processing. @@ -1227,7 +1227,7 @@ int UdpConnection::TotalPendingBytes() const int total = 0; for (int i = 0; i < cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) total += mChannel[i]->TotalPendingBytes(); } return(total); @@ -1293,7 +1293,7 @@ void UdpConnection::ExpireReceiveBin() void UdpConnection::PhysicalSend(const udp_uchar *data, int dataLen, bool appendAllowed) { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // if we attempt to do a physical send (ie. encrypt/compress/crc a packet) while we are not connected @@ -1322,7 +1322,7 @@ void UdpConnection::PhysicalSend(const udp_uchar *data, int dataLen, bool append // we know this internal packet will not be a connect or confirm packet since they are sent directly to RawSend to avoid getting encrypted *destPtr++ = finalStart[1]; int len = (this->*(mEncryptFunction[j]))(destPtr, finalStart + 2, finalLen - 2); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // if this assert triggers, it means the encryption pass expanded the size of the encrypted @@ -1393,8 +1393,8 @@ void UdpConnection::PhysicalSend(const udp_uchar *data, int dataLen, bool append // can note where the ack was placed and replace it udp_uchar *UdpConnection::BufferedSend(const udp_uchar *data, int dataLen, const udp_uchar *data2, int dataLen2, bool appendAllowed) { - if (mUdpManager == NULL) - return(NULL); + if (mUdpManager == nullptr) + return(nullptr); int used = (int)(mMultiBufferPtr - mMultiBufferData); int actualMaxDataHoldSize = udpMin(mUdpManager->mParams.maxDataHoldSize, mConnectionConfig.maxRawPacketSize); @@ -1409,7 +1409,7 @@ udp_uchar *UdpConnection::BufferedSend(const udp_uchar *data, int dataLen, const FlushMultiBuffer(); // now send it (the multi-buffer is empty if you need to use it temporarily to concatenate two data chunks -- it is large enough to hold the largest raw packet) - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferData, data, dataLen); memcpy(mMultiBufferData + dataLen, data2, dataLen2); @@ -1417,7 +1417,7 @@ udp_uchar *UdpConnection::BufferedSend(const udp_uchar *data, int dataLen, const } else PhysicalSend(data, dataLen, appendAllowed); - return(NULL); + return(nullptr); } // if this data will not fit into buffer @@ -1445,7 +1445,7 @@ udp_uchar *UdpConnection::BufferedSend(const udp_uchar *data, int dataLen, const udp_uchar *placementPtr = mMultiBufferPtr; memcpy(mMultiBufferPtr, data, dataLen); mMultiBufferPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferPtr, data2, dataLen2); mMultiBufferPtr += dataLen2; @@ -1454,7 +1454,7 @@ udp_uchar *UdpConnection::BufferedSend(const udp_uchar *data, int dataLen, const if ((mMultiBufferPtr - mMultiBufferData) >= actualMaxDataHoldSize) { FlushMultiBuffer(); - placementPtr = NULL; // it got flushed + placementPtr = nullptr; // it got flushed } return(placementPtr); } @@ -1474,7 +1474,7 @@ void UdpConnection::FlushMultiBuffer() // notify all the reliable channels to clear their buffered acks for (int i = 0; i < cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { mChannel[i]->ClearBufferedAck(); } @@ -1684,7 +1684,7 @@ void UdpConnection::SetupEncryptModel() mEncryptExpansionBytes += 0; // set up encrypt buffer (random numbers generated based on seed) - if (mEncryptXorBuffer == NULL) + if (mEncryptXorBuffer == nullptr) { int len = ((mUdpManager->mParams.maxRawPacketSize + 1) / 4) * 4; mEncryptXorBuffer = new udp_uchar[len]; @@ -1718,7 +1718,7 @@ void UdpConnection::GetChannelStatus(UdpChannel channel, ChannelStatus *channelS case cUdpChannelReliable2: case cUdpChannelReliable3: case cUdpChannelReliable4: - if (mChannel[channel - cUdpChannelReliable1] != NULL) + if (mChannel[channel - cUdpChannelReliable1] != nullptr) { mChannel[channel - cUdpChannelReliable1]->GetChannelStatus(channelStatus); } @@ -1763,7 +1763,7 @@ char *UdpConnection::GetDestinationString(char *buf, int bufLen) const UdpGuard myGuard(&mGuard); if (bufLen < 22) - return(NULL); + return(nullptr); UdpPlatformAddress ip = GetDestinationIp(); int port = GetDestinationPort(); char hold[256]; @@ -1794,7 +1794,7 @@ void UdpConnection::OnRoutePacket(const udp_uchar *data, int dataLen) { UdpGuard myGuard(&mHandlerGuard); - if (mHandler != NULL) + if (mHandler != nullptr) { mHandler->OnRoutePacket(this, data, dataLen); } @@ -1814,7 +1814,7 @@ void UdpConnection::OnRoutePacket(const udp_uchar *data, int dataLen) void UdpConnection::OnConnectComplete() { UdpGuard myGuard(&mHandlerGuard); - if (mHandler != NULL) + if (mHandler != nullptr) { mHandler->OnConnectComplete(this); } @@ -1823,7 +1823,7 @@ void UdpConnection::OnConnectComplete() void UdpConnection::OnTerminated() { UdpGuard myGuard(&mHandlerGuard); - if (mHandler != NULL) + if (mHandler != nullptr) { mHandler->OnTerminated(this); } @@ -1832,7 +1832,7 @@ void UdpConnection::OnTerminated() void UdpConnection::OnCrcReject(const udp_uchar *data, int dataLen) { UdpGuard myGuard(&mHandlerGuard); - if (mHandler != NULL) + if (mHandler != nullptr) { mHandler->OnCrcReject(this, data, dataLen); } @@ -1841,7 +1841,7 @@ void UdpConnection::OnCrcReject(const udp_uchar *data, int dataLen) void UdpConnection::OnPacketCorrupt(const udp_uchar *data, int dataLen, UdpCorruptionReason reason) { UdpGuard myGuard(&mHandlerGuard); - if (mHandler != NULL) + if (mHandler != nullptr) { mHandler->OnPacketCorrupt(this, data, dataLen, reason); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.h index 9d64e460..253e9139 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpConnection.h @@ -153,7 +153,7 @@ class UdpConnection : public UdpGuardedRefCount, public PriorityQueueMember, pub int ConnectionAge() const; // returns the UdpManager object that is managing this connection - // will return NULL if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) + // will return nullptr if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) UdpManager *GetUdpManager() const; // returns the 32-bit encryption-code that was negotiated as part of the connection-establishment process. @@ -234,9 +234,9 @@ class UdpConnection : public UdpGuardedRefCount, public PriorityQueueMember, pub friend class UdpManager; friend class UdpReliableChannel; - // note: if connectPacket is NULL, that means this connection object is being created to establish + // note: if connectPacket is nullptr, that means this connection object is being created to establish // a new connection to the specified ip/port (ie. the connection starts out in cStatusNegotiating mode) - // if connectPacket is non-NULL, that menas this connection object is being created to handle an + // if connectPacket is non-nullptr, that menas this connection object is being created to handle an // incoming connect request and it will start out in cStatusConnected mode. UdpConnection(UdpManager *udpManager, UdpPlatformAddress destIp, int destPort, int timeout); // starts connection-establishment protocol UdpConnection(UdpManager *udpManager, const UdpManager::PacketHistoryEntry *e); // starts already connected, replying to connection request @@ -281,7 +281,7 @@ class UdpConnection : public UdpGuardedRefCount, public PriorityQueueMember, pub void RawSend(const udp_uchar *data, int dataLen); // nothing happens to the data here, it is given to the udpmanager and sent out the port void PhysicalSend(const udp_uchar *data, int dataLen, bool appendAllowed); // sends a physical packet (encrypts and adds crc bytes) udp_uchar *BufferedSend(const udp_uchar *data, int dataLen, const udp_uchar *data2, int dataLen2, bool appendAllowed); // buffers logical packets waiting til we have more data (makes multi-packets) - bool InternalSend(UdpChannel channel, const udp_uchar *data, int dataLen, const udp_uchar *data2 = NULL, int dataLen2 = 0); + bool InternalSend(UdpChannel channel, const udp_uchar *data, int dataLen, const udp_uchar *data2 = nullptr, int dataLen2 = 0); void InternalGiveTime(); void InternalDisconnect(int flushTimeout, DisconnectReason reason); @@ -527,7 +527,7 @@ inline void UdpConnection::ScheduleTimeNow() // prevents us from reprioritizing to 0, only to shortly thereafter be reprioritized to where we actually belong. if (!mGettingTime) { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) mUdpManager->SetPriority(this, 0); } } @@ -575,7 +575,7 @@ inline int UdpConnection::LastReceive(UdpClockStamp useStamp) const inline int UdpConnection::LastReceive() const { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); return(mUdpManager->CachedClockElapsed(mLastReceiveTime)); } @@ -583,7 +583,7 @@ inline int UdpConnection::LastReceive() const inline int UdpConnection::ConnectionAge() const { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); return(mUdpManager->CachedClockElapsed(mConnectionCreateTime)); } @@ -591,7 +591,7 @@ inline int UdpConnection::ConnectionAge() const inline int UdpConnection::LastSend() const { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); return(mUdpManager->CachedClockElapsed(mLastSendTime)); } @@ -599,7 +599,7 @@ inline int UdpConnection::LastSend() const inline udp_ushort UdpConnection::ServerSyncStampShort() const { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); return((udp_ushort)(mUdpManager->LocalSyncStampShort() + (mSyncTimeDelta & 0xffff))); } @@ -607,7 +607,7 @@ inline udp_ushort UdpConnection::ServerSyncStampShort() const inline udp_uint UdpConnection::ServerSyncStampLong() const { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); return(mUdpManager->LocalSyncStampLong() + mSyncTimeDelta); } @@ -649,7 +649,7 @@ inline UdpConnection::DisconnectReason UdpConnection::GetOtherSideDisconnectReas inline int UdpConnection::OutgoingBytesLastSecond() { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); ExpireSendBin(); @@ -659,7 +659,7 @@ inline int UdpConnection::OutgoingBytesLastSecond() inline int UdpConnection::IncomingBytesLastSecond() { UdpGuard guard(&mGuard); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return(0); ExpireReceiveBin(); diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverLinux.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverLinux.cpp index da7bcc5c..aa11f5cd 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverLinux.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverLinux.cpp @@ -101,7 +101,7 @@ bool UdpPlatformDriver::SocketOpen(int port, int incomingBufferSize, int outgoin addr_loc.sin_family = PF_INET; addr_loc.sin_port = htons((unsigned short)port); addr_loc.sin_addr.s_addr = htonl(INADDR_ANY); - if (bindIpAddress != NULL && bindIpAddress[0] != 0) + if (bindIpAddress != nullptr && bindIpAddress[0] != 0) { unsigned long address = inet_addr(bindIpAddress); if (address != INADDR_NONE) @@ -201,7 +201,7 @@ bool UdpPlatformDriver::GetHostByName(UdpPlatformAddress *ipAddress, const char { struct hostent *lphp; lphp = gethostbyname(hostName); - if (lphp == NULL) + if (lphp == nullptr) { address = 0; } @@ -223,7 +223,7 @@ bool UdpPlatformDriver::GetSelfAddress(UdpPlatformAddress *ipAddress, bool prefe if (gethostname(hostname, sizeof(hostname)) == 0) { struct hostent *entry = gethostbyname(hostname); - if (entry != NULL) + if (entry != nullptr) { for (int i = 0; entry->h_addr_list[i] != 0; i++) { @@ -273,7 +273,7 @@ UdpClockStamp UdpPlatformDriver::Clock() UdpGuard guard(&mData->clockGuard); struct timeval tv; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); UdpClockStamp cs = static_cast(tv.tv_sec) * 1000 + static_cast(tv.tv_usec / 1000); cs += mData->currentCorrection; if (cs < mData->lastStamp) @@ -319,7 +319,7 @@ int IcmpReceive(SOCKET socket, unsigned *address, int *port) return(-1); struct cmsghdr *cmsg; - for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) + for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msgh, cmsg)) { if(cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR) { @@ -378,7 +378,7 @@ void *GoThread(void *param) thread->mThreadData->running = false; thread->mThreadData->handle = 0; thread->Release(); - return(NULL); + return(nullptr); } UdpPlatformThreadObject::~UdpPlatformThreadObject() @@ -435,7 +435,7 @@ char *UdpPlatformAddress::GetAddress(char *buffer, int bufferLen) const *buffer = 0; return(buffer); } - assert(buffer != NULL); + assert(buffer != nullptr); sprintf(buffer, "%d.%d.%d.%d", mData[0], mData[1], mData[2], mData[3]); return(buffer); } @@ -444,7 +444,7 @@ void UdpPlatformAddress::SetAddress(const char *address) { for (int i = 0; i < 4; i++) { - mData[i] = (unsigned char)strtol(address, NULL, 10); + mData[i] = (unsigned char)strtol(address, nullptr, 10); while (*address >= '0' && *address <= '9') address++; if (*address != 0) diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp index 04c0c4d0..4a2a80e7 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp @@ -102,7 +102,7 @@ bool UdpPlatformDriver::SocketOpen(int port, int incomingBufferSize, int outgoin addr_loc.sin_family = PF_INET; addr_loc.sin_port = htons((unsigned short)port); addr_loc.sin_addr.s_addr = htonl(INADDR_ANY); - if (bindIpAddress != NULL && bindIpAddress[0] != 0) + if (bindIpAddress != nullptr && bindIpAddress[0] != 0) { unsigned long address = inet_addr(bindIpAddress); if (address != INADDR_NONE) @@ -205,7 +205,7 @@ bool UdpPlatformDriver::GetHostByName(UdpPlatformAddress *ipAddress, const char { struct hostent *lphp; lphp = gethostbyname(hostName); - if (lphp == NULL) + if (lphp == nullptr) { address = 0; } @@ -227,7 +227,7 @@ bool UdpPlatformDriver::GetSelfAddress(UdpPlatformAddress *ipAddress, bool prefe if (gethostname(hostname, sizeof(hostname)) == 0) { struct hostent *entry = gethostbyname(hostname); - if (entry != NULL) + if (entry != nullptr) { for (int i = 0; entry->h_addr_list[i] != 0; i++) { @@ -329,10 +329,10 @@ unsigned __stdcall GoThread(void *param) UdpPlatformThreadObject::~UdpPlatformThreadObject() { #ifndef UDPLIBRARY_SINGLE_THREAD - if (mThreadData->handle != NULL) + if (mThreadData->handle != nullptr) { CloseHandle(mThreadData->handle); - mThreadData->handle = NULL; + mThreadData->handle = nullptr; } #endif delete mThreadData; @@ -343,7 +343,7 @@ void UdpPlatformThreadObject::Start() AddRef(); #ifndef UDPLIBRARY_SINGLE_THREAD unsigned threadId; - mThreadData->handle = (HANDLE)_beginthreadex(NULL, 0, &GoThread, this, 0, &threadId); + mThreadData->handle = (HANDLE)_beginthreadex(nullptr, 0, &GoThread, this, 0, &threadId); #else GoThread(this); // run it inline in main thread (blocks til it's finished, so odds are it won't work, but they shouldn't be using it anyhow in this mode) #endif @@ -352,7 +352,7 @@ void UdpPlatformThreadObject::Start() UdpPlatformThreadObject::UdpPlatformThreadObject() { mThreadData = new UdpPlatformThreadData; - mThreadData->handle = NULL; + mThreadData->handle = nullptr; mThreadData->running = false; } @@ -389,7 +389,7 @@ char *UdpPlatformAddress::GetAddress(char *buffer, int bufferLen) const *buffer = 0; return(buffer); } - assert(buffer != NULL); + assert(buffer != nullptr); sprintf(buffer, "%d.%d.%d.%d", mData[0], mData[1], mData[2], mData[3]); return(buffer); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpHashTable.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpHashTable.h index 10af003d..9f24044e 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpHashTable.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpHashTable.h @@ -38,11 +38,11 @@ template class HashTable bool Remove(T& obj, int hashValue); void Reset(); // removes all entries from the table - T *FindFirst(int hashValue) const; // returns NULL if not found - T *FindNext(T *prevResult) const; // returns NULL if not found + T *FindFirst(int hashValue) const; // returns nullptr if not found + T *FindNext(T *prevResult) const; // returns nullptr if not found - T *WalkFirst() const; // returns NULL if not found - T *WalkNext(T *prevResult) const; // returns NULL if not found + T *WalkFirst() const; // returns nullptr if not found + T *WalkNext(T *prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -64,7 +64,7 @@ template class HashTable template HashTable::HashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -84,9 +84,9 @@ template void HashTable::Insert(T& obj, int hashValue) entry->hashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - entry->nextEntry = NULL; + entry->nextEntry = nullptr; mTable[spot] = entry; mStatUsedSlots++; } @@ -103,14 +103,14 @@ template bool HashTable::Remove(T& obj, int hashValue) int spot = ((unsigned)hashValue) % mTableSize; HashEntry* next = mTable[spot]; HashEntry** prev = &mTable[spot]; - while (next != NULL) + while (next != nullptr) { if (next->obj == obj && next->hashValue == hashValue) { *prev = next->nextEntry; delete next; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -127,17 +127,17 @@ template void HashTable::Reset() for (int spot = 0; spot < mTableSize; spot++) { HashEntry *curr = mTable[spot]; - if (curr != NULL) + if (curr != nullptr) { mStatUsedSlots--; - while (curr != NULL) + while (curr != nullptr) { HashEntry *next = curr->nextEntry; delete curr; mEntryCount--; curr = next; } - mTable[spot] = NULL; + mTable[spot] = nullptr; } } } @@ -145,13 +145,13 @@ template void HashTable::Reset() template T *HashTable::FindFirst(int hashValue) const { HashEntry *entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::FindNext(T *prevResult) const @@ -159,13 +159,13 @@ template T *HashTable::FindNext(T *prevResult) const HashEntry *entry = (HashEntry *)(((char *)prevResult) - offsetof(HashEntry, obj)); int hashValue = entry->hashValue; entry = entry->nextEntry; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::WalkFirst() const @@ -173,10 +173,10 @@ template T *HashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template T *HashTable::WalkNext(T *prevResult) const @@ -185,17 +185,17 @@ template T *HashTable::WalkNext(T *prevResult) const int bucket = ((unsigned)entry->hashValue) % mTableSize; entry = entry->nextEntry; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template void HashTable::Resize(int hashSize) @@ -215,16 +215,16 @@ template void HashTable::Resize(int hashSize) for (int i = 0; i < oldSize; i++) { HashEntry* next = oldTable[i]; - while (next != NULL) + while (next != nullptr) { HashEntry* hold = next; next = next->nextEntry; // insert hold into new table int spot = ((unsigned)hold->hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - hold->nextEntry = NULL; + hold->nextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } @@ -284,11 +284,11 @@ template class ObjectHashTable bool Remove(T *obj); void Reset(); // removes all entries from the table - T *FindFirst(int hashValue) const; // returns NULL if not found - T *FindNext(T *prevResult) const; // returns NULL if not found + T *FindFirst(int hashValue) const; // returns nullptr if not found + T *FindNext(T *prevResult) const; // returns nullptr if not found - T *WalkFirst() const; // returns NULL if not found - T *WalkNext(T *prevResult) const; // returns NULL if not found + T *WalkFirst() const; // returns nullptr if not found + T *WalkNext(T *prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -303,7 +303,7 @@ template class ObjectHashTable template ObjectHashTable::ObjectHashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -320,9 +320,9 @@ template void ObjectHashTable::Insert(T *obj, int static_cast(obj)->mHashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - static_cast(obj)->mHashNextEntry = NULL; + static_cast(obj)->mHashNextEntry = nullptr; mTable[spot] = obj; mStatUsedSlots++; } @@ -339,14 +339,14 @@ template bool ObjectHashTable::Remove(T *obj) int spot = ((unsigned)static_cast(obj)->mHashValue) % mTableSize; T *cur = mTable[spot]; T **prev = &mTable[spot]; - while (cur != NULL) + while (cur != nullptr) { if (cur == obj) { *prev = static_cast(cur)->mHashNextEntry; - static_cast(cur)->mHashNextEntry = NULL; + static_cast(cur)->mHashNextEntry = nullptr; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -368,13 +368,13 @@ template void ObjectHashTable::Reset() template T *ObjectHashTable::FindFirst(int hashValue) const { T *entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (static_cast(entry)->mHashValue == hashValue) return(entry); entry = static_cast(entry)->mHashNextEntry; } - return(NULL); + return(nullptr); } template T *ObjectHashTable::FindNext(T *prevResult) const @@ -382,13 +382,13 @@ template T *ObjectHashTable::FindNext(T *prevResul T *entry = prevResult; int hashValue = static_cast(entry)->mHashValue; entry = static_cast(entry)->mHashNextEntry; - while (entry != NULL) + while (entry != nullptr) { if (static_cast(entry)->mHashValue == hashValue) return(entry); entry = static_cast(entry)->mHashNextEntry; } - return(NULL); + return(nullptr); } template T *ObjectHashTable::WalkFirst() const @@ -396,10 +396,10 @@ template T *ObjectHashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { T *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template T *ObjectHashTable::WalkNext(T *prevResult) const @@ -408,17 +408,17 @@ template T *ObjectHashTable::WalkNext(T *prevResul int bucket = ((unsigned)static_cast(entry)->mHashValue) % mTableSize; entry = static_cast(entry)->mHashNextEntry; - if (entry != NULL) + if (entry != nullptr) return(entry); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template void ObjectHashTable::Resize(int hashSize) @@ -438,16 +438,16 @@ template void ObjectHashTable::Resize(int hashSize for (int i = 0; i < oldSize; i++) { T *cur = oldTable[i]; - while (cur != NULL) + while (cur != nullptr) { T *hold = cur; cur = static_cast(cur)->mHashNextEntry; // insert hold into new table int spot = ((unsigned)static_cast(hold)->mHashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - static_cast(hold)->mHashNextEntry = NULL; + static_cast(hold)->mHashNextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLinkedList.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLinkedList.h index 6fab2d03..ad2d7e63 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLinkedList.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLinkedList.h @@ -14,8 +14,8 @@ template class UdpLinkedList; template class UdpLinkedListMember { public: - UdpLinkedListMember() { mPrev = NULL; mNext = NULL; } - UdpLinkedListMember(const UdpLinkedListMember &) { mPrev = NULL; mNext = NULL; } + UdpLinkedListMember() { mPrev = nullptr; mNext = nullptr; } + UdpLinkedListMember(const UdpLinkedListMember &) { mPrev = nullptr; mNext = nullptr; } ~UdpLinkedListMember() {} #if defined(_MSC_VER) && (_MSC_VER < 1300) // MSVC 7.0 is the first version to support friend templates @@ -60,8 +60,8 @@ template class UdpLinkedList template UdpLinkedList::UdpLinkedList(UdpLinkedListMember T::*node) { - mHead = NULL; - mTail = NULL; + mHead = nullptr; + mTail = nullptr; mNode = node; mCount = 0; } @@ -98,7 +98,7 @@ template int UdpLinkedList::Count() const template T *UdpLinkedList::Position(int index) const { T *cur = mHead; - while (cur != NULL && index > 0) + while (cur != nullptr && index > 0) { cur = Next(cur); index--; @@ -109,43 +109,43 @@ template T *UdpLinkedList::Position(int index) const template T *UdpLinkedList::Remove(T *cur) { UdpLinkedListMember *node = &(cur->*mNode); - if (node->mPrev == NULL) + if (node->mPrev == nullptr) mHead = node->mNext; else ((node->mPrev)->*mNode).mNext = node->mNext; - if (node->mNext == NULL) + if (node->mNext == nullptr) mTail = node->mPrev; else ((node->mNext)->*mNode).mPrev = node->mPrev; - node->mNext = NULL; - node->mPrev = NULL; + node->mNext = nullptr; + node->mPrev = nullptr; mCount--; return(cur); } template T *UdpLinkedList::RemoveHead() { - if (mHead == NULL) - return(NULL); + if (mHead == nullptr) + return(nullptr); return(Remove(mHead)); } template T *UdpLinkedList::RemoveTail() { - if (mTail == NULL) - return(NULL); + if (mTail == nullptr) + return(nullptr); return(Remove(mTail)); } template T *UdpLinkedList::InsertHead(T *cur) { - assert((cur->*mNode).mPrev == NULL); - assert((cur->*mNode).mNext == NULL); + assert((cur->*mNode).mPrev == nullptr); + assert((cur->*mNode).mNext == nullptr); (cur->*mNode).mNext = mHead; - if (mHead != NULL) + if (mHead != nullptr) { (mHead->*mNode).mPrev = cur; mHead = cur; @@ -161,12 +161,12 @@ template T *UdpLinkedList::InsertHead(T *cur) template T *UdpLinkedList::InsertTail(T *cur) { - assert((cur->*mNode).mPrev == NULL); - assert((cur->*mNode).mNext == NULL); + assert((cur->*mNode).mPrev == nullptr); + assert((cur->*mNode).mNext == nullptr); (cur->*mNode).mPrev = mTail; - if (mTail != NULL) + if (mTail != nullptr) { (mTail->*mNode).mNext = cur; mTail = cur; @@ -182,17 +182,17 @@ template T *UdpLinkedList::InsertTail(T *cur) template T *UdpLinkedList::InsertAfter(T *cur, T *prev) { - assert((cur->*mNode).mPrev == NULL); - assert((cur->*mNode).mNext == NULL); + assert((cur->*mNode).mPrev == nullptr); + assert((cur->*mNode).mNext == nullptr); - if (prev == NULL) + if (prev == nullptr) return(InsertHead(cur)); (cur->*mNode).mPrev = prev; (cur->*mNode).mNext = (prev->*mNode).mNext; (prev->*mNode).mNext = cur; - if ((cur->*mNode).mNext != NULL) + if ((cur->*mNode).mNext != nullptr) (((cur->*mNode).mNext)->*mNode).mPrev = cur; else mTail = cur; @@ -204,7 +204,7 @@ template T *UdpLinkedList::InsertAfter(T *cur, T *prev) template void UdpLinkedList::DeleteAll() { T *cur = First(); - while (cur != NULL) + while (cur != nullptr) { T *next = Next(cur); Remove(cur); @@ -216,7 +216,7 @@ template void UdpLinkedList::DeleteAll() template void UdpLinkedList::ReleaseAll() { T *cur = First(); - while (cur != NULL) + while (cur != nullptr) { T *next = Next(cur); Remove(cur); diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.cpp index 5ecce2fb..76171367 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.cpp @@ -31,7 +31,7 @@ SimpleLogicalPacket::SimpleLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; mData = new udp_uchar[mDataLen]; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -66,7 +66,7 @@ void SimpleLogicalPacket::SetDataLen(int len) GroupLogicalPacket::GroupLogicalPacket() : LogicalPacket() { mDataLen = 0; - mData = NULL; + mData = nullptr; } GroupLogicalPacket::~GroupLogicalPacket() @@ -76,13 +76,13 @@ GroupLogicalPacket::~GroupLogicalPacket() void GroupLogicalPacket::AddPacket(const LogicalPacket *packet) { - assert(packet != NULL); + assert(packet != nullptr); AddPacketInternal(packet->GetDataPtr(), packet->GetDataLen(), packet->IsInternalPacket()); } void GroupLogicalPacket::AddPacket(const void *data, int dataLen) { - assert(data != NULL); + assert(data != nullptr); assert(dataLen >= 0); AddPacketInternal(data, dataLen, false); } @@ -152,10 +152,10 @@ PooledLogicalPacket::PooledLogicalPacket(UdpManager *manager, int len) PooledLogicalPacket::~PooledLogicalPacket() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->PoolDestroyed(this); - mUdpManager = NULL; + mUdpManager = nullptr; } delete[] mData; @@ -168,7 +168,7 @@ void PooledLogicalPacket::AddRef() const void PooledLogicalPacket::Release() const { - if (GetRefCount() == 1 && mUdpManager != NULL) + if (GetRefCount() == 1 && mUdpManager != nullptr) { // the PoolReturn function steals our reference (ie, we don't release, they don't addref), this is for thread safety reasons mUdpManager->PoolReturn(const_cast(this)); @@ -208,9 +208,9 @@ void PooledLogicalPacket::SetDataLen(int len) void PooledLogicalPacket::SetData(const void *data, int dataLen, const void *data2, int dataLen2) { mDataLen = dataLen + dataLen2; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(mData + dataLen, data2, dataLen2); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.h index 6a5962c4..8e1525a8 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpLogicalPacket.h @@ -81,7 +81,7 @@ class SimpleLogicalPacket : public LogicalPacket // it was originally created to allow the internal code to handle reliable data that was sent // via the Send(char *, int) api call. public: - SimpleLogicalPacket(const void *data, int dataLen); // data can be NULL if you want to populate it after it is allocated (get the pointer and write to it) + SimpleLogicalPacket(const void *data, int dataLen); // data can be nullptr if you want to populate it after it is allocated (get the pointer and write to it) virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -152,7 +152,7 @@ template class StructLogicalPacket : public LogicalPacket // with virtual functions) via this method as they may contain hidden data-members (such as pointers // to vtables). public: - StructLogicalPacket(T *initData = NULL); + StructLogicalPacket(T *initData = nullptr); virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -226,7 +226,7 @@ class PooledLogicalPacket : public LogicalPacket protected: friend class UdpManager; void TrueRelease() const; - void SetData(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + void SetData(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); UdpManager *mUdpManager; UdpLinkedListMember mAvailableLink; // for available linked list in manager UdpLinkedListMember mCreatedLink; // for created linked list in manager @@ -240,7 +240,7 @@ class PooledLogicalPacket : public LogicalPacket template FixedLogicalPacket::FixedLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -270,7 +270,7 @@ template void FixedLogicalPacket::SetDataLen(int l ///////////////////////////////////////////////////////////////////////// template StructLogicalPacket::StructLogicalPacket(T *initData) { - if (initData != NULL) + if (initData != nullptr) mStruct = *initData; } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.cpp index 5a63f361..2129e06f 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.cpp @@ -111,10 +111,10 @@ UdpManager::UdpManager(const UdpParams *params) : mConnectionList(&UdpConnection mParams.maxDataHoldSize = udpMin(mParams.maxDataHoldSize, mParams.maxRawPacketSize); mParams.packetHistoryMax = udpMax(1, mParams.packetHistoryMax); mPacketHistoryPosition = 0; - mPassThroughData = NULL; - mBackgroundThread = NULL; + mPassThroughData = nullptr; + mBackgroundThread = nullptr; - if (mParams.udpDriver != NULL) + if (mParams.udpDriver != nullptr) { mDriver = mParams.udpDriver; } @@ -154,7 +154,7 @@ UdpManager::UdpManager(const UdpParams *params) : mConnectionList(&UdpConnection mSimulateOutgoingQueueBytes = 0; if (mParams.avoidPriorityQueue) - mPriorityQueue = NULL; + mPriorityQueue = nullptr; else mPriorityQueue = new PriorityQueue(mParams.maxConnections); @@ -181,7 +181,7 @@ UdpManager::~UdpManager() { // Since the background thread holds a reference to the UdpManager while it is running, this should // not be possible. The only way it could happen is if somebody released the manager who should not have. - assert(mBackgroundThread == NULL); + assert(mBackgroundThread == nullptr); // next thing we must do is tell all the connections to disconnect (which severs their link to this dying manager) // this has to be done first since they will call back into us and have themselves removed from our connection-list/priority-queue/etc @@ -191,7 +191,7 @@ UdpManager::~UdpManager() UdpGuard cg(&mConnectionGuard); UdpConnection *cur = mConnectionList.First(); - while (cur != NULL) + while (cur != nullptr) { cur->AddRef(); cur->InternalDisconnect(0, UdpConnection::cDisconnectReasonManagerDeleted); // this will cause it to remove us from the mConnectionList @@ -216,9 +216,9 @@ UdpManager::~UdpManager() UdpGuard guard(&mPoolGuard); PooledLogicalPacket *walk = mPoolCreatedList.RemoveHead(); - while (walk != NULL) + while (walk != nullptr) { - walk->mUdpManager = NULL; + walk->mUdpManager = nullptr; walk = mPoolCreatedList.RemoveHead(); } // next release the ones we have in our available pool @@ -232,11 +232,11 @@ UdpManager::~UdpManager() CloseSocket(); - if (mParams.udpDriver == NULL) + if (mParams.udpDriver == nullptr) { delete mDriver; // we were not given a driver to use, so we must own this driver we have, so destroy it } - mDriver = NULL; + mDriver = nullptr; delete mAddressHashTable; delete mConnectCodeHashTable; @@ -295,7 +295,7 @@ void UdpManager::ProcessDisconnectPending() UdpGuard guard(&mDisconnectPendingGuard); UdpConnection *entry = mDisconnectPendingList.First(); - while (entry != NULL) + while (entry != nullptr) { UdpConnection *next = mDisconnectPendingList.Next(entry); if (entry->GetStatus() == UdpConnection::cStatusDisconnected) @@ -309,12 +309,12 @@ void UdpManager::ProcessDisconnectPending() void UdpManager::RemoveConnection(UdpConnection *con) { - assert(con != NULL); // attemped to remove a NULL connection object + assert(con != nullptr); // attemped to remove a nullptr connection object // note: it's a bug to Remove a connection object that is already removed...should never be able to happen. UdpGuard cg(&mConnectionGuard); - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) { mPriorityQueue->Remove(con); } @@ -326,7 +326,7 @@ void UdpManager::RemoveConnection(UdpConnection *con) void UdpManager::AddConnection(UdpConnection *con) { - assert(con != NULL); // attemped to add a NULL connection object + assert(con != nullptr); // attemped to add a nullptr connection object UdpGuard cg(&mConnectionGuard); con->AddRef(); // UdpManager keeps a soft reference to the connection (ie. if it sees it is the only one holding a reference, it releases it) @@ -341,17 +341,17 @@ void UdpManager::FlushAllMultiBuffer() mConnectionGuard.Enter(); UdpConnection *cur = mConnectionList.First(); - if (cur != NULL) + if (cur != nullptr) cur->AddRef(); mConnectionGuard.Leave(); - while (cur != NULL) + while (cur != nullptr) { cur->FlushMultiBuffer(); mConnectionGuard.Enter(); UdpConnection *next = mConnectionList.Next(cur); - if (next != NULL) + if (next != nullptr) next->AddRef(); mConnectionGuard.Leave(); @@ -366,15 +366,15 @@ void UdpManager::DisconnectAll() mConnectionGuard.Enter(); UdpConnection *cur = mConnectionList.First(); - if (cur != NULL) + if (cur != nullptr) cur->AddRef(); mConnectionGuard.Leave(); - while (cur != NULL) + while (cur != nullptr) { mConnectionGuard.Enter(); UdpConnection *next = mConnectionList.Next(cur); - if (next != NULL) + if (next != nullptr) next->AddRef(); mConnectionGuard.Leave(); @@ -392,7 +392,7 @@ void UdpManager::DeliverEvents(int maxProcessingTime) for (;;) { CallbackEvent *ce = EventListPop(); - if (ce == NULL) + if (ce == nullptr) break; switch(ce->mEventType) @@ -426,13 +426,13 @@ void UdpManager::DeliverEvents(int maxProcessingTime) { { // guard block UdpGuard hguard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { mParams.handler->OnConnectRequest(ce->mSource); } } - if (ce->mSource->GetHandler() == NULL) // if application did not set a handler, then the connection is considered refused + if (ce->mSource->GetHandler() == nullptr) // if application did not set a handler, then the connection is considered refused { ce->mSource->InternalDisconnect(0, UdpConnection::cDisconnectReasonConnectionRefused); } @@ -513,7 +513,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) PacketHistoryEntry *e = SimulationReceive(); #endif - if (e == NULL) + if (e == nullptr) { mLastEmptySocketBufferStamp = CachedClock(); break; @@ -545,7 +545,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) if (giveConnectionsTime) { - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) { // give time to everybody in the priority-queue that needs it UdpClockStamp curPriority = CachedClock(); @@ -570,10 +570,10 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) mConnectionGuard.Enter(); top = mPriorityQueue->TopRemove(curPriority); - if (top != NULL) + if (top != nullptr) top->AddRef(); // must always addref connections while inside the connection guard mConnectionGuard.Leave(); - if (top == NULL) + if (top == nullptr) break; top->GiveTime(true); @@ -593,17 +593,17 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) // give time to everybody mConnectionGuard.Enter(); UdpConnection *cur = mConnectionList.First(); - if (cur != NULL) + if (cur != nullptr) cur->AddRef(); mConnectionGuard.Leave(); - while (cur != NULL) + while (cur != nullptr) { cur->GiveTime(true); mConnectionGuard.Enter(); UdpConnection *next = mConnectionList.Next(cur); - if (next != NULL) + if (next != nullptr) next->AddRef(); mConnectionGuard.Leave(); @@ -621,13 +621,13 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) UdpClockStamp curStamp = CachedClock(); SimulateQueueEntry *entry = mSimulateOutgoingList.First(); - while (entry != NULL && curStamp >= mSimulateNextOutgoingTime) + while (entry != nullptr && curStamp >= mSimulateNextOutgoingTime) { mSimulateOutgoingList.Remove(entry); SimulateQueueEntry *next = mSimulateOutgoingList.First(); // simulate a delay before next packet is considered (ie. simple lag) - if (next != NULL) + if (next != nullptr) { int latencyDelay = (mSimulation.simulateOutgoingLatency - CachedClockElapsed(next->mQueueTime)); mSimulateNextOutgoingTime = curStamp + latencyDelay; @@ -644,7 +644,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) ActualSendHelper(entry->mData, entry->mDataLen, entry->mIp, entry->mPort); UdpConnection *con = AddressGetConnection(entry->mIp, entry->mPort); - if (con != NULL) + if (con != nullptr) { con->mSimulateOutgoingQueueBytes -= entry->mDataLen; con->Release(); @@ -664,12 +664,12 @@ UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int se { UdpGuard guard(&mGiveTimeGuard); // probably not needed, I don't see any reason we can't do this while GiveTime is happening in the background...the connection list is protected independently...still, better safe than sorry - assert(serverAddress != NULL); + assert(serverAddress != nullptr); char useServerAddress[512]; UdpLibrary::UdpMisc::Strncpy(useServerAddress, serverAddress, sizeof(useServerAddress)); char *portPtr = strchr(useServerAddress, ':'); - if (portPtr != NULL) + if (portPtr != nullptr) { *portPtr++ = 0; serverPort = atoi(portPtr); @@ -679,21 +679,21 @@ UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int se assert(serverPort != 0); // can't connect to no port if (mConnectionList.Count() >= mParams.maxConnections) - return(NULL); + return(nullptr); // get server address UdpPlatformAddress destIp; if (!mDriver->GetHostByName(&destIp, useServerAddress)) { - return(NULL); // could not resolve name + return(nullptr); // could not resolve name } // first, see if we already have a connection object managing this ip/port, if we do, then fail UdpConnection *con = AddressGetConnection(destIp, serverPort); - if (con != NULL) + if (con != nullptr) { con->Release(); - return(NULL); // already connected to this address/port + return(nullptr); // already connected to this address/port } return(new UdpConnection(this, destIp, serverPort, timeout)); } @@ -709,7 +709,7 @@ void UdpManager::GetStats(UdpManagerStatistics *stats) { UdpGuard sg(&mStatsGuard); - assert(stats != NULL); + assert(stats != nullptr); *stats = mManagerStats; stats->poolAvailable = mPoolAvailableList.Count(); stats->poolCreated = mPoolCreatedList.Count(); @@ -737,10 +737,10 @@ void UdpManager::DumpPacketHistory(const char *filename) const { UdpGuard guard(&mGiveTimeGuard); - assert(filename != NULL); + assert(filename != nullptr); assert(filename[0] != 0); FILE *file = fopen(filename, "wt"); - if (file != NULL) + if (file != nullptr) { // dump history of packets... for (int i = 0; i < mParams.packetHistoryMax; i++) @@ -789,7 +789,7 @@ UdpManager::PacketHistoryEntry *UdpManager::SimulationReceive() for (;;) { PacketHistoryEntry *entry = ActualReceive(); - if (entry == NULL) + if (entry == nullptr) break; SimulateQueueEntry *qe = new SimulateQueueEntry(entry->mBuffer, entry->mLen, entry->mIp, entry->mPort, curStamp); @@ -797,7 +797,7 @@ UdpManager::PacketHistoryEntry *UdpManager::SimulationReceive() } SimulateQueueEntry *winner = mSimulateIncomingList.First(); - if (winner != NULL && CachedClockElapsed(winner->mQueueTime) >= mSimulation.simulateIncomingLatency) + if (winner != nullptr && CachedClockElapsed(winner->mQueueTime) >= mSimulation.simulateIncomingLatency) { mSimulateIncomingList.Remove(winner); int pos = mPacketHistoryPosition; @@ -809,14 +809,14 @@ UdpManager::PacketHistoryEntry *UdpManager::SimulationReceive() delete winner; return(mPacketHistory[pos]); } - return(NULL); + return(nullptr); } UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() { UdpClockStamp curStamp = CachedClock(); if (mSimulation.simulateIncomingByteRate > 0 && curStamp < mSimulateNextIncomingTime) - return(NULL); + return(nullptr); UdpPlatformAddress fromAddress; int fromPort = 0; @@ -855,7 +855,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() } return(mPacketHistory[pos]); } - return(NULL); + return(nullptr); } void UdpManager::ActualSend(const udp_uchar *data, int dataLen, UdpPlatformAddress ip, int port) @@ -876,7 +876,7 @@ void UdpManager::ActualSend(const udp_uchar *data, int dataLen, UdpPlatformAddre return; // no room, packet gets lost UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { if (mSimulation.simulateDestinationOverloadLevel > 0 && con->mSimulateOutgoingQueueBytes + dataLen > mSimulation.simulateDestinationOverloadLevel) { @@ -928,7 +928,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) UdpConnection *con = AddressGetConnection(e->mIp, e->mPort); - if (con == NULL) + if (con == nullptr) { if (e->mLen == 0) // len = 0 = ICMP error { @@ -946,7 +946,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) if (mConnectionList.Count() >= mParams.maxConnections) return; // can't handle any more connections, so ignore this request entirely - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { UdpConnection *newcon = new UdpConnection(this, e); CallbackConnectRequest(newcon); @@ -968,7 +968,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) int encryptCode = UdpMisc::GetValue32(ptr); UdpConnection *con = ConnectCodeGetConnection(connectCode); - if (con != NULL) + if (con != nullptr) { if (mParams.allowAddressRemapping || con->mIp == e->mIp) { @@ -1025,7 +1025,7 @@ UdpConnection *UdpManager::AddressGetConnection(UdpPlatformAddress ip, int port) UdpGuard guard(&mConnectionGuard); UdpConnection *found = mAddressHashTable->FindFirst(AddressHashValue(ip, port)); - while (found != NULL) + while (found != nullptr) { if (found->mIp == ip && found->mPort == port) { @@ -1034,7 +1034,7 @@ UdpConnection *UdpManager::AddressGetConnection(UdpPlatformAddress ip, int port) } found = mAddressHashTable->FindNext(found); } - return(NULL); + return(nullptr); } UdpConnection *UdpManager::ConnectCodeGetConnection(int connectCode) const @@ -1042,7 +1042,7 @@ UdpConnection *UdpManager::ConnectCodeGetConnection(int connectCode) const UdpGuard guard(&mConnectionGuard); UdpConnection *found = mConnectCodeHashTable->FindFirst(connectCode); - while (found != NULL) + while (found != nullptr) { if (found->mConnectCode == connectCode) { @@ -1051,7 +1051,7 @@ UdpConnection *UdpManager::ConnectCodeGetConnection(int connectCode) const } found = mConnectCodeHashTable->FindNext(found); } - return(NULL); + return(nullptr); } LogicalPacket *UdpManager::CreatePacket(const void *data, int dataLen, const void *data2, int dataLen2) @@ -1063,7 +1063,7 @@ LogicalPacket *UdpManager::CreatePacket(const void *data, int dataLen, const voi { UdpGuard guard(&mPoolGuard); PooledLogicalPacket *lp = mPoolAvailableList.RemoveHead(); - if (lp == NULL) + if (lp == nullptr) { // create a new pooled packet to fulfil request lp = new PooledLogicalPacket(this, mParams.pooledPacketSize); @@ -1091,7 +1091,7 @@ void UdpManager::PoolDestroyed(PooledLogicalPacket *packet) char *UdpManager::GetLocalString(char *buf, int bufLen) const { if (bufLen < 22) - return(NULL); + return(nullptr); UdpPlatformAddress ip = GetLocalIp(); int port = GetLocalPort(); char hold[256]; @@ -1103,7 +1103,7 @@ UdpManager::CallbackEvent *UdpManager::AvailableEventBorrow() { UdpGuard guard(&mAvailableEventGuard); CallbackEvent *ce = mAvailableEventList.RemoveHead(); - if (ce == NULL) + if (ce == nullptr) { ce = new CallbackEvent(); } @@ -1127,7 +1127,7 @@ void UdpManager::EventListAppend(CallbackEvent *ce) { UdpGuard guard(&mEventListGuard); mEventList.InsertTail(ce); - if (ce->mPayload != NULL) + if (ce->mPayload != nullptr) { mEventListBytes += ce->mPayload->GetDataLen(); } @@ -1137,7 +1137,7 @@ UdpManager::CallbackEvent *UdpManager::EventListPop() { UdpGuard guard(&mEventListGuard); CallbackEvent *event = mEventList.RemoveHead(); - if (event != NULL && event->mPayload != NULL) + if (event != nullptr && event->mPayload != nullptr) { mEventListBytes -= event->mPayload->GetDataLen(); } @@ -1148,7 +1148,7 @@ UdpManager::CallbackEvent *UdpManager::EventListPop() void UdpManager::ThreadStart() { UdpGuard guard(&mThreadGuard); - if (mBackgroundThread == NULL) + if (mBackgroundThread == nullptr) { mBackgroundThread = new UdpManagerThread(this, mParams.threadSleepTime); mBackgroundThread->Start(); @@ -1158,12 +1158,12 @@ void UdpManager::ThreadStart() void UdpManager::ThreadStop() { UdpGuard guard(&mThreadGuard); - if (mBackgroundThread != NULL) + if (mBackgroundThread != nullptr) { assert(mRefCount > 1); // caller must hold a reference, and thread must hold a reference, so this should be true. If it asserts, it means the caller is using a UdpManager that it does not hold a reference to. mBackgroundThread->Stop(true); mBackgroundThread->Release(); - mBackgroundThread = NULL; + mBackgroundThread = nullptr; } } @@ -1256,13 +1256,13 @@ void UdpManager::CallbackConnectRequest(UdpConnection *con) { { // guard block UdpGuard hguard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { mParams.handler->OnConnectRequest(con); } } - if (con->GetHandler() == NULL) // if application did not set a handler, then the connection is considered refused + if (con->GetHandler() == nullptr) // if application did not set a handler, then the connection is considered refused { con->InternalDisconnect(0, UdpConnection::cDisconnectReasonConnectionRefused); } @@ -1276,8 +1276,8 @@ void UdpManager::CallbackConnectRequest(UdpConnection *con) UdpManager::CallbackEvent::CallbackEvent() { mEventType = cCallbackEventNone; - mSource = NULL; - mPayload = NULL; + mSource = nullptr; + mPayload = nullptr; mReason = cUdpCorruptionReasonNone; } @@ -1291,7 +1291,7 @@ void UdpManager::CallbackEvent::SetEventData(CallbackEventType eventType, UdpCon mEventType = eventType; mSource = con; mSource->AddRef(); - if (payload != NULL) + if (payload != nullptr) { mPayload = payload; mPayload->AddRef(); @@ -1300,16 +1300,16 @@ void UdpManager::CallbackEvent::SetEventData(CallbackEventType eventType, UdpCon void UdpManager::CallbackEvent::ClearEventData() { - if (mSource != NULL) + if (mSource != nullptr) { mSource->Release(); - mSource = NULL; + mSource = nullptr; } - if (mPayload != NULL) + if (mPayload != nullptr) { mPayload->Release(); - mPayload = NULL; + mPayload = nullptr; } } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.h index 3715a0b2..7c263031 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.h @@ -178,7 +178,7 @@ struct UdpParams // pointer equal to your object and the UdpManager will call it as appropriate. The UdpConnection object // also has a handler mechanism that replaces the other callback functions below, see UdpConnection::SetHandler // if a handler is specified, the callback function is ignored, even if specified. - // default = NULL (not used) + // default = nullptr (not used) UdpManagerHandler *handler; // this is the maximum number of connections that can be established by this manager, any incoming/outgoing connections @@ -496,7 +496,7 @@ struct UdpParams // the UdpPlatformDriver object itself and chain the calls on through, plus do whatever else it wants; // however, that is not required. The application maintains ownership of this object and the object must // not be destroyed by the application until the UdpManager using it is destroyed. - // default = NULL, meaning the UdpManager it will create it's own UdpPlatformDriver for use. + // default = nullptr, meaning the UdpManager it will create it's own UdpPlatformDriver for use. UdpDriver *udpDriver; @@ -642,7 +642,7 @@ class UdpManager : public UdpGuardedRefCount // will call EstablishConnection, then sit in a loop calling UdpManager::GiveTime and checking to see // if the status of the returned UdpConnection object is changed from cStatusNegotiating. This allows // the application to look for the ESC key or timeout an attempted connection. - // This function will return NULL if the manager object has exceeded its maximum number of connections + // This function will return nullptr if the manager object has exceeded its maximum number of connections // or if the serverAddress cannot be resolved to an IP address // as is noted in the declaration, it is the responsibility of the application establishing the connection to delete it // setting the timeout value (in milliseconds) to something greater than 0 will cause the UdpConnection object to change @@ -685,13 +685,13 @@ class UdpManager : public UdpGuardedRefCount // a terminated packet. void DisconnectAll(); - // creates a logical packet and populates it with data. data can be NULL, in which case it gives you logical packet + // creates a logical packet and populates it with data. data can be nullptr, in which case it gives you logical packet // of the size specified, but copies no data into it. If you are using pool management (see Params::poolPacketMax), // it will give you a packet out of the pool if possible, otherwise it will create a packet for you. When logical // are packets are needed internally for various things (like reliable channel sends that use the (void *, int) interface) // they are gotten from this function, so your application can likely take advantage of pooling, even if it never bothers // to explicitly call this function. - LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); void GetSimulation(UdpSimulationParameters *simulationParameters) const; void SetSimulation(const UdpSimulationParameters *simulationParameters); @@ -796,7 +796,7 @@ class UdpManager : public UdpGuardedRefCount CallbackEvent(); ~CallbackEvent(); - void SetEventData(CallbackEventType eventType, UdpConnection *con, const LogicalPacket *payload = NULL); + void SetEventData(CallbackEventType eventType, UdpConnection *con, const LogicalPacket *payload = nullptr); void ClearEventData(); CallbackEventType mEventType; @@ -926,7 +926,7 @@ inline void UdpManager::SetPriority(UdpConnection *con, UdpClockStamp stamp) if (stamp < mMinimumScheduledStamp) stamp = mMinimumScheduledStamp; - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) { mPriorityQueue->Add(con, stamp); } @@ -1025,7 +1025,7 @@ inline int UdpManager::CachedClockElapsed(UdpClockStamp start) inline int UdpManager::EncryptUserSupplied(UdpConnection *con, udp_uchar *destData, const udp_uchar *sourceData, int sourceLen) { UdpGuard guard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { return(mParams.handler->OnUserSuppliedEncrypt(con, destData, sourceData, sourceLen)); } @@ -1035,7 +1035,7 @@ inline int UdpManager::EncryptUserSupplied(UdpConnection *con, udp_uchar *destDa inline int UdpManager::EncryptUserSupplied2(UdpConnection *con, udp_uchar *destData, const udp_uchar *sourceData, int sourceLen) { UdpGuard guard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { return(mParams.handler->OnUserSuppliedEncrypt2(con, destData, sourceData, sourceLen)); } @@ -1045,7 +1045,7 @@ inline int UdpManager::EncryptUserSupplied2(UdpConnection *con, udp_uchar *destD inline int UdpManager::DecryptUserSupplied(UdpConnection *con, udp_uchar *destData, const udp_uchar *sourceData, int sourceLen) { UdpGuard guard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { return(mParams.handler->OnUserSuppliedDecrypt(con, destData, sourceData, sourceLen)); } @@ -1055,7 +1055,7 @@ inline int UdpManager::DecryptUserSupplied(UdpConnection *con, udp_uchar *destDa inline int UdpManager::DecryptUserSupplied2(UdpConnection *con, udp_uchar *destData, const udp_uchar *sourceData, int sourceLen) { UdpGuard guard(&mHandlerGuard); - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { return(mParams.handler->OnUserSuppliedDecrypt2(con, destData, sourceData, sourceLen)); } @@ -1070,7 +1070,7 @@ inline int UdpManager::DecryptUserSupplied2(UdpConnection *con, udp_uchar *destD ///////////////////////////////////////////////////////////////////////////////////////////////////// inline UdpParams::UdpParams(ManagerRole role) { - handler = NULL; + handler = nullptr; outgoingBufferSize = 64 * 1024; incomingBufferSize = 64 * 1024; packetHistoryMax = 4; @@ -1103,7 +1103,7 @@ inline UdpParams::UdpParams(ManagerRole role) reliableOverflowBytes = 0; lingerDelay = 10; bindIpAddress[0] = 0; - udpDriver = NULL; + udpDriver = nullptr; callbackEventPoolMax = 5000; eventQueuing = false; threadSleepTime = 20; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp index b50daae0..651492fc 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp @@ -113,19 +113,19 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) if (bytes == 0) { - if (ptr != NULL) + if (ptr != nullptr) { free((udp_uchar *)ptr - cAlignment); } - return(NULL); + return(nullptr); } udp_uchar *ptr2; - if (ptr == NULL) + if (ptr == nullptr) { ptr2 = (udp_uchar *)malloc(bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); } @@ -135,8 +135,8 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) return(ptr); ptr2 = (udp_uchar *)realloc((udp_uchar *)ptr - cAlignment, bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); @@ -199,30 +199,30 @@ LogicalPacket *UdpMisc::CreateQuickLogicalPacket(const void *data, int dataLen, switch(q) { case 0: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 1: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 2: case 3: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 4: case 5: case 6: case 7: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; default: - tlp = new SimpleLogicalPacket(NULL, totalDataLen); + tlp = new SimpleLogicalPacket(nullptr, totalDataLen); break; } udp_uchar *dest = (udp_uchar *)tlp->GetDataPtr(); - if (data != NULL) + if (data != nullptr) memcpy(dest, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(dest + dataLen, data2, dataLen2); return(tlp); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.h index 3961823f..f77380ca 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.h @@ -57,7 +57,7 @@ class UdpMisc // memory manager does a little bit of this, but if you know you have an allocation that is likely // to grow quite a bit, you can set the round'ing size up to a fairly large number and avoid // unnecessary reallocs at the cost of a little potentially wasted space - // initial allocations are done by passing in ptr==NULL, freeing is done by passing in bytes==0 + // initial allocations are done by passing in ptr==nullptr, freeing is done by passing in bytes==0 static void *SmartResize(void *ptr, int bytes, int round = 1); // the following two functions store values in the buffer as a variable length (B1, 0xffB2B1, 0xffffffB4B3B2B1) @@ -78,7 +78,7 @@ class UdpMisc static udp_uint GetValue24(const void *buffer); // gets a 24-bit value from the buffer in big-endian format static udp_ushort GetValue16(const void *buffer); // gets a 16-bit value from the buffer in big-endian format - static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); // looks up the specified name and translates it to an IP address // this is a blocking call that can at times take a significant amount of time, but will generally be fast (less than 300ms) diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpPriority.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpPriority.h index c50dee62..e4f2df20 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpPriority.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpPriority.h @@ -43,12 +43,12 @@ template class PriorityQueue PriorityQueue(int queueSize); ~PriorityQueue(); - T* Top(); // returns NULL if queue is empty - T* TopRemove(); // returns NULL if queue is empty - T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return NULL + T* Top(); // returns nullptr if queue is empty + T* TopRemove(); // returns nullptr if queue is empty + T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return nullptr T* Add(T* entry, P priority); // reprioritizes if already in queue, returns entry always T* Remove(T* entry); // returns entry always (even if it was not in the queue) - P *GetPriority(T* entry); // returns NULL if entry is not in the queue + P *GetPriority(T* entry); // returns nullptr if entry is not in the queue int QueueUsed(); // returns how many entries are in the queue protected: struct QueueEntry @@ -94,14 +94,14 @@ template PriorityQueue::~PriorityQueue() template T* PriorityQueue::Top() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); return(mQueue[0].entry); } template T* PriorityQueue::TopRemove() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); T* top = mQueue[0].entry; Remove(top); return(top); @@ -111,14 +111,14 @@ template T* PriorityQueue::TopRemove(P priority) { if (mQueueEnd > 0 && mQueue[0].priority <= priority) return(Remove(mQueue[0].entry)); - return(NULL); + return(nullptr); } template P* PriorityQueue::GetPriority(T* entry) { if (entry->mPriorityQueuePosition >= 0) return(&mQueue[entry->mPriorityQueuePosition].priority); - return(NULL); + return(nullptr); } template T* PriorityQueue::Add(T* entry, P priority) @@ -127,7 +127,7 @@ template T* PriorityQueue::Add(T* entry, P priorit { // not in queue, so add it to the bottom if (mQueueEnd >= mQueueSize) - return(NULL); + return(nullptr); mQueue[mQueueEnd].entry = entry; mQueue[mQueueEnd].priority = priority; mQueue[mQueueEnd].entry->mPriorityQueuePosition = mQueueEnd; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.cpp index d31de9b4..5b6250f5 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.cpp @@ -48,12 +48,12 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mReliableOutgoingBytes = 0; mLogicalBytesQueued = 0; - mCoalescePacket = NULL; - mCoalesceStartPtr = NULL; - mCoalesceEndPtr = NULL; + mCoalescePacket = nullptr; + mCoalesceStartPtr = nullptr; + mCoalesceEndPtr = nullptr; mCoalesceCount = 0; - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; mStatDuplicatePacketsReceived = 0; mStatResentPacketsAccelerated = 0; @@ -69,7 +69,7 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; mFragmentNextPos = 0; mLastTimeStampAcknowledged = 0; mMaxxedOutCurrentWindow = false; @@ -81,14 +81,14 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud UdpReliableChannel::~UdpReliableChannel() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } const LogicalPacket *cur = mLogicalPacketList.RemoveHead(); - while (cur != NULL) + while (cur != nullptr) { cur->Release(); cur = mLogicalPacketList.RemoveHead(); @@ -103,7 +103,7 @@ UdpReliableChannel::~UdpReliableChannel() void UdpReliableChannel::Send(const udp_uchar *data, int dataLen, const udp_uchar *data2, int dataLen2) { - if (mLogicalPacketList.Count() == 0 && mCoalescePacket == NULL) + if (mLogicalPacketList.Count() == 0 && mCoalescePacket == nullptr) { // if we are adding something to a previously empty logical queue, then it is possible that // we may be able to send it, so mark ourselves to take time the next time it is offered @@ -126,7 +126,7 @@ void UdpReliableChannel::Send(const udp_uchar *data, int dataLen, const udp_ucha void UdpReliableChannel::FlushCoalesce() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { if (mCoalesceCount == 1) { @@ -140,16 +140,16 @@ void UdpReliableChannel::FlushCoalesce() mCoalescePacket->SetDataLen((int)(mCoalesceEndPtr - mCoalesceStartPtr)); QueueLogicalPacket(mCoalescePacket); mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } } void UdpReliableChannel::SendCoalesce(const udp_uchar *data, int dataLen, const udp_uchar *data2, int dataLen2) { int totalLen = dataLen + dataLen2; - if (mCoalescePacket == NULL) + if (mCoalescePacket == nullptr) { - mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(NULL, mMaxDataBytes); + mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(nullptr, mMaxDataBytes); mCoalesceEndPtr = mCoalesceStartPtr = (udp_uchar *)mCoalescePacket->GetDataPtr(); *mCoalesceEndPtr++ = 0; *mCoalesceEndPtr++ = UdpConnection::cUdpPacketGroup; @@ -169,10 +169,10 @@ void UdpReliableChannel::SendCoalesce(const udp_uchar *data, int dataLen, const // append on end of coalesce mCoalesceCount++; mCoalesceEndPtr += UdpMisc::PutVariableValue(mCoalesceEndPtr, totalLen); - if (data != NULL) + if (data != nullptr) memcpy(mCoalesceEndPtr, data, dataLen); mCoalesceEndPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) memcpy(mCoalesceEndPtr, data2, dataLen2); mCoalesceEndPtr += dataLen2; } @@ -287,7 +287,7 @@ int UdpReliableChannel::GiveTime() mMaxxedOutCurrentWindow = false; int outstandingNextSendTime = 10 * 60000; // if we have something to do - if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalPacketList.Count() != 0 || mCoalescePacket != NULL) + if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalPacketList.Count() != 0 || mCoalescePacket != nullptr) { // first, let's calculate how many bytes we figure is outstanding based on who is still waiting for an ack-packet UdpClockStamp oldestResendTime = udpMax(hotClock - optimalResendDelay, mLastTimeStampAcknowledged); // anything older than this, we need to resend @@ -317,7 +317,7 @@ int UdpReliableChannel::GiveTime() // if this packet has not been acked and it is NOT ready to be sent (was recently sent) then we consider it outstanding // note: packets needing re-sending probably got lost and are therefore not outstanding PhysicalPacket *entry = &mPhysicalPackets[i % mConfig.maxOutstandingPackets]; - if (entry->mDataPtr != NULL) // acked packets set the dataPtr to NULL + if (entry->mDataPtr != nullptr) // acked packets set the dataPtr to nullptr { // if this packet is ready to be sent (ie: needs time now, or some later packet has already been ack'ed) windowSpaceLeft -= entry->mDataLen; // window-space is effectively taken whether we have sent it yet or not @@ -524,7 +524,7 @@ int UdpReliableChannel::GiveTime() void UdpReliableChannel::GetChannelStatus(UdpConnection::ChannelStatus *channelStatus) const { int coalesceBytes = 0; - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) coalesceBytes = (int)(mCoalesceEndPtr - mCoalesceStartPtr); channelStatus->totalPendingBytes = mLogicalBytesQueued + mReliableOutgoingBytes + coalesceBytes; @@ -550,7 +550,7 @@ void UdpReliableChannel::GetChannelStatus(UdpConnection::ChannelStatus *channelS PhysicalPacket *entry = &mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets]; if (entry->mFirstTimeStamp != 0) // if has been sent (we know it hasn't been acknowledged or we couldn't possibly be pointing at it as pending) { - if (mUdpConnection->GetUdpManager() != NULL) + if (mUdpConnection->GetUdpManager() != nullptr) { channelStatus->oldestUnacknowledgedAge = mUdpConnection->GetUdpManager()->CachedClockElapsed(entry->mFirstTimeStamp); } @@ -588,7 +588,7 @@ void UdpReliableChannel::ReliablePacket(const udp_uchar *data, int dataLen) mReliableIncomingId++; // process other packets that have arrived - while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != NULL) + while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != nullptr) { int spot = (int)(mReliableIncomingId % mConfig.maxInstandingPackets); if (mReliableIncoming[spot].mMode != cReliablePacketModeDelivered) @@ -597,7 +597,7 @@ void UdpReliableChannel::ReliablePacket(const udp_uchar *data, int dataLen) } mReliableIncoming[spot].mPacket->Release(); - mReliableIncoming[spot].mPacket = NULL; + mReliableIncoming[spot].mPacket = nullptr; mReliableIncomingId++; } } @@ -605,7 +605,7 @@ void UdpReliableChannel::ReliablePacket(const udp_uchar *data, int dataLen) { // not the one we need next, but it is later than the one we need , so store it in our buffer until it's turn comes up int spot = (int)(reliableId % mConfig.maxInstandingPackets); - if (mReliableIncoming[spot].mPacket == NULL) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) + if (mReliableIncoming[spot].mPacket == nullptr) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) { mReliableIncoming[spot].mMode = mode; mReliableIncoming[spot].mPacket = mUdpConnection->mUdpManager->CreatePacket(data + UdpConnection::cUdpPacketReliableSize, dataLen - UdpConnection::cUdpPacketReliableSize); @@ -651,14 +651,14 @@ void UdpReliableChannel::ReliablePacket(const udp_uchar *data, int dataLen) bufPtr += UdpMisc::PutValue16(bufPtr, (udp_ushort)(reliableId & 0xffff)); } - if (mBufferedAckPtr != NULL && mConfig.ackDeduping && ackAll) + if (mBufferedAckPtr != nullptr && mConfig.ackDeduping && ackAll) { memcpy(mBufferedAckPtr, buf, bufPtr - buf); } else { - udp_uchar *ptr = mUdpConnection->BufferedSend(buf, (int)(bufPtr - buf), NULL, 0, true); // safe to append on our data, it is stack data - if (mBufferedAckPtr == NULL) + udp_uchar *ptr = mUdpConnection->BufferedSend(buf, (int)(bufPtr - buf), nullptr, 0, true); // safe to append on our data, it is stack data + if (mBufferedAckPtr == nullptr) { // the buffered-ack ptr should always point to the earliest ack in the buffer, such that // a replacement ack-all will be processed by the receiver before any selective acks that may @@ -676,7 +676,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const udp_uchar if (mode == cReliablePacketModeReliable) { // we are not a fragment, nor was there a fragment in progress, so we are a simple reliable packet, just send it to the app - if (mBigDataPtr != NULL) + if (mBigDataPtr != nullptr) { mUdpConnection->CallbackCorruptPacket(data, dataLen, cUdpCorruptionReasonFragmentExpected); return; @@ -687,7 +687,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const udp_uchar else if (mode == cReliablePacketModeFragment) { // append onto end of big packet (or create new big packet if not existing already) - if (mBigDataPtr == NULL) + if (mBigDataPtr == nullptr) { if (dataLen < 4) { @@ -729,7 +729,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const udp_uchar delete[] mBigDataPtr; mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; } } } @@ -767,7 +767,7 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) int pos = (int)(reliableId % mConfig.maxOutstandingPackets); PhysicalPacket *entry = &mPhysicalPackets[pos]; - if (entry->mDataPtr != NULL) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) + if (entry->mDataPtr != nullptr) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) { mNextNeedTime = 0; // something got acked, so we actually need to take the time next time it is offered @@ -829,14 +829,14 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) // this packet we have queued has been acknowledged, so delete it from queue mReliableOutgoingBytes -= entry->mDataLen; entry->mDataLen = 0; - entry->mDataPtr = NULL; + entry->mDataPtr = nullptr; entry->mParent->Release(); - entry->mParent = NULL; + entry->mParent = nullptr; // advance the pending ptr until it reaches outgoingId or an entry that has yet to acknowledged while (mReliableOutgoingPendingId < mReliableOutgoingId) { - if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != NULL) + if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != nullptr) break; mReliableOutgoingPendingId++; } @@ -855,25 +855,25 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) UdpReliableChannel::IncomingQueueEntry::IncomingQueueEntry() { - mPacket = NULL; + mPacket = nullptr; mMode = UdpReliableChannel::cReliablePacketModeReliable; } UdpReliableChannel::IncomingQueueEntry::~IncomingQueueEntry() { - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->Release(); } UdpReliableChannel::PhysicalPacket::PhysicalPacket() { - mParent = NULL; + mParent = nullptr; } UdpReliableChannel::PhysicalPacket::~PhysicalPacket() { - if (mParent != NULL) + if (mParent != nullptr) mParent->Release(); } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.h b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.h index fab02474..033585eb 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpReliableChannel.h @@ -64,7 +64,7 @@ class UdpReliableChannel void ProcessPacket(ReliablePacketMode mode, const udp_uchar *data, int dataLen); bool PullDown(int windowSpaceLeft); void FlushCoalesce(); - void SendCoalesce(const udp_uchar *data, int dataLen, const udp_uchar *data2 = NULL, int dataLen2 = 0); + void SendCoalesce(const udp_uchar *data, int dataLen, const udp_uchar *data2 = nullptr, int dataLen2 = 0); void QueueLogicalPacket(LogicalPacket *packet); UdpReliableConfig mConfig; @@ -138,7 +138,7 @@ inline int UdpReliableChannel::TotalPendingBytes() const inline void UdpReliableChannel::ClearBufferedAck() { - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; } inline udp_int64 UdpReliableChannel::GetReliableOutgoingId(int reliableStamp) const diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.h b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.h index 741a6e80..493c5a2d 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeCharacterDataMap.h @@ -122,7 +122,7 @@ namespace Plat_Unicode /** * Find a CharData for the given code point. - * @return null if no CharData exists for this code point + * @return nullptr if no CharData exists for this code point */ inline const CharData * CharDataMap::findCharData (const unicode_char_t code) const diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/utf8.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/utf8.cpp index da8e34e8..57bd0a0d 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/utf8.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/utf8.cpp @@ -87,7 +87,7 @@ int UTF8_convertCharToUTF16( char * ptr , UTF16 * ret ) int UTF8_convertToUTF16( char * ptr , UTF16 * ret, int limit ) { int len = 0; - while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the null terminator + while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the nullptr terminator { int clen = UTF8_convertCharToUTF16( ptr, ret ); ptr += clen; diff --git a/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/common.cpp b/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/common.cpp index 6076f618..2c07d021 100755 --- a/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/common.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/common.cpp @@ -171,37 +171,37 @@ namespace VChatSystem token = strtok((char*)tmpTokenee.c_str(), seps ); - if( token != NULL ) + if( token != nullptr ) { game = token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } - if( token != NULL ) + if( token != nullptr ) { server = token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } - if( token != NULL ) + if( token != nullptr ) { name = token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } - while ( token != NULL ) + while ( token != nullptr ) { name += "."; name += token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } } @@ -216,29 +216,29 @@ namespace VChatSystem std::string tmpTokenee = userName; token = strtok((char*)tmpTokenee.c_str(), seps ); - if( token != NULL ) + if( token != nullptr ) { server = token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } - if( token != NULL ) + if( token != nullptr ) { name = token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } - while ( token != NULL ) + while ( token != nullptr ) { name += "."; name += token; /* Get next token: */ - token = strtok( NULL, seps ); + token = strtok( nullptr, seps ); } } diff --git a/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatUnitTest/VChatClient.cpp b/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatUnitTest/VChatClient.cpp index 869bf94a..db94c3cd 100755 --- a/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatUnitTest/VChatClient.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatUnitTest/VChatClient.cpp @@ -23,7 +23,7 @@ unsigned VChatClient::GetAccountEx(const std::string &avatarName, { Reset(); - VChatAPI::GetAccount(avatarName, game, world, userID, avatarID, NULL); + VChatAPI::GetAccount(avatarName, game, world, userID, avatarID, nullptr); while(!IsDone() && !HasFailed()) { @@ -69,7 +69,7 @@ unsigned VChatClient::DeactivateVoiceAccount(const std::string &avatarName, { Reset(); - VChatAPI::DeactivateVoiceAccount(avatarName, game, world, NULL); + VChatAPI::DeactivateVoiceAccount(avatarName, game, world, nullptr); while(!IsDone() && !HasFailed()) { @@ -99,7 +99,7 @@ unsigned VChatClient::GetChannelEx( const std::string &channelName, bool persistent) { Reset(); - VChatAPI::GetChannel(channelName, game, server, description, password, limit, persistent, NULL); + VChatAPI::GetChannel(channelName, game, server, description, password, limit, persistent, nullptr); while(!IsDone() && !HasFailed()) { @@ -146,7 +146,7 @@ unsigned VChatClient::GetProximityChannelEx(const std::string &channelName, unsigned distModel) { Reset(); - VChatAPI::GetProximityChannel(channelName, game, server, description, password, limit, persistent, maxRange, clamping, rollOff, maxGain, distModel, NULL); + VChatAPI::GetProximityChannel(channelName, game, server, description, password, limit, persistent, maxRange, clamping, rollOff, maxGain, distModel, nullptr); while(!IsDone() && !HasFailed()) { @@ -183,7 +183,7 @@ unsigned VChatClient::ChannelCommandEx( const std::string &srcUserName, unsigned banTimeout) { Reset(); - VChatAPI::ChannelCommand(srcUserName, destUserName, destChannelAddress, command, banTimeout, NULL); + VChatAPI::ChannelCommand(srcUserName, destUserName, destChannelAddress, command, banTimeout, nullptr); while(!IsDone() && !HasFailed()) { @@ -211,7 +211,7 @@ unsigned VChatClient::ChangePasswordEx(const std::string &channelName, const std::string &password) { Reset(); - VChatAPI::ChangePassword(channelName, game, server, password, NULL); + VChatAPI::ChangePassword(channelName, game, server, password, nullptr); while(!IsDone() && !HasFailed()) { @@ -236,7 +236,7 @@ void VChatClient::OnChangePassword( unsigned track, unsigned VChatClient::GetAllChannelsEx() { Reset(); - VChatAPI::GetAllChannels(NULL); + VChatAPI::GetAllChannels(nullptr); while(!IsDone() && !HasFailed()) { @@ -274,7 +274,7 @@ unsigned VChatClient::DeleteChannelEx(const std::string &channelName, const std::string &server) { Reset(); - VChatAPI::DeleteChannel(channelName, game, server, NULL); + VChatAPI::DeleteChannel(channelName, game, server, nullptr); while(!IsDone() && !HasFailed()) { @@ -301,7 +301,7 @@ unsigned VChatClient::SetBanStatusEx(unsigned userID, unsigned banStatus) { Reset(); - VChatAPI::SetBanStatus(userID, banStatus, NULL); + VChatAPI::SetBanStatus(userID, banStatus, nullptr); while(!IsDone() && !HasFailed()) { @@ -328,7 +328,7 @@ unsigned VChatClient::GetChannelInfoEx( const std::string &channelName, const std::string &server) { Reset(); - VChatAPI::GetChannelInfo(channelName, game, server, NULL); + VChatAPI::GetChannelInfo(channelName, game, server, nullptr); while(!IsDone() && !HasFailed()) { @@ -369,7 +369,7 @@ unsigned VChatClient::GetChannelV2Ex(const std::string &channelName, bool persistent) { Reset(); - VChatAPI::GetChannelV2(channelName, game, server, description, password, limit, persistent, NULL); + VChatAPI::GetChannelV2(channelName, game, server, description, password, limit, persistent, nullptr); while(!IsDone() && !HasFailed()) { @@ -419,7 +419,7 @@ unsigned VChatClient::AddCharacterChannelEx(const unsigned stationID, Reset(); VChatAPI::AddCharacterChannel(stationID, avatarID, characterName, worldName, gameCode, channelType, channelDescription, - password, channelAddress, locale, NULL); + password, channelAddress, locale, nullptr); while(!IsDone() && !HasFailed()) { @@ -449,7 +449,7 @@ unsigned VChatClient::RemoveCharacterChannelEx( const unsigned stationID, { Reset(); VChatAPI::RemoveCharacterChannel(stationID, avatarID, characterName, worldName, - gameCode, channelType, NULL); + gameCode, channelType, nullptr); while(!IsDone() && !HasFailed()) { @@ -477,7 +477,7 @@ unsigned VChatClient::GetCharacterChannelEx(const unsigned stationID, const std::string &gameCode) { Reset(); - VChatAPI::GetCharacterChannel(stationID, characterName, worldName, gameCode, NULL); + VChatAPI::GetCharacterChannel(stationID, characterName, worldName, gameCode, nullptr); while(!IsDone() && !HasFailed()) { diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp index 3af047a2..9c9c8084 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp @@ -45,7 +45,7 @@ namespace API_NAMESPACE //////////////////////////////////////////////////////////////////////////////// CommonAPI::CommonAPI(const char * hostList, const char * failoverHostList, unsigned connectionLimit, unsigned maxMsgSize, unsigned bufferSize) - : mManager(NULL) + : mManager(nullptr) , mHostReconnectTimeout() , mIdleHosts() , mHostMap() @@ -247,7 +247,7 @@ namespace API_NAMESPACE connection->Send((const char*)buffer, size); #endif } - mLastRequestInputTime = time(NULL); + mLastRequestInputTime = time(nullptr); } #ifdef UDP_LIBRARY @@ -466,7 +466,7 @@ namespace API_NAMESPACE RequestMap_t::iterator reqIterator = mRequestMap.find(trackingNumber); bool found = false; - *pUserData = NULL; + *pUserData = nullptr; if (reqIterator != mRequestMap.end()) { TrackedRequest & request = reqIterator->second; @@ -594,7 +594,7 @@ namespace API_NAMESPACE CommonAPI::ApiConnectionInfo * CommonAPI::GetNextUsableConnection() { - ApiConnectionInfo * connectionInfo = NULL; + ApiConnectionInfo * connectionInfo = nullptr; if (!mUsableHosts[0].empty()) { @@ -617,7 +617,7 @@ namespace API_NAMESPACE CommonAPI::ApiConnectionInfo * CommonAPI::FindConnectionInfo(ApiConnection * connection) { // find the connection in the set - ApiConnectionInfo * pInfo = NULL; + ApiConnectionInfo * pInfo = nullptr; ConnectionMap_t::iterator iter; if ( ((iter = mActiveHosts[0].find(connection)) != mActiveHosts[0].end()) || ((iter = mActiveHosts[1].find(connection)) != mActiveHosts[1].end()) ) @@ -777,8 +777,8 @@ namespace API_NAMESPACE mspEnumerationToVersionStringMap = &enumerationToVersionStringMap; } - std::map *VersionMap::mspVersionStringToEnumerationMap = NULL; - std::map *VersionMap::mspEnumerationToVersionStringMap = NULL; + std::map *VersionMap::mspVersionStringToEnumerationMap = nullptr; + std::map *VersionMap::mspEnumerationToVersionStringMap = nullptr; //////////////////////////////////////////////////////////////////////////////// @@ -1009,7 +1009,7 @@ namespace API_NAMESPACE mspLabelToEntryMap = &labelToEntryMap; } - ConfigurationMap::LabelToEntryMap_t *ConfigurationMap::mspLabelToEntryMap = NULL; + ConfigurationMap::LabelToEntryMap_t *ConfigurationMap::mspLabelToEntryMap = nullptr; //////////////////////////////////////////////////////////////////////////////// diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.h index 37512cbd..9cd24094 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.h @@ -58,7 +58,7 @@ namespace API_NAMESPACE typedef std::set TrackingSet_t; struct ApiConnectionInfo { - ApiConnectionInfo(ApiConnection * Connection = NULL) : mConnection(Connection), mIsShuttingDown(false) { } + ApiConnectionInfo(ApiConnection * Connection = nullptr) : mConnection(Connection), mIsShuttingDown(false) { } ApiConnection * mConnection; TrackingSet_t mOutstandingRequests; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp index c38875ab..ae5cdc76 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp @@ -253,7 +253,7 @@ namespace API_NAMESPACE Base * Base::Create(unsigned MsgId, StorageVector_t *pStorageVector) { - Base * msg = NULL; + Base * msg = nullptr; if (ms_pClassMap) { std::map::iterator classIter = ms_pClassMap->find(MsgId); @@ -272,7 +272,7 @@ namespace API_NAMESPACE const char * Base::GetMessageName(unsigned msgId) { - const char * requestString = NULL; + const char * requestString = nullptr; if (ms_pClassMap) { std::map::iterator classIter = ms_pClassMap->find(msgId); @@ -287,7 +287,7 @@ namespace API_NAMESPACE const char * Base::GetMessageIDString(unsigned msgId) { - const char * idString = NULL; + const char * idString = nullptr; if (ms_pClassMap) { std::map::iterator classIter = ms_pClassMap->find(msgId); @@ -304,7 +304,7 @@ namespace API_NAMESPACE { static std::map classMap; - if (ms_pClassMap == NULL) { + if (ms_pClassMap == nullptr) { ms_pClassMap = &classMap; } @@ -326,24 +326,24 @@ namespace API_NAMESPACE } Base::DeepPointer::DeepPointer() : - m_ptr(NULL) + m_ptr(nullptr) { } Base::DeepPointer::DeepPointer(const Base & source) : - m_ptr(NULL) + m_ptr(nullptr) { m_ptr = source.Clone(m_storageVector); } Base::DeepPointer::DeepPointer(const Base * source) : - m_ptr(NULL) + m_ptr(nullptr) { m_ptr = source->Clone(m_storageVector); } Base::DeepPointer::DeepPointer(const DeepPointer & source) : - m_ptr(NULL) + m_ptr(nullptr) { if (source.m_ptr) { m_ptr = source->Clone(m_storageVector); } } @@ -364,7 +364,7 @@ namespace API_NAMESPACE { Base *oldPtr = m_ptr; - m_ptr = rhs ? rhs->Clone(m_storageVector) : NULL; + m_ptr = rhs ? rhs->Clone(m_storageVector) : nullptr; if (oldPtr) { oldPtr->~Base(); @@ -377,7 +377,7 @@ namespace API_NAMESPACE { Base *oldPtr = m_ptr; - m_ptr = rhs.m_ptr ? rhs->Clone(m_storageVector) : NULL; + m_ptr = rhs.m_ptr ? rhs->Clone(m_storageVector) : nullptr; if (oldPtr) { oldPtr->~Base(); @@ -396,7 +396,7 @@ namespace API_NAMESPACE return *m_ptr; } - std::map *Base::ms_pClassMap = NULL; + std::map *Base::ms_pClassMap = nullptr; #if defined(PRINTABLE_MESSAGES) || defined(TRACK_READ_WRITE_FAILURES) Basic::Basic() diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h index ef733afb..12b00516 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.h @@ -60,7 +60,7 @@ namespace API_NAMESPACE protected: struct DECLSPEC MemberInfo { - MemberInfo(soe::AutoVariableBase *dataIn = NULL, unsigned sizeIn = 1, unsigned versionIn = 0, soe::EVersionEffect effectIn = soe::eNoEffect) + MemberInfo(soe::AutoVariableBase *dataIn = nullptr, unsigned sizeIn = 1, unsigned versionIn = 0, soe::EVersionEffect effectIn = soe::eNoEffect) : data(dataIn) , size(sizeIn) , version(versionIn) @@ -97,8 +97,8 @@ namespace API_NAMESPACE virtual Base * Clone() const; virtual Base * Clone(StorageVector_t &storageVector) const; virtual const char * MessageName() const { return "Base"; } - virtual const char * MessageIDString() const { return "NULL"; } - static Base * Create(unsigned MsgId, StorageVector_t *pStorageVector = NULL); + virtual const char * MessageIDString() const { return "nullptr"; } + static Base * Create(unsigned MsgId, StorageVector_t *pStorageVector = nullptr); static const char * GetMessageName(unsigned msgId); static const char * GetMessageIDString(unsigned msgId); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp index 5a1dd30d..2f72d6e0 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp @@ -291,7 +291,7 @@ namespace NAMESPACE if (!mActiveHosts[0].empty()) { // get connection that corresponds to hash index - ApiConnection * connection = NULL; + ApiConnection * connection = nullptr; unsigned hashIndex = hashValue % mActiveHosts[0].size(); unsigned curIndex = 0; for (ConnectionSet_t::iterator it = mActiveHosts[0].begin(); it != mActiveHosts[0].end(); it++, curIndex++) @@ -314,7 +314,7 @@ namespace NAMESPACE else if (!mActiveHosts[1].empty()) { // get connection that corresponds to hash index - ApiConnection * connection = NULL; + ApiConnection * connection = nullptr; unsigned hashIndex = hashValue % mActiveHosts[1].size(); unsigned curIndex = 0; for (ConnectionSet_t::iterator it = mActiveHosts[1].begin(); it != mActiveHosts[1].end(); it++, curIndex++) diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp index 8c04219e..9d82c979 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/cmdLine.cpp @@ -132,7 +132,7 @@ int CmdLine::SplitLine(int argc, char **argv) bool CmdLine::IsSwitch(const char *pParam) { - if (pParam==NULL) + if (pParam==nullptr) return false; // switches must non-empty @@ -201,7 +201,7 @@ StringType CmdLine::GetSafeArgument(const char *pSwitch, int iIdx, const char *p { StringType sRet; - if (pDefault!=NULL) + if (pDefault!=nullptr) sRet = pDefault; try diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/date.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/date.cpp index 025883cd..0184793d 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/date.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/date.cpp @@ -42,7 +42,7 @@ namespace soe , mSecond(0) { struct tm timeStruct; - struct tm *gotTime = NULL; + struct tm *gotTime = nullptr; #ifdef WIN32 gotTime = gmtime(&src); #else diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/dateUtils.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/dateUtils.h index fecca883..be898b53 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/dateUtils.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/dateUtils.h @@ -144,7 +144,7 @@ namespace soe inline time_t localTimeToGmt(int dstOffsetMinutes = DST_OFFSET_MINUTES_USA) { - time_t localTime = time(NULL); + time_t localTime = time(nullptr); struct tm gt = *(gmtime(&localTime)); struct tm lt = *(localtime(&localTime)); bool isDst = (lt.tm_isdst? true:false); @@ -187,7 +187,7 @@ namespace soe dstOffsetSecs = dstOffsetMS/1000; return retval; } - inline int getGMT(time_t & theTime, const char *id = NULL) + inline int getGMT(time_t & theTime, const char *id = nullptr) { UDate date; UErrorCode ec; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/genericRateLimitingMechanism.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/genericRateLimitingMechanism.h index 20b16fa1..66934bc1 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/genericRateLimitingMechanism.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/genericRateLimitingMechanism.h @@ -245,7 +245,7 @@ namespace soe template const LimitType * GenericRateLimitingMechanism::GetRateLimit(const FixedKeyType & fixedKey) const { - LimitType const * rateLimit = NULL; + LimitType const * rateLimit = nullptr; typename RateLimitByFixedKeyMap_t::const_iterator limIter = mRateLimits.find(fixedKey); if (limIter != mRateLimits.end()) { @@ -258,7 +258,7 @@ namespace soe template const LimitType * GenericRateLimitingMechanism::GetNextRateLimit(FixedKeyType & fixedKey) const { - LimitType const * rateLimit = NULL; + LimitType const * rateLimit = nullptr; typename RateLimitByFixedKeyMap_t::const_iterator limIter = mRateLimits.upper_bound(fixedKey); if (limIter != mRateLimits.end()) { @@ -272,7 +272,7 @@ namespace soe template const CounterType * GenericRateLimitingMechanism::GetRateCounter(const FixedKeyType & fixedKey, const ArbitraryKeyType & arbitraryKey) const { - const CounterType * counter = NULL; + const CounterType * counter = nullptr; typename RateCounterByKeyPairMap_t::const_iterator counterIter = mRateCounters.find(KeyPair(fixedKey, arbitraryKey)); if (counterIter != mRateCounters.end()) { counter = &(counterIter->second->mCounter); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/hashtable.hpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/hashtable.hpp index 00f9cd75..4fc2ace9 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/hashtable.hpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/hashtable.hpp @@ -174,11 +174,11 @@ template class HashTable bool Remove(T& obj, int hashValue); void Reset(); // removes all entries from the table - T *FindFirst(int hashValue) const; // returns NULL if not found - T *FindNext(T *prevResult) const; // returns NULL if not found + T *FindFirst(int hashValue) const; // returns nullptr if not found + T *FindNext(T *prevResult) const; // returns nullptr if not found - T *WalkFirst() const; // returns NULL if not found - T *WalkNext(T *prevResult) const; // returns NULL if not found + T *WalkFirst() const; // returns nullptr if not found + T *WalkNext(T *prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -200,7 +200,7 @@ template class HashTable template HashTable::HashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -220,9 +220,9 @@ template void HashTable::Insert(T& obj, int hashValue) entry->hashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - entry->nextEntry = NULL; + entry->nextEntry = nullptr; mTable[spot] = entry; mStatUsedSlots++; } @@ -239,14 +239,14 @@ template bool HashTable::Remove(T& obj, int hashValue) int spot = ((unsigned)hashValue) % mTableSize; HashEntry* next = mTable[spot]; HashEntry** prev = &mTable[spot]; - while (next != NULL) + while (next != nullptr) { if (next->obj == obj && next->hashValue == hashValue) { *prev = next->nextEntry; delete next; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -263,17 +263,17 @@ template void HashTable::Reset() for (int spot = 0; spot < mTableSize; spot++) { HashEntry *curr = mTable[spot]; - if (curr != NULL) + if (curr != nullptr) { mStatUsedSlots--; - while (curr != NULL) + while (curr != nullptr) { HashEntry *next = curr->nextEntry; delete curr; mEntryCount--; curr = next; } - mTable[spot] = NULL; + mTable[spot] = nullptr; } } } @@ -281,13 +281,13 @@ template void HashTable::Reset() template T *HashTable::FindFirst(int hashValue) const { HashEntry *entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::FindNext(T *prevResult) const @@ -295,13 +295,13 @@ template T *HashTable::FindNext(T *prevResult) const HashEntry *entry = (HashEntry *)(((char *)prevResult) - offsetof(HashEntry, obj)); int hashValue = entry->hashValue; entry = entry->nextEntry; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::WalkFirst() const @@ -309,10 +309,10 @@ template T *HashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template T *HashTable::WalkNext(T *prevResult) const @@ -321,17 +321,17 @@ template T *HashTable::WalkNext(T *prevResult) const int bucket = ((unsigned)entry->hashValue) % mTableSize; entry = entry->nextEntry; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template void HashTable::Resize(int hashSize) @@ -351,16 +351,16 @@ template void HashTable::Resize(int hashSize) for (int i = 0; i < oldSize; i++) { HashEntry* next = oldTable[i]; - while (next != NULL) + while (next != nullptr) { HashEntry* hold = next; next = next->nextEntry; // insert hold into new table int spot = ((unsigned)hold->hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - hold->nextEntry = NULL; + hold->nextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } @@ -414,11 +414,11 @@ template class ObjectHashTable bool Remove(T obj, int hashValue); void Reset(); // removes all entries from the table - T FindFirst(int hashValue) const; // returns NULL if not found - T FindNext(T prevResult) const; // returns NULL if not found + T FindFirst(int hashValue) const; // returns nullptr if not found + T FindNext(T prevResult) const; // returns nullptr if not found - T WalkFirst() const; // returns NULL if not found - T WalkNext(T prevResult) const; // returns NULL if not found + T WalkFirst() const; // returns nullptr if not found + T WalkNext(T prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -433,7 +433,7 @@ template class ObjectHashTable template ObjectHashTable::ObjectHashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -451,9 +451,9 @@ template void ObjectHashTable::Insert(T obj, int hashValue) obj->mHashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - obj->mHashNextEntry = NULL; + obj->mHashNextEntry = nullptr; mTable[spot] = obj; mStatUsedSlots++; } @@ -470,14 +470,14 @@ template bool ObjectHashTable::Remove(T obj, int hashValue) int spot = ((unsigned)hashValue) % mTableSize; T next = mTable[spot]; T *prev = &mTable[spot]; - while (next != NULL) + while (next != nullptr) { if (next == obj) { *prev = (T)next->mHashNextEntry; - next->mHashNextEntry = NULL; + next->mHashNextEntry = nullptr; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -494,16 +494,16 @@ template void ObjectHashTable::Reset() for (int spot = 0; spot < mTableSize; spot++) { T curr = mTable[spot]; - if (curr != NULL) + if (curr != nullptr) { - while (curr != NULL) + while (curr != nullptr) { T next = (T)curr->mHashNextEntry; - curr->mHashNextEntry = NULL; + curr->mHashNextEntry = nullptr; mEntryCount--; curr = next; } - mTable[spot] = NULL; + mTable[spot] = nullptr; mStatUsedSlots--; } } @@ -512,13 +512,13 @@ template void ObjectHashTable::Reset() template T ObjectHashTable::FindFirst(int hashValue) const { T entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (entry->mHashValue == hashValue) return(entry); entry = (T)entry->mHashNextEntry; } - return(NULL); + return(nullptr); } template T ObjectHashTable::FindNext(T prevResult) const @@ -526,13 +526,13 @@ template T ObjectHashTable::FindNext(T prevResult) const T entry = prevResult; int hashValue = entry->mHashValue; entry = (T)entry->mHashNextEntry; - while (entry != NULL) + while (entry != nullptr) { if (entry->mHashValue == hashValue) return(entry); entry = (T)entry->mHashNextEntry; } - return(NULL); + return(nullptr); } template T ObjectHashTable::WalkFirst() const @@ -540,10 +540,10 @@ template T ObjectHashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { T entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template T ObjectHashTable::WalkNext(T prevResult) const @@ -552,17 +552,17 @@ template T ObjectHashTable::WalkNext(T prevResult) const int bucket = ((unsigned)entry->mHashValue) % mTableSize; entry = (T)entry->mHashNextEntry; - if (entry != NULL) + if (entry != nullptr) return(entry); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template void ObjectHashTable::Resize(int hashSize) @@ -582,16 +582,16 @@ template void ObjectHashTable::Resize(int hashSize) for (int i = 0; i < oldSize; i++) { T next = oldTable[i]; - while (next != NULL) + while (next != nullptr) { T hold = next; next = (T)next->mHashNextEntry; // insert hold into new table int spot = ((unsigned)hold->mHashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - hold->mHashNextEntry = NULL; + hold->mHashNextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/log.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/log.cpp index e14aee9a..72cac84a 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/log.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/log.cpp @@ -115,7 +115,7 @@ Logger::Logger(const char *programName, void Logger::LoggerInit(const char *programName) { char buf[1024]; - FILE *logDir = NULL; + FILE *logDir = nullptr; if (0 != (m_logType & eUseLocalFile)) { @@ -124,13 +124,13 @@ void Logger::LoggerInit(const char *programName) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } tm now; - time_t t = time(NULL); + time_t t = time(nullptr); LOGGER_GET_CURR_TIME(now, t); @@ -148,7 +148,7 @@ void Logger::LoggerInit(const char *programName) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -330,7 +330,7 @@ void Logger::logSimple(unsigned logenum, int level, const char *message) { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) { @@ -400,7 +400,7 @@ void Logger::logSimpleWithSys(unsigned logenum, unsigned priority, int level, co { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -482,7 +482,7 @@ void Logger::logWithSys(unsigned logenum, unsigned priority, int level, const ch { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -562,7 +562,7 @@ void Logger::vlogWithSys(unsigned logenum, unsigned priority, int level, const c { return; } - time_t t = time(NULL); + time_t t = time(nullptr); LogInfo *info = (*iter).second; if(level >= info->level) @@ -630,14 +630,14 @@ void Logger::vlog(unsigned logenum, int level, const char *message, va_list argp void Logger::rollDate(time_t t) { char buf[80]; - FILE *logDir = NULL; + FILE *logDir = nullptr; logDir = fopen(m_dirPrefix.c_str(), "r+"); if(errno == ENOENT) { cmkdir(m_dirPrefix.c_str(), 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -653,7 +653,7 @@ void Logger::rollDate(time_t t) { cmkdir(buf, 0755); } - else if(logDir != NULL) + else if(logDir != nullptr) { fclose(logDir); } @@ -737,7 +737,7 @@ void Logger::rollLog(LogInfo *logInfo) { std::string newLogName; char timeStampBuffer[256]; - time_t t = time(NULL); + time_t t = time(nullptr); tm now; int r; int nTries = 10; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.cpp index 214e33be..cb3a87d0 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.cpp @@ -48,7 +48,7 @@ MonitorObject::~MonitorObject() if( mConnection ) { - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); } @@ -72,10 +72,10 @@ char hold[214]; UdpConnection::DisconnectReasonText( mConnection->GetOtherSideDisconnectReason())); } } - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); - mConnection = NULL; + mConnection = nullptr; } } @@ -91,10 +91,10 @@ void MonitorObject::OnRoutePacket(UdpConnection * con, const uchar *data, int d simpleMessage msg(data); - if( con == NULL ) + if( con == nullptr ) { if( mbprint) - fprintf(stderr,"MONITOR API: MonitorObject.OnRoutePacket, recived a NULL connection.?\n"); + fprintf(stderr,"MONITOR API: MonitorObject.OnRoutePacket, recived a nullptr connection.?\n"); return; } @@ -120,7 +120,7 @@ void MonitorObject::OnRoutePacket(UdpConnection * con, const uchar *data, int d if( mHierarchySent == true ) { if( mMonitorData->processElementsRequest(con,mSequence,(char *)&data[6],dataLen,mlastUpdateTime )) - mlastUpdateTime = time(NULL); + mlastUpdateTime = time(nullptr); break; } // NOTE: if mHierarchy is not sent or changed, then send it. @@ -258,7 +258,7 @@ MonitorManager::MonitorManager(char *configFile, CMonitorData *_gamedata, UdpMan { mManager = manager; mbprint = _bprint; - passString = NULL; + passString = nullptr; mMonitorData = _gamedata; mObjectCount = 0; @@ -288,7 +288,7 @@ void MonitorManager::OnConnectRequest(UdpConnection *con) { if( con ) { - con->SetHandler(NULL); + con->SetHandler(nullptr); con->Disconnect(); con->Release(); } @@ -310,7 +310,7 @@ void MonitorManager::GiveTime() // check if the monitor object is no longer connected for (int i = 0; i < mObjectCount; i++) { - if( mObject[i]->mConnection == NULL || + if( mObject[i]->mConnection == nullptr || mObject[i]->mConnection->GetStatus() == UdpConnection::cStatusDisconnected ) { MonitorObject *o = mObject[i]; @@ -342,7 +342,7 @@ int x; char buffer[1024]; FILE *fp = fopen(filename,"r"); - if (fp == NULL) + if (fp == nullptr) { fprintf(stderr,"Monitor API: could not open %s file\nTHIS FILE IS REQUIRED.\n", filename); return false; @@ -364,7 +364,7 @@ char buffer[1024]; x = 0; while(!feof(fp)) { - if (fgets( buffer, 1023, fp) != NULL) { + if (fgets( buffer, 1023, fp) != nullptr) { // get rid of '\n' and '\r' for comparisons strtok(buffer,"\r\n"); @@ -402,17 +402,17 @@ CMonitorAPI::CMonitorAPI( char *configFile, unsigned short Port, bool _bprint , mbprint = _bprint; mPort = Port; - mAddress = NULL; + mAddress = nullptr; if( address ) { mAddress = (char *)malloc(strlen(address)+1); strcpy(mAddress,address); } - if( mang == NULL ) + if( mang == nullptr ) { UdpManager::Params params; - params.handler = NULL; + params.handler = nullptr; params.maxConnections = CONNECTION_MAX; params.outgoingBufferSize = 1000000; params.noDataTimeout = 130000; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.h index fa60d698..60fa8509 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorAPI.h @@ -72,13 +72,13 @@ class CMonitorAPI { public: - CMonitorAPI( char *configFile, unsigned short Port, bool _bprint = false , char * address = NULL, UdpManager * mang = NULL ); + CMonitorAPI( char *configFile, unsigned short Port, bool _bprint = false , char * address = nullptr, UdpManager * mang = nullptr ); ~CMonitorAPI(); void Update(); - void add( const char *label, int id, int ping = MON_PING_5MIN, char *des = NULL ); + void add( const char *label, int id, int ping = MON_PING_5MIN, char *des = nullptr ); void setDescription( int Id, const char *Description ) ; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp index 38614bbf..0d3c66d5 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp @@ -55,7 +55,7 @@ CMonitorData::CMonitorData() { m_sequence = 1; - m_buffer = NULL; + m_buffer = nullptr; m_nbuffer = 0; m_count = 0; m_max = ELEMENT_START_VALUE; @@ -85,7 +85,7 @@ void CMonitorData::resize_buffer(int new_size) { char *temp; - if( m_buffer != NULL ) + if( m_buffer != nullptr ) { temp = m_buffer; m_buffer = new char[ new_size]; @@ -252,7 +252,7 @@ char *p; { if( get_bit(mark,x) == 0 ) { - if( m_data[x].discription != NULL ) + if( m_data[x].discription != nullptr ) snprintf(tmp, sizeof(tmp), "%d,%s|", m_data[x].id, m_data[x].discription); else snprintf(tmp, sizeof(tmp), "%d, |", m_data[x].id); @@ -282,7 +282,7 @@ char *p; { flag = 2; - if( m_data[x].discription != NULL ) + if( m_data[x].discription != nullptr ) snprintf(tmp, sizeof(tmp), "%d,%s|", m_data[x].id, m_data[x].discription); else snprintf(tmp, sizeof(tmp), "%d, |", m_data[x].id); @@ -338,7 +338,7 @@ int x; //******* Discription ****** delete [] m_data[x].discription; - m_data[x].discription = NULL; + m_data[x].discription = nullptr; if( des ) { @@ -387,10 +387,10 @@ int x; for(x=0;x= x ) return NULL; return m_data[x].discription;} + char *getDescription(int x){ if( m_ndata >= x ) return nullptr; return m_data[x].discription;} int pingValue(int p); void set(int Id, int value); void remove(int Id); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/priority.hpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/priority.hpp index 19f34ab3..516619db 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/priority.hpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/priority.hpp @@ -37,12 +37,12 @@ template class PriorityQueue PriorityQueue(int queueSize); ~PriorityQueue(); - T* Top(); // returns NULL if queue is empty - T* TopRemove(); // returns NULL if queue is empty - T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return NULL + T* Top(); // returns nullptr if queue is empty + T* TopRemove(); // returns nullptr if queue is empty + T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return nullptr T* Add(T* entry, P priority); // reprioritizes if already in queue, returns entry always T* Remove(T* entry); // returns entry always (even if it was not in the queue) - P *GetPriority(T* entry); // returns NULL if entry is not in the queue + P *GetPriority(T* entry); // returns nullptr if entry is not in the queue int QueueUsed(); // returns how many entries are in the queue protected: struct QueueEntry @@ -88,14 +88,14 @@ template PriorityQueue::~PriorityQueue() template T* PriorityQueue::Top() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); return(mQueue[0].entry); } template T* PriorityQueue::TopRemove() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); T* top = mQueue[0].entry; Remove(top); return(top); @@ -105,14 +105,14 @@ template T* PriorityQueue::TopRemove(P priority) { if (mQueueEnd > 0 && mQueue[0].priority <= priority) return(Remove(mQueue[0].entry)); - return(NULL); + return(nullptr); } template P* PriorityQueue::GetPriority(T* entry) { if (entry->mPriorityQueuePosition >= 0) return(&mQueue[entry->mPriorityQueuePosition].priority); - return(NULL); + return(nullptr); } template T* PriorityQueue::Add(T* entry, P priority) @@ -121,7 +121,7 @@ template T* PriorityQueue::Add(T* entry, P priorit { // not in queue, so add it to the bottom if (mQueueEnd >= mQueueSize) - return(NULL); + return(nullptr); mQueue[mQueueEnd].entry = entry; mQueue[mQueueEnd].priority = priority; mQueue[mQueueEnd].entry->mPriorityQueuePosition = mQueueEnd; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp index be0a4376..07c4bcc2 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.cpp @@ -78,12 +78,12 @@ namespace soe if (pos == std::string::npos) { // tok not found take the whole thing - if (dest != NULL) { dest->assign(*base);} + if (dest != nullptr) { dest->assign(*base);} base->clear(); return; } - if (dest != NULL) {dest->assign(base->substr(0,pos));} + if (dest != nullptr) {dest->assign(base->substr(0,pos));} base->erase(0,pos + tok.length()); } diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.h index f994210c..f70facc5 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/stringutils.h @@ -21,7 +21,7 @@ namespace soe void trim(std::string& str); void crack(std::string * dest, std::string * base, const std::string& tok); void inline crack(std::string& dest, std::string& base, const std::string& tok) {crack(&dest, &base, tok);} - void inline crack(std::string& base, const std::string& tok) {crack(NULL, &base, tok);} + void inline crack(std::string& base, const std::string& tok) {crack(nullptr, &base, tok);} class lowerCaseString { diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/substringSearchTree.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/substringSearchTree.h index 9acfcea7..ebe0729d 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/substringSearchTree.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/substringSearchTree.h @@ -156,15 +156,15 @@ private: class letterNode { public: - letterNode() : mpData(NULL), mpChildren(NULL), mNumChildren(0) { } - letterNode(const letter_t & letter) : mLetter(letter), mpData(NULL), mpChildren(NULL), mNumChildren(0) { } + letterNode() : mpData(nullptr), mpChildren(nullptr), mNumChildren(0) { } + letterNode(const letter_t & letter) : mLetter(letter), mpData(nullptr), mpChildren(nullptr), mNumChildren(0) { } ~letterNode(); - inline bool hasData() const { return (mpData != NULL); } + inline bool hasData() const { return (mpData != nullptr); } inline data_t & getData() { return *mpData; } inline const data_t & getData() const { return *mpData; } inline void setData(const data_t & data) { if (mpData) { *mpData = data; } else { mpData = new data_t(data); } } - inline void removeData() { delete mpData; mpData = NULL; } + inline void removeData() { delete mpData; mpData = nullptr; } letterNode * get(letter_t index) const; bool put(letter_t index, letterNode ** tree); @@ -182,7 +182,7 @@ private: inline letter_t & letter() { return mLetter; } inline const letter_t & letter() const { return mLetter; } - inline bool hasNoChildren() const { return (mpChildren == NULL) || (mNumChildren == 0); } + inline bool hasNoChildren() const { return (mpChildren == nullptr) || (mNumChildren == 0); } private: letter_t mLetter; @@ -272,9 +272,9 @@ bool stringTree::seek(iter_t & start, const iter_t & stop, typ position.mBranch.push_back(&mRoot); } - const letterNode * pnode = (start != stop) ? position.mBranch.back() : NULL; + const letterNode * pnode = (start != stop) ? position.mBranch.back() : nullptr; - for (; (start != stop) && ((pnode = pnode->get(*start)) != NULL); start++) + for (; (start != stop) && ((pnode = pnode->get(*start)) != nullptr); start++) { position.mBranch.push_back(pnode); if (pnode->hasData()) { @@ -298,9 +298,9 @@ bool stringTree::seek(iter_t & start, const iter_t & stop, typ position.mBranch.push_back(&mRoot); } - const letterNode * pnode = (start != stop) ? position.mBranch.back() : NULL; + const letterNode * pnode = (start != stop) ? position.mBranch.back() : nullptr; - for (; (start != stop) && ((pnode = pnode->get(*start)) != NULL); start++) + for (; (start != stop) && ((pnode = pnode->get(*start)) != nullptr); start++) { position.mBranch.push_back(pnode); if (pnode->hasData()) { @@ -441,7 +441,7 @@ stringTree::letterNode::~letterNode() template typename stringTree::letterNode * stringTree::letterNode::get(letter_t index) const { - letterNode * tree = NULL; + letterNode * tree = nullptr; letterNode * end = mpChildren + mNumChildren; letterNode * place = std::lower_bound(mpChildren, mpChildren + mNumChildren, index); @@ -495,10 +495,10 @@ bool stringTree::letterNode::take(letter_t index, bool dealloc mNumChildren--; if (!mNumChildren) { deallocate = true; } - letterNode * children = NULL; + letterNode * children = nullptr; if (deallocate) { - children = mNumChildren ? new letterNode[mNumChildren] : NULL; + children = mNumChildren ? new letterNode[mNumChildren] : nullptr; } else { children = mpChildren; } @@ -536,7 +536,7 @@ void stringTree::const_iterator::getKey(string_t & key) const template typename stringTree::letterNode * stringTree::letterNode::firstChild() const { - letterNode * child = NULL; + letterNode * child = nullptr; if (mpChildren) { child = mpChildren; @@ -548,7 +548,7 @@ typename stringTree::letterNode * stringTree template typename stringTree::letterNode * stringTree::letterNode::lastChild() const { - letterNode * child = NULL; + letterNode * child = nullptr; if (mpChildren) { child = mpChildren + mNumChildren - 1; @@ -560,7 +560,7 @@ typename stringTree::letterNode * stringTree template typename stringTree::letterNode * stringTree::letterNode::nextChild(const letterNode * child) const { - letterNode * next = NULL; + letterNode * next = nullptr; if (mpChildren) { size_t index = child - mpChildren; @@ -577,7 +577,7 @@ typename stringTree::letterNode * stringTree template typename stringTree::letterNode * stringTree::letterNode::previousChild(const letterNode * child) const { - letterNode * previous = NULL; + letterNode * previous = nullptr; if (mpChildren) { size_t index = child - mpChildren; @@ -623,13 +623,13 @@ template bool stringTree::const_iterator::advance() { bool wentForward = false; - const letterNode * terminal = NULL; - const letterNode * penultimate = NULL; - const letterNode * next = NULL; + const letterNode * terminal = nullptr; + const letterNode * penultimate = nullptr; + const letterNode * next = nullptr; if (mBranch.back()->hasNoChildren()) { // go forward - while ((mBranch.size() >= 2) && (next == NULL)) + while ((mBranch.size() >= 2) && (next == nullptr)) { penultimate = mBranch[mBranch.size() - 2]; terminal = mBranch[mBranch.size() - 1]; @@ -654,9 +654,9 @@ template bool stringTree::const_iterator::retreat() { bool wentBack = false; - const letterNode * terminal = NULL; - const letterNode * penultimate = NULL; - const letterNode * next = NULL; + const letterNode * terminal = nullptr; + const letterNode * penultimate = nullptr; + const letterNode * next = nullptr; if (mBranch.size() >= 2) { // go backwards @@ -670,7 +670,7 @@ bool stringTree::const_iterator::retreat() mBranch.pop_back(); } // go to leaf - for (; next != NULL; next = next->lastChild()) + for (; next != nullptr; next = next->lastChild()) { mBranch.push_back(next); if (next->hasData() && next->hasNoChildren()) { @@ -724,9 +724,9 @@ template void stringTree::setBegin() const { mBegin.mBranch.clear(); - const letterNode * leaf = NULL; + const letterNode * leaf = nullptr; - for (leaf = &mRoot; leaf != NULL; leaf = leaf->firstChild()) + for (leaf = &mRoot; leaf != nullptr; leaf = leaf->firstChild()) { mBegin.mBranch.push_back(leaf); if (leaf->hasData()) { @@ -782,7 +782,7 @@ template template const data_t * stringTree::finder::data() const { - const data_t * pData = NULL; + const data_t * pData = nullptr; if (mDictionaryIter != mDictionary.end()) { pData = &(*mDictionaryIter); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/thread.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/thread.cpp index af797230..7115e242 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/thread.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/thread.cpp @@ -120,10 +120,10 @@ Event::Event(bool signaled) : mEvent() { #ifdef WIN32 - mEvent = CreateEvent(NULL, FALSE, signaled ? TRUE : FALSE, NULL); + mEvent = CreateEvent(nullptr, FALSE, signaled ? TRUE : FALSE, nullptr); #else - pthread_mutex_init(&mMutex, NULL); - pthread_cond_init(&mCond, NULL); + pthread_mutex_init(&mMutex, nullptr); + pthread_cond_init(&mCond, nullptr); #endif } @@ -162,7 +162,7 @@ bool Event::Wait(unsigned timeoutMilliseconds) { struct timeval now; struct timespec abs_timeout; - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); abs_timeout.tv_sec = now.tv_sec + timeoutMilliseconds/1000; abs_timeout.tv_nsec = now.tv_usec * 1000 + (timeoutMilliseconds%1000)*1000000; abs_timeout.tv_sec += abs_timeout.tv_nsec / 1000000000; @@ -198,10 +198,10 @@ EventLock::EventLock(bool locked) : mEvent() { #ifdef WIN32 - mEvent = CreateEvent(NULL, TRUE, locked ? FALSE : TRUE, NULL); + mEvent = CreateEvent(nullptr, TRUE, locked ? FALSE : TRUE, nullptr); #else - pthread_mutex_init(&mMutex, NULL); - pthread_cond_init(&mCond, NULL); + pthread_mutex_init(&mMutex, nullptr); + pthread_cond_init(&mCond, nullptr); #endif } @@ -243,7 +243,7 @@ bool EventLock::Wait(unsigned timeoutMilliseconds) { struct timeval now; struct timespec abs_timeout; - gettimeofday(&now, NULL); + gettimeofday(&now, nullptr); abs_timeout.tv_sec = now.tv_sec + timeoutMilliseconds/1000; abs_timeout.tv_nsec = now.tv_usec * 1000 + (timeoutMilliseconds%1000)*1000000; abs_timeout.tv_sec += abs_timeout.tv_nsec / 1000000000; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/utf8.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/utf8.cpp index ce6b8f16..ba5cc0d7 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/utf8.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/utf8.cpp @@ -81,7 +81,7 @@ namespace soe size_t UTF8_convertToUTF16( char * ptr , UTF16 * ret, size_t limit ) { size_t len = 0; - while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the null terminator + while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the nullptr terminator { size_t clen = UTF8_convertCharToUTF16( ptr, ret ); ptr += clen; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/IPAddress.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/IPAddress.h index f6d5f886..03b59e8d 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/IPAddress.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/IPAddress.h @@ -32,7 +32,7 @@ public: * @brief Used to retreive the the dot-notation represenatatiion of this address. * * @param buffer A pointer to the buffer to place the ip address into. - * Must be at least 17 characters long, will be null terminated. + * Must be at least 17 characters long, will be nullptr terminated. * * @return A pointer to the buffer the address was placed into. */ diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpBlockAllocator.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpBlockAllocator.cpp index 6d476d78..b7da0f27 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpBlockAllocator.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpBlockAllocator.cpp @@ -6,7 +6,7 @@ namespace NAMESPACE #endif TcpBlockAllocator::TcpBlockAllocator(const unsigned initSize, const unsigned initCount) -: m_freeHead(NULL), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) +: m_freeHead(nullptr), m_blockCount(initCount), m_blockSize(initSize), m_numAvailBlocks(0) { realloc(); } @@ -33,7 +33,7 @@ data_block *TcpBlockAllocator::getBlock() tmp = m_freeHead; m_freeHead = m_freeHead->m_next; - tmp->m_next = NULL; + tmp->m_next = nullptr; m_numAvailBlocks--; return(tmp); } @@ -56,7 +56,7 @@ void TcpBlockAllocator::returnBlock(data_block *b) void TcpBlockAllocator::realloc() { - data_block *tmp = NULL, *cursor = NULL; + data_block *tmp = nullptr, *cursor = nullptr; tmp = new data_block; m_numAvailBlocks++; cursor = tmp; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.cpp index 42329552..a41ad0df 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.cpp @@ -11,28 +11,28 @@ namespace NAMESPACE //used when want to open new connection with this socket TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, const IPAddress &destIP, unsigned short destPort, unsigned timeout) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(INVALID_SOCKET), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusNegotiating), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(timeout), m_connectTimer(), m_wasConRemovedFromMgr(false), @@ -94,28 +94,28 @@ TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAllo //used when server mode creates new connection object representing a connect request TcpConnection::TcpConnection(TcpManager *tcpManager, TcpBlockAllocator *sendAlloc, TcpManager::TcpParams ¶ms, SOCKET socket, const IPAddress &destIP, unsigned short destPort) -: m_nextConnection(NULL), - m_prevConnection(NULL), +: m_nextConnection(nullptr), + m_prevConnection(nullptr), m_socket(socket), - m_nextKeepAliveConnection(NULL), - m_prevKeepAliveConnection(NULL), + m_nextKeepAliveConnection(nullptr), + m_prevKeepAliveConnection(nullptr), m_aliveListId(tcpManager->m_aliveList.m_listID), - m_nextRecvDataConnection(NULL), - m_prevRecvDataConnection(NULL), + m_nextRecvDataConnection(nullptr), + m_prevRecvDataConnection(nullptr), m_recvDataListId(tcpManager->m_dataList.m_listID), m_manager(tcpManager), m_status(StatusConnected), - m_handler(NULL), + m_handler(nullptr), m_destIP(destIP), m_destPort(destPort), m_refCount(0), m_sendAllocator(sendAlloc), - m_head(NULL), - m_tail(NULL), + m_head(nullptr), + m_tail(nullptr), m_bytesRead(0), m_bytesNeeded(0), m_params(params), - m_recvBuff(NULL), + m_recvBuff(nullptr), m_connectTimeout(0), m_connectTimer(), m_wasConRemovedFromMgr(false) @@ -206,7 +206,7 @@ int TcpConnection::finishConnect() t.tv_sec = 0; t.tv_usec = 0; - int err = select(m_socket + 1, NULL, &wrSet, NULL, &t); + int err = select(m_socket + 1, nullptr, &wrSet, nullptr, &t); if (err == 0) { @@ -303,7 +303,7 @@ TcpConnection::~TcpConnection() { delete [] m_recvBuff; - while(m_head != NULL) + while(m_head != nullptr) { data_block *tmp = m_head; m_head = m_head->m_next; @@ -327,22 +327,22 @@ void TcpConnection::Send(const char *data, unsigned int dataLen) { m_aliveListId = m_manager->m_keepAliveList.m_listID; - if (m_prevKeepAliveConnection != NULL) + if (m_prevKeepAliveConnection != nullptr) m_prevKeepAliveConnection->m_nextKeepAliveConnection = m_nextKeepAliveConnection; - if (m_nextKeepAliveConnection != NULL) + if (m_nextKeepAliveConnection != nullptr) m_nextKeepAliveConnection->m_prevKeepAliveConnection = m_prevKeepAliveConnection; if (m_manager->m_keepAliveList.m_beginList == this) m_manager->m_keepAliveList.m_beginList = m_nextKeepAliveConnection; m_nextKeepAliveConnection = m_manager->m_aliveList.m_beginList; - m_prevKeepAliveConnection = NULL; - if (m_manager->m_aliveList.m_beginList != NULL) + m_prevKeepAliveConnection = nullptr; + if (m_manager->m_aliveList.m_beginList != nullptr) m_manager->m_aliveList.m_beginList->m_prevKeepAliveConnection = this; m_manager->m_aliveList.m_beginList = this; } - data_block *work = NULL; + data_block *work = nullptr; // this connection has no send buffer. Get a block if(!m_tail) @@ -471,16 +471,16 @@ int TcpConnection::processIncoming() { m_recvDataListId = m_manager->m_noDataList.m_listID; - if (m_prevRecvDataConnection != NULL) + if (m_prevRecvDataConnection != nullptr) m_prevRecvDataConnection->m_nextRecvDataConnection = m_nextRecvDataConnection; - if (m_nextRecvDataConnection != NULL) + if (m_nextRecvDataConnection != nullptr) m_nextRecvDataConnection->m_prevRecvDataConnection = m_prevRecvDataConnection; if (m_manager->m_noDataList.m_beginList == this) m_manager->m_noDataList.m_beginList = m_nextRecvDataConnection; m_nextRecvDataConnection = m_manager->m_dataList.m_beginList; - m_prevRecvDataConnection = NULL; - if (m_manager->m_dataList.m_beginList != NULL) + m_prevRecvDataConnection = nullptr; + if (m_manager->m_dataList.m_beginList != nullptr) m_manager->m_dataList.m_beginList->m_prevRecvDataConnection = this; m_manager->m_dataList.m_beginList = this; } @@ -626,7 +626,7 @@ int TcpConnection::processOutgoing() int sendError = 1; - // If m_head is not null, then this connection has something to send + // If m_head is not nullptr, then this connection has something to send if(m_head) diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.h index 36a41e9f..efe2d031 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpConnection.h @@ -50,7 +50,7 @@ public: * connection is disconnected, you simply need to derive your class * (multiply if necessary) from TcpConnectionHandler, then you can use * this method to set the object the TcpConnection will call as appropriate. - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for notifications. */ diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.cpp index 53105f3d..6f31e9ae 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.cpp @@ -57,14 +57,14 @@ TcpManager::TcpParams::TcpParams(const TcpParams &cpy) } TcpManager::TcpManager(const TcpParams ¶ms) -: m_handler(NULL), - m_keepAliveList(NULL, 1), - m_aliveList(NULL, 2), - m_noDataList(NULL, 1), - m_dataList(NULL, 2), +: m_handler(nullptr), + m_keepAliveList(nullptr, 1), + m_aliveList(nullptr, 2), + m_noDataList(nullptr, 1), + m_dataList(nullptr, 2), m_params(params), m_refCount(1), - m_connectionList(NULL), + m_connectionList(nullptr), m_connectionListCount(0), m_socket(INVALID_SOCKET), m_boundAsServer(false), @@ -103,7 +103,7 @@ TcpManager::~TcpManager() close(m_socket); #endif } - while (m_connectionList != NULL) + while (m_connectionList != nullptr) { TcpConnection *con = m_connectionList; con->AddRef(); @@ -179,7 +179,7 @@ bool TcpManager::BindAsServer() { struct hostent * lphp; lphp = gethostbyname(m_params.bindAddress); - if (lphp != NULL) + if (lphp != nullptr) addr_loc.sin_addr.s_addr = ((struct in_addr *)(lphp->h_addr))->s_addr; } else @@ -204,7 +204,7 @@ bool TcpManager::BindAsServer() TcpConnection *TcpManager::acceptClient() { - TcpConnection *newConn = NULL; + TcpConnection *newConn = nullptr; if (m_boundAsServer && m_connectionListCount < m_params.maxConnections) { @@ -218,7 +218,7 @@ TcpConnection *TcpManager::acceptClient() { newConn = new TcpConnection(this, &m_allocator, m_params, sock, IPAddress(addr.sin_addr.s_addr), ntohs(addr.sin_port)); addNewConnection(newConn); - if (m_handler != NULL) + if (m_handler != nullptr) { m_handler->OnConnectRequest(newConn); } @@ -243,8 +243,8 @@ SOCKET TcpManager::getMaxFD() if (m_boundAsServer) maxfd = m_socket+1; - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->GetStatus() != TcpConnection::StatusDisconnected && con->m_socket > maxfd) @@ -258,8 +258,8 @@ SOCKET TcpManager::getMaxFD() TcpConnection *TcpManager::getConnection(SOCKET fd) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { next = con->m_nextConnection; if (con->m_socket == fd) @@ -268,7 +268,7 @@ TcpConnection *TcpManager::getConnection(SOCKET fd) } } //if get here ,couldn't find it - return NULL; + return nullptr; } bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendTimePerConnection, unsigned maxRecvTimePerConnection) @@ -290,8 +290,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT { // Send output from last heartbeat - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -358,7 +358,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT tmpfds = m_permfds; timeout.tv_sec = 0; timeout.tv_usec = 0; - int cnt = select(maxfd, &tmpfds, NULL, NULL, &timeout); // blocks for timeout + int cnt = select(maxfd, &tmpfds, nullptr, nullptr, &timeout); // blocks for timeout if (cnt > 0) @@ -384,8 +384,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //process incoming client messages if (maxRecvTimePerConnection != 0) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -450,8 +450,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT pollfds[0].events |= POLLIN; } - TcpConnection *next = NULL; - for (TcpConnection *con = m_connectionList ; con != NULL ; con = next, idx++) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_connectionList ; con != nullptr ; con = next, idx++) { next = con->m_nextConnection; pollfds[idx].fd = con->m_socket; @@ -491,7 +491,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT } //process regular msg(s) - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -523,7 +523,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT }//if(pollfds[... else if (pollfds[idx].revents & POLLHUP) { - if (con == NULL) + if (con == nullptr) { close(pollfds[idx].fd); continue; @@ -541,21 +541,21 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any keepalives, if time to do that if (m_params.keepAliveDelay > 0 && m_keepAliveTimer.isDone(m_params.keepAliveDelay)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_keepAliveList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_keepAliveList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); next = con->m_nextKeepAliveConnection; if (next) next->AddRef(); - con->Send(NULL, 0); //note: this request will move the connection from the keepAliveList to the aliveList + con->Send(nullptr, 0); //note: this request will move the connection from the keepAliveList to the aliveList con->Release(); } //now move the complete alive list over to the keepalive list to reset those timers m_keepAliveList.m_beginList = m_aliveList.m_beginList; - m_aliveList.m_beginList = NULL; + m_aliveList.m_beginList = nullptr; //switch id's for those connections that were in the alive list last go - around int tmpID = m_aliveList.m_listID; @@ -569,8 +569,8 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now process any noDataCons, if time to do that if (m_params.noDataTimeout > 0 && m_noDataTimer.isDone(m_params.noDataTimeout)) { - TcpConnection *next = NULL; - for (TcpConnection *con = m_noDataList.m_beginList ; con != NULL ; con = next) + TcpConnection *next = nullptr; + for (TcpConnection *con = m_noDataList.m_beginList ; con != nullptr ; con = next) { con->AddRef(); if (next) next->Release(); @@ -584,7 +584,7 @@ bool TcpManager::GiveTime(unsigned maxTimeAcceptingConnections,unsigned maxSendT //now move the complete data list over to the nodata list to reset those timers m_noDataList.m_beginList = m_dataList.m_beginList; - m_dataList.m_beginList = NULL; + m_dataList.m_beginList = nullptr; //switch id's for those connections that were in the data list last go - around int tmpID = m_dataList.m_listID; @@ -606,17 +606,17 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { //can't open outgoing connections when in server mode // use a different TcpManager to do that - return NULL; + return nullptr; } if (m_connectionListCount >= m_params.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); if (address == INADDR_NONE) { - if (m_dnsMap[serverAddress].timeout >= time(NULL)) + if (m_dnsMap[serverAddress].timeout >= time(nullptr)) { address = m_dnsMap[serverAddress].addr; } @@ -624,12 +624,12 @@ TcpConnection *TcpManager::EstablishConnection(const char *serverAddress, unsign { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; m_dnsMap[serverAddress].addr = address; - m_dnsMap[serverAddress].timeout = time(NULL)+DNS_TIMEOUT; + m_dnsMap[serverAddress].timeout = time(nullptr)+DNS_TIMEOUT; } } IPAddress destIP(address); @@ -649,22 +649,22 @@ void TcpManager::addNewConnection(TcpConnection *con) FD_SET(con->m_socket, &m_permfds); #endif con->m_nextConnection = m_connectionList; - con->m_prevConnection = NULL; - if (m_connectionList != NULL) + con->m_prevConnection = nullptr; + if (m_connectionList != nullptr) m_connectionList->m_prevConnection = con; m_connectionList = con; m_connectionListCount++; con->m_nextKeepAliveConnection = m_aliveList.m_beginList; - con->m_prevKeepAliveConnection = NULL; - if (m_aliveList.m_beginList != NULL) + con->m_prevKeepAliveConnection = nullptr; + if (m_aliveList.m_beginList != nullptr) m_aliveList.m_beginList->m_prevKeepAliveConnection = con; m_aliveList.m_beginList = con; con->m_aliveListId = m_keepAliveList.m_listID;//start it out thinking it's already in the alive list, since it is con->m_nextRecvDataConnection = m_dataList.m_beginList; - con->m_prevRecvDataConnection = NULL; - if (m_dataList.m_beginList != NULL) + con->m_prevRecvDataConnection = nullptr; + if (m_dataList.m_beginList != nullptr) m_dataList.m_beginList->m_prevRecvDataConnection = con; m_dataList.m_beginList = con; con->m_recvDataListId = m_noDataList.m_listID;//start it out thinking it's already in the data list, since it is @@ -682,40 +682,40 @@ void TcpManager::removeConnection(TcpConnection *con) FD_CLR(con->m_socket, &m_permfds); } #endif - if (con->m_prevConnection != NULL) + if (con->m_prevConnection != nullptr) con->m_prevConnection->m_nextConnection = con->m_nextConnection; - if (con->m_nextConnection != NULL) + if (con->m_nextConnection != nullptr) con->m_nextConnection->m_prevConnection = con->m_prevConnection; if (m_connectionList == con) m_connectionList = con->m_nextConnection; - con->m_nextConnection = NULL; - con->m_prevConnection = NULL; + con->m_nextConnection = nullptr; + con->m_prevConnection = nullptr; - if (con->m_prevKeepAliveConnection != NULL) + if (con->m_prevKeepAliveConnection != nullptr) con->m_prevKeepAliveConnection->m_nextKeepAliveConnection = con->m_nextKeepAliveConnection; - if (con->m_nextKeepAliveConnection != NULL) + if (con->m_nextKeepAliveConnection != nullptr) con->m_nextKeepAliveConnection->m_prevKeepAliveConnection = con->m_prevKeepAliveConnection; if (m_aliveList.m_beginList == con) m_aliveList.m_beginList = con->m_nextKeepAliveConnection; else if (m_keepAliveList.m_beginList == con) m_keepAliveList.m_beginList = con->m_nextKeepAliveConnection; - con->m_nextKeepAliveConnection = NULL; - con->m_prevKeepAliveConnection = NULL; + con->m_nextKeepAliveConnection = nullptr; + con->m_prevKeepAliveConnection = nullptr; - if (con->m_prevRecvDataConnection != NULL) + if (con->m_prevRecvDataConnection != nullptr) con->m_prevRecvDataConnection->m_nextRecvDataConnection = con->m_nextRecvDataConnection; - if (con->m_nextRecvDataConnection != NULL) + if (con->m_nextRecvDataConnection != nullptr) con->m_nextRecvDataConnection->m_prevRecvDataConnection = con->m_prevRecvDataConnection; if (m_dataList.m_beginList == con) m_dataList.m_beginList = con->m_nextRecvDataConnection; else if (m_noDataList.m_beginList == con) m_noDataList.m_beginList = con->m_nextRecvDataConnection; - con->m_nextRecvDataConnection = NULL; - con->m_prevRecvDataConnection = NULL; + con->m_nextRecvDataConnection = nullptr; + con->m_prevRecvDataConnection = nullptr; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.h index b2192dff..e9b9e176 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/TcpLibrary/TcpManager.h @@ -168,7 +168,7 @@ public: * simply need to derive your class (multiply if necessary) from TcpManagerHandler, then you can use * this method to set the object the TcpManager will call as appropriate. The TcpConnection object * also has a handler mechanism that replaces the other callback functions below, see TcpConnection::SetHandler - * default = NULL (no callbacks made) + * default = nullptr (no callbacks made) * * @param handler The object which will be called for manager related notifications. */ @@ -223,7 +223,7 @@ public: * the connect-complete callback to be called if the connection is succesfull. * * @return A pointer to a TcpConnection object. - * NULL if the manager object has exceeded its maximum number of connections + * nullptr if the manager object has exceeded its maximum number of connections * or if the serverAddress cannot be resolved to an IP address. */ TcpConnection *EstablishConnection(const char *serverAddress, unsigned short serverPort, unsigned timeout = 0); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.cpp index f8221166..f86f5d7b 100755 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.cpp @@ -150,7 +150,7 @@ UdpIpAddress::UdpIpAddress(unsigned int ip) char *UdpIpAddress::GetAddress(char *buffer) const { - assert(buffer != NULL); + assert(buffer != nullptr); struct sockaddr_in addr_serverUDP; addr_serverUDP.sin_addr.s_addr = mIp; @@ -163,7 +163,7 @@ char *UdpIpAddress::GetAddress(char *buffer) const ///////////////////////////////////////////////////////////////////////////////////////////////////// UdpManager::Params::Params() { - handler = NULL; + handler = nullptr; outgoingBufferSize = 64 * 1024; incomingBufferSize = 64 * 1024; packetHistoryMax = 100; @@ -265,7 +265,7 @@ UdpManager::UdpManager(const UdpManager::Params *params) mParams.maxDataHoldSize = udpMin(mParams.maxDataHoldSize, mParams.maxRawPacketSize); mParams.packetHistoryMax = udpMax(1, mParams.packetHistoryMax); mPacketHistoryPosition = 0; - mPassThroughData = NULL; + mPassThroughData = nullptr; typedef PacketHistoryEntry *PacketHistoryEntryPtr; mPacketHistory = new PacketHistoryEntryPtr[mParams.packetHistoryMax]; @@ -286,17 +286,17 @@ UdpManager::UdpManager(const UdpManager::Params *params) mUdpSocket = INVALID_SOCKET; mConnectionListCount = 0; - mConnectionList = NULL; + mConnectionList = nullptr; mPoolCreated = 0; mPoolAvailable = 0; - mPoolAvailableRoot = NULL; - mPoolCreatedRoot = NULL; + mPoolAvailableRoot = nullptr; + mPoolCreatedRoot = nullptr; mWrappedCreated = 0; mWrappedAvailable = 0; - mWrappedAvailableRoot = NULL; - mWrappedCreatedRoot = NULL; + mWrappedAvailableRoot = nullptr; + mWrappedCreatedRoot = nullptr; for (i = 0; i < mParams.pooledPacketInitial && i < mParams.pooledPacketMax; i++) { @@ -306,16 +306,16 @@ UdpManager::UdpManager(const UdpManager::Params *params) lp->Release(); } - mSimulateQueueStart = NULL; - mSimulateQueueEnd = NULL; + mSimulateQueueStart = nullptr; + mSimulateQueueEnd = nullptr; mSimulateNextOutgoingTime = 0; mSimulateNextIncomingTime = 0; mSimulateQueueBytes = 0; - mDisconnectPendingList = NULL; + mDisconnectPendingList = nullptr; if (mParams.avoidPriorityQueue) - mPriorityQueue = NULL; + mPriorityQueue = nullptr; else mPriorityQueue = new PriorityQueue(mParams.maxConnections); @@ -346,14 +346,14 @@ UdpManager::~UdpManager() // first we need to tell all the pooled packets we have created that they can no longer check themselves back into use // when they are released PooledLogicalPacket *walk = mPoolCreatedRoot; - while (walk != NULL) + while (walk != nullptr) { - walk->mUdpManager = NULL; + walk->mUdpManager = nullptr; walk = walk->mCreatedNext; } // next release the ones we have in our available pool walk = mPoolAvailableRoot; - while (walk != NULL) + while (walk != nullptr) { PooledLogicalPacket *hold = walk; walk = walk->mAvailableNext; @@ -366,14 +366,14 @@ UdpManager::~UdpManager() // next we need to tell all the warpped packets we have created that they can no longer check themselves back into use // when they are released WrappedLogicalPacket *walk = mWrappedCreatedRoot; - while (walk != NULL) + while (walk != nullptr) { - walk->mUdpManager = NULL; + walk->mUdpManager = nullptr; walk = walk->mCreatedNext; } // next release the ones we have in our available pool walk = mWrappedAvailableRoot; - while (walk != NULL) + while (walk != nullptr) { WrappedLogicalPacket *hold = walk; walk = walk->mAvailableNext; @@ -383,7 +383,7 @@ UdpManager::~UdpManager() // next thing we must do is tell all the connections to disconnect (which severs their link to this dying manager) // this has to be done first since they will call back into us and have themselves removed from our connection-list/priority-queue/etc - while (mConnectionList != NULL) + while (mConnectionList != nullptr) { mConnectionList->InternalDisconnect(0, UdpConnection::cDisconnectReasonManagerDeleted); // the above call ended up calling us back and removing them from our connection list, so now mConnectionList is pointing to the next entry @@ -391,7 +391,7 @@ UdpManager::~UdpManager() } // release any objects that were pending disconnection - while (mDisconnectPendingList != NULL) + while (mDisconnectPendingList != nullptr) { UdpConnection *next = mDisconnectPendingList->mDisconnectPendingNextConnection; mDisconnectPendingList->Release(); @@ -416,7 +416,7 @@ UdpManager::~UdpManager() } delete[] mPacketHistory; - while (mSimulateQueueStart != NULL) + while (mSimulateQueueStart != nullptr) { SimulateQueueEntry *entry = mSimulateQueueStart; mSimulateQueueStart = entry->mNext; @@ -529,12 +529,12 @@ void UdpManager::ProcessDisconnectPending() { UdpConnection *entry = mDisconnectPendingList; UdpConnection **prev = &mDisconnectPendingList; - while (entry != NULL) + while (entry != nullptr) { if (entry->GetStatus() == UdpConnection::cStatusDisconnected) { *prev = entry->mDisconnectPendingNextConnection; - entry->mDisconnectPendingNextConnection = NULL; + entry->mDisconnectPendingNextConnection = nullptr; entry->Release(); entry = *prev; } @@ -548,19 +548,19 @@ void UdpManager::ProcessDisconnectPending() void UdpManager::RemoveConnection(UdpConnection *con) { - assert(con != NULL); // attemped to remove a NULL connection object + assert(con != nullptr); // attemped to remove a nullptr connection object // note: it's a bug to Remove a connection object that is already removed...should never be able to happen. mConnectionListCount--; - if (con->mPrevConnection != NULL) + if (con->mPrevConnection != nullptr) con->mPrevConnection->mNextConnection = con->mNextConnection; - if (con->mNextConnection != NULL) + if (con->mNextConnection != nullptr) con->mNextConnection->mPrevConnection = con->mPrevConnection; if (mConnectionList == con) mConnectionList = con->mNextConnection; - con->mNextConnection = NULL; - con->mPrevConnection = NULL; - if (mPriorityQueue != NULL) + con->mNextConnection = nullptr; + con->mPrevConnection = nullptr; + if (mPriorityQueue != nullptr) mPriorityQueue->Remove(con); mAddressHashTable->Remove(con, AddressHashValue(con->mIp, con->mPort)); @@ -569,11 +569,11 @@ void UdpManager::RemoveConnection(UdpConnection *con) void UdpManager::AddConnection(UdpConnection *con) { - assert(con != NULL); // attemped to add a NULL connection object + assert(con != nullptr); // attemped to add a nullptr connection object con->mNextConnection = mConnectionList; - con->mPrevConnection = NULL; - if (mConnectionList != NULL) + con->mPrevConnection = nullptr; + if (mConnectionList != nullptr) mConnectionList->mPrevConnection = con; mConnectionList = con; mConnectionListCount++; @@ -586,7 +586,7 @@ void UdpManager::FlushAllMultiBuffer() { AddRef(); UdpConnection *cur = mConnectionList; - while (cur != NULL) + while (cur != nullptr) { cur->FlushMultiBuffer(); cur = cur->mNextConnection; @@ -609,7 +609,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) { PacketHistoryEntry *e = ActualReceive(); - if (e == NULL) + if (e == nullptr) { mLastEmptySocketBufferStamp = UdpMisc::Clock(); break; @@ -637,7 +637,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) if (giveConnectionsTime) { - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) { // give time to everybody in the priority-queue that needs it UdpMisc::ClockStamp curPriority = UdpMisc::Clock(); @@ -655,7 +655,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) for (;;) { UdpConnection *top = mPriorityQueue->TopRemove(curPriority); - if (top == NULL) + if (top == nullptr) break; top->AddRef(); top->GiveTime(); @@ -668,7 +668,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) { // give time to everybody UdpConnection *cur = mConnectionList; - while (cur != NULL) + while (cur != nullptr) { cur->GiveTime(); cur = cur->mNextConnection; @@ -678,7 +678,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) ProcessDisconnectPending(); } - if (mSimulateQueueStart != NULL && UdpMisc::Clock() >= mSimulateNextOutgoingTime) + if (mSimulateQueueStart != nullptr && UdpMisc::Clock() >= mSimulateNextOutgoingTime) { SimulateQueueEntry *entry = mSimulateQueueStart; mSimulateQueueStart = mSimulateQueueStart->mNext; @@ -686,7 +686,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) ActualSendHelper(entry->mData, entry->mDataLen, entry->mIp, entry->mPort); UdpConnection *con = AddressGetConnection(entry->mIp, entry->mPort); - if (con != NULL) + if (con != nullptr) con->mSimulateQueueBytes -= entry->mDataLen; mSimulateQueueBytes -= entry->mDataLen; delete entry; @@ -699,11 +699,11 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int serverPort, int timeout) { assert(serverPort != 0); // can't connect to no port - assert(serverAddress != NULL); + assert(serverAddress != nullptr); assert(serverAddress[0] != 0); if (mConnectionListCount >= mParams.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); @@ -711,16 +711,16 @@ UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int se { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; } UdpIpAddress destIp(address); // first, see if we already have a connection object managing this ip/port, if we do, then fail UdpConnection *con = AddressGetConnection(destIp, serverPort); - if (con != NULL) - return(NULL); + if (con != nullptr) + return(nullptr); return(new UdpConnection(this, destIp, serverPort, timeout)); } @@ -733,7 +733,7 @@ void UdpManager::KeepUntilDisconnected(UdpConnection *con) void UdpManager::GetStats(UdpManagerStatistics *stats) const { - assert(stats != NULL); + assert(stats != nullptr); *stats = mManagerStats; stats->poolAvailable = mPoolAvailable; stats->poolCreated = mPoolCreated; @@ -748,10 +748,10 @@ void UdpManager::ResetStats() void UdpManager::DumpPacketHistory(const char *filename) const { - assert(filename != NULL); + assert(filename != nullptr); assert(filename[0] != 0); FILE *file = fopen(filename, "wt"); - if (file != NULL) + if (file != nullptr) { // dump history of packets... for (int i = 0; i < mParams.packetHistoryMax; i++) @@ -797,7 +797,7 @@ int UdpManager::GetLocalPort() const UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() { if (mParams.simulateIncomingByteRate > 0 && UdpMisc::Clock() < mSimulateNextIncomingTime) - return(NULL); + return(nullptr); struct sockaddr_in addr_from; socklen_t sf = sizeof(addr_from); @@ -807,7 +807,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() if (res != SOCKET_ERROR) { if (mParams.simulateIncomingLossPercent > 0 && ((rand() % 100) < mParams.simulateIncomingLossPercent)) - return(NULL); // packet, what packet? + return(nullptr); // packet, what packet? if (mParams.simulateIncomingByteRate > 0) mSimulateNextIncomingTime = UdpMisc::Clock() + (res * 1000 / mParams.simulateIncomingByteRate); @@ -832,7 +832,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() UdpIpAddress ip = UdpIpAddress(addr_from.sin_addr.s_addr); int port = (int)ntohs(addr_from.sin_port); UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { con->AddRef(); con->PortUnreachable(); @@ -852,7 +852,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() } #endif } - return(NULL); + return(nullptr); } void UdpManager::ProcessIcmpErrors() @@ -880,7 +880,7 @@ void UdpManager::ProcessIcmpErrors() struct cmsghdr * cmsg; if(CMSG_FIRSTHDR(&msgh)) { - for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) + for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msgh, cmsg)) { if(cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR) { @@ -894,7 +894,7 @@ void UdpManager::ProcessIcmpErrors() UdpIpAddress ip = UdpIpAddress(msg_name.sin_addr.s_addr); int port = (int)htons(msg_name.sin_port); UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { con->AddRef(); con->PortUnreachable(); @@ -923,7 +923,7 @@ void UdpManager::ActualSend(const uchar *data, int dataLen, UdpIpAddress ip, int { // simulating outgoing byte-rate, so queue it up for sending later UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { if (mParams.simulateDestinationOverloadLevel > 0 && con->mSimulateQueueBytes + dataLen > mParams.simulateDestinationOverloadLevel) return; // no room, packet gets lost @@ -931,17 +931,17 @@ void UdpManager::ActualSend(const uchar *data, int dataLen, UdpIpAddress ip, int if (mParams.simulateOutgoingOverloadLevel > 0 && mSimulateQueueBytes + dataLen > mParams.simulateOutgoingOverloadLevel) return; // no room, packet gets lost - if (con != NULL) + if (con != nullptr) con->mSimulateQueueBytes += dataLen; mSimulateQueueBytes += dataLen; SimulateQueueEntry *entry = new SimulateQueueEntry(data, dataLen, ip, port); - if (mSimulateQueueStart != NULL) + if (mSimulateQueueStart != nullptr) mSimulateQueueEnd->mNext = entry; else mSimulateQueueStart = entry; mSimulateQueueEnd = entry; - mSimulateQueueEnd->mNext = NULL; + mSimulateQueueEnd->mNext = nullptr; return; } ActualSendHelper(data, dataLen, ip, port); @@ -964,7 +964,7 @@ void UdpManager::ActualSendHelper(const uchar *data, int dataLen, UdpIpAddress i // flag connection to terminate itself for port-unreachable error on next give time // we need to flag it instead of actually terminating it to prevent callbacks from occuring during application sends UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) con->FlagPortUnreachable(); return; } @@ -1002,7 +1002,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) UdpConnection *con = AddressGetConnection(e->mIp, e->mPort); - if (con == NULL) + if (con == nullptr) { // packet coming from an unknown ip/port // if it is a connection request packet, then establish a new connection object to reply to it @@ -1012,7 +1012,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) if (mConnectionListCount >= mParams.maxConnections) return; // can't handle any more connections, so ignore this request entirely - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { UdpConnection *newcon = new UdpConnection(this, e); mParams.handler->OnConnectRequest(newcon); @@ -1040,7 +1040,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) int encryptCode = UdpMisc::GetValue32(ptr); UdpConnection *con = ConnectCodeGetConnection(connectCode); - if (con != NULL) + if (con != nullptr) { if (mParams.allowAddressRemapping || con->mIp == e->mIp) { @@ -1090,25 +1090,25 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) UdpConnection *UdpManager::AddressGetConnection(UdpIpAddress ip, int port) const { UdpConnection *found = static_cast(mAddressHashTable->FindFirst(AddressHashValue(ip, port))); - while (found != NULL) + while (found != nullptr) { if (found->mIp == ip && found->mPort == port) return(found); found = static_cast(mAddressHashTable->FindNext(found)); } - return(NULL); + return(nullptr); } UdpConnection *UdpManager::ConnectCodeGetConnection(int connectCode) const { UdpConnection *found = static_cast(mConnectCodeHashTable->FindFirst(connectCode)); - while (found != NULL) + while (found != nullptr) { if (found->mConnectCode == connectCode) return(found); found = static_cast(mConnectCodeHashTable->FindNext(found)); } - return(NULL); + return(nullptr); } WrappedLogicalPacket *UdpManager::WrappedBorrow(const LogicalPacket *lp) @@ -1132,7 +1132,7 @@ WrappedLogicalPacket *UdpManager::WrappedBorrow(const LogicalPacket *lp) void UdpManager::WrappedCreated(WrappedLogicalPacket *wp) { wp->mCreatedNext = mWrappedCreatedRoot; - if (mWrappedCreatedRoot != NULL) + if (mWrappedCreatedRoot != nullptr) mWrappedCreatedRoot->mCreatedPrev = wp; mWrappedCreatedRoot = wp; mWrappedCreated++; @@ -1140,11 +1140,11 @@ void UdpManager::WrappedCreated(WrappedLogicalPacket *wp) void UdpManager::WrappedDestroyed(WrappedLogicalPacket *wp) { - if (wp->mCreatedNext != NULL) + if (wp->mCreatedNext != nullptr) { wp->mCreatedNext->mCreatedPrev = wp->mCreatedPrev; } - if (wp->mCreatedPrev != NULL) + if (wp->mCreatedPrev != nullptr) { wp->mCreatedPrev->mCreatedNext = wp->mCreatedNext; } @@ -1154,9 +1154,9 @@ void UdpManager::WrappedDestroyed(WrappedLogicalPacket *wp) mWrappedCreatedRoot = wp->mCreatedNext; } - wp->mCreatedPrev = NULL; - wp->mCreatedNext = NULL; - wp->mUdpManager = NULL; + wp->mCreatedPrev = nullptr; + wp->mCreatedNext = nullptr; + wp->mUdpManager = nullptr; mWrappedCreated--; } @@ -1191,7 +1191,7 @@ LogicalPacket *UdpManager::CreatePacket(const void *data, int dataLen, const voi void UdpManager::PoolCreated(PooledLogicalPacket *packet) { packet->mCreatedNext = mPoolCreatedRoot; - if (mPoolCreatedRoot != NULL) + if (mPoolCreatedRoot != nullptr) mPoolCreatedRoot->mCreatedPrev = packet; mPoolCreatedRoot = packet; mPoolCreated++; @@ -1199,11 +1199,11 @@ void UdpManager::PoolCreated(PooledLogicalPacket *packet) void UdpManager::PoolDestroyed(PooledLogicalPacket *packet) { - if (packet->mCreatedNext != NULL) + if (packet->mCreatedNext != nullptr) { packet->mCreatedNext->mCreatedPrev = packet->mCreatedPrev; } - if (packet->mCreatedPrev != NULL) + if (packet->mCreatedPrev != nullptr) { packet->mCreatedPrev->mCreatedNext = packet->mCreatedNext; } @@ -1213,9 +1213,9 @@ void UdpManager::PoolDestroyed(PooledLogicalPacket *packet) mPoolCreatedRoot = packet->mCreatedNext; } - packet->mCreatedPrev = NULL; - packet->mCreatedNext = NULL; - packet->mUdpManager = NULL; + packet->mCreatedPrev = nullptr; + packet->mCreatedNext = nullptr; + packet->mUdpManager = nullptr; mPoolCreated--; } @@ -1290,7 +1290,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mLastClockSyncTime = 0; mDataHoldTime = 0; mGettingTime = false; - mHandler = NULL; + mHandler = nullptr; mOtherSideProtocolVersion = 0; mNoDataTimeout = mUdpManager->mParams.noDataTimeout; @@ -1299,13 +1299,13 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mMultiBufferData = new uchar[mUdpManager->mParams.maxRawPacketSize]; mMultiBufferPtr = mMultiBufferData; - mDisconnectPendingNextConnection = NULL; - mNextConnection = NULL; - mPrevConnection = NULL; + mDisconnectPendingNextConnection = nullptr; + mNextConnection = nullptr; + mPrevConnection = nullptr; mIcmpErrorRetryStartStamp = 0; // when the timer started for ICMP error retry delay (gets reset on a successful packet receive) mPortRemapRequestStartStamp = 0; - mEncryptXorBuffer = NULL; + mEncryptXorBuffer = nullptr; mEncryptExpansionBytes = 0; mOrderedCountOutgoing = 0; mOrderedCountOutgoing2 = 0; @@ -1316,7 +1316,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mConnectionCreateTime = UdpMisc::Clock(); mSimulateQueueBytes = 0; - mPassThroughData = NULL; + mPassThroughData = nullptr; mSilentDisconnect = false; mLastSendBin = 0; @@ -1334,7 +1334,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo UdpConnection::~UdpConnection() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) InternalDisconnect(0, cDisconnectReasonApplicationReleased); for (int i = 0; i < UdpManager::cReliableChannelCount; i++) @@ -1385,7 +1385,7 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason if (mStatus == cStatusNegotiating) flushTimeout = 0; - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { if (flushTimeout > 0) { @@ -1415,13 +1415,13 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason } mUdpManager->RemoveConnection(this); - mUdpManager = NULL; + mUdpManager = nullptr; } mStatus = cStatusDisconnected; - if (startStatus != cStatusDisconnected && startUdpManager != NULL) + if (startStatus != cStatusDisconnected && startUdpManager != nullptr) { - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnTerminated(this); } } @@ -1455,7 +1455,7 @@ bool UdpConnection::Send(UdpChannel channel, const void *data, int dataLen) if (dataLen == 0) // zero length packets are ignored return(false); - assert(data != NULL); // can't send a null packet + assert(data != nullptr); // can't send a nullptr packet mUdpManager->mManagerStats.applicationPacketsSent++; mConnectionStats.applicationPacketsSent++; @@ -1472,7 +1472,7 @@ bool UdpConnection::Send(UdpChannel channel, const void *data, int dataLen) bool UdpConnection::Send(UdpChannel channel, const LogicalPacket *packet) { - assert(packet != NULL); // can't send a null packet + assert(packet != nullptr); // can't send a nullptr packet assert(channel >= 0 && channel < cUdpChannelCount); assert(mStatus != cStatusNegotiating); // you are not allowed to start sending data on a connection that is still in the process of negotiating (only applicable client-side obviously since servers never have connections in this state) @@ -1518,7 +1518,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data { uchar *bufPtr = tempBuffer; memcpy(bufPtr, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen, true); return(true); @@ -1531,9 +1531,9 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data bufPtr[1] = cUdpPacketOrdered2; UdpMisc::PutValue16(bufPtr + 2, (ushort)(++mOrderedCountOutgoing2 & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); - BufferedSend(bufPtr, totalDataLen + 4, NULL, 0, true); + BufferedSend(bufPtr, totalDataLen + 4, nullptr, 0, true); return(true); break; } @@ -1544,7 +1544,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data bufPtr[1] = cUdpPacketOrdered2; UdpMisc::PutValue16(bufPtr + 2, (ushort)(++mOrderedCountOutgoing2 & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen + 4, true); return(true); @@ -1556,7 +1556,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data case cUdpChannelReliable4: { int num = channel - cUdpChannelReliable1; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->Send(data, dataLen, data2, dataLen2); return(true); @@ -1578,7 +1578,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const LogicalPacket *packet case cUdpChannelReliable4: { int num = channel - cUdpChannelReliable1; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->Send(packet); return(true); @@ -1618,9 +1618,9 @@ void UdpConnection::PingStatReset() void UdpConnection::GetStats(UdpConnectionStatistics *cs) const { - assert(cs != NULL); + assert(cs != nullptr); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; *cs = mConnectionStats; @@ -1636,13 +1636,13 @@ void UdpConnection::GetStats(UdpConnectionStatistics *cs) const if (cs->syncTheirSent > 0) cs->percentReceivedSuccess = (float)cs->syncOurReceived / (float)cs->syncTheirSent; cs->reliableAveragePing = 0; - if (mChannel[0] != NULL) + if (mChannel[0] != nullptr) cs->reliableAveragePing = mChannel[0]->GetAveragePing(); } void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (e->mBuffer[0] != 0 || e->mBuffer[1] != cUdpPacketUnreachableConnection) @@ -1744,7 +1744,7 @@ void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) { mConnectionStats.crcRejectedPackets++; mUdpManager->mManagerStats.crcRejectedPackets++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnCrcReject(this, e->mBuffer, e->mLen); return; } @@ -1771,7 +1771,7 @@ void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) *decryptPtr++ = finalStart[1]; int len = (this->*(mDecryptFunction[j]))(decryptPtr, finalStart + 2, finalLen - 2); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (len == -1) @@ -1808,7 +1808,7 @@ void UdpConnection::CallbackRoutePacket(const uchar *data, int dataLen) mUdpManager->mManagerStats.applicationPacketsReceived++; mConnectionStats.applicationPacketsReceived++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnRoutePacket(this, data, dataLen); } } @@ -1819,7 +1819,7 @@ void UdpConnection::CallbackCorruptPacket(const uchar *data, int dataLen, UdpCor { mConnectionStats.corruptPacketErrors++; mUdpManager->mManagerStats.corruptPacketErrors++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnPacketCorrupt(this, data, dataLen, reason); } } @@ -1828,7 +1828,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) { uchar buf[256]; uchar *bufPtr; - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (data[0] == 0 && dataLen > 1) @@ -1912,7 +1912,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) mOtherSideProtocolVersion = otherSideProtocolVersion; SetupEncryptModel(); mStatus = cStatusConnected; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnConnectComplete(this); } break; @@ -2028,7 +2028,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) // (while processing this packet) ended up touching the packet-data and corrupting the next // packet in the multi-sequence. CallbackCorruptPacket(data, dataLen, cUdpCorruptionMultiPacket); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; } else @@ -2144,7 +2144,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketFragment4: { int num = (data[1] - cUdpPacketReliable1) % UdpManager::cReliableChannelCount; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->ReliablePacket(data, dataLen); break; @@ -2155,7 +2155,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketAck4: { int num = data[1] - cUdpPacketAck1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckPacket(data, dataLen); break; } @@ -2165,7 +2165,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketAckAll4: { int num = data[1] - cUdpPacketAckAll1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckAllPacket(data, dataLen); break; } @@ -2205,7 +2205,7 @@ void UdpConnection::FlagPortUnreachable() void UdpConnection::GiveTime() { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; UdpManager *myManager = mUdpManager; @@ -2298,11 +2298,11 @@ void UdpConnection::InternalGiveTime() int totalPendingBytes = 0; for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { totalPendingBytes += mChannel[i]->TotalPendingBytes(); int myNext = mChannel[i]->GiveTime(); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // giving the reliable channel time caused it to callback the application which may disconnect us nextSchedule = udpMin(nextSchedule, myNext); } @@ -2391,7 +2391,7 @@ void UdpConnection::InternalGiveTime() break; } - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { // safety to prevent us for scheduling ourselves for a time period that has already passed, // as doing so could result in infinite looping in the priority queue processing. @@ -2408,7 +2408,7 @@ int UdpConnection::TotalPendingBytes() const int total = 0; for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) total += mChannel[i]->TotalPendingBytes(); } return(total); @@ -2474,7 +2474,7 @@ int UdpConnection::ExpireReceiveBin() void UdpConnection::PhysicalSend(const uchar *data, int dataLen, bool appendAllowed) { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // if we attempt to do a physical send (ie. encrypt/compress/crc a packet) while we are not connected @@ -2503,7 +2503,7 @@ void UdpConnection::PhysicalSend(const uchar *data, int dataLen, bool appendAllo // we know this internal packet will not be a connect or confirm packet since they are sent directly to RawSend to avoid getting encrypted *destPtr++ = finalStart[1]; int len = (this->*(mEncryptFunction[j]))(destPtr, finalStart + 2, finalLen - 2); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // if this assert triggers, it means the encryption pass expanded the size of the encrypted @@ -2574,8 +2574,8 @@ void UdpConnection::PhysicalSend(const uchar *data, int dataLen, bool appendAllo // function can do its job uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar *data2, int dataLen2, bool appendAllowed) { - if (mUdpManager == NULL) - return(NULL); + if (mUdpManager == nullptr) + return(nullptr); int used = mMultiBufferPtr - mMultiBufferData; int actualMaxDataHoldSize = udpMin(mUdpManager->mParams.maxDataHoldSize, mConnectionConfig.maxRawPacketSize); @@ -2590,7 +2590,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * FlushMultiBuffer(); // now send it (the multi-buffer is empty if you need to use it temporarily to concatenate two data chunks -- it is large enough to hold the largest raw packet) - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferData, data, dataLen); memcpy(mMultiBufferData + dataLen, data2, dataLen2); @@ -2598,7 +2598,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * } else PhysicalSend(data, dataLen, appendAllowed); - return(NULL); + return(nullptr); } // if this data will not fit into buffer @@ -2626,7 +2626,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * uchar *placementPtr = mMultiBufferPtr; memcpy(mMultiBufferPtr, data, dataLen); mMultiBufferPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferPtr, data2, dataLen2); mMultiBufferPtr += dataLen2; @@ -2635,21 +2635,21 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * if ((mMultiBufferPtr - mMultiBufferData) >= actualMaxDataHoldSize) { FlushMultiBuffer(); - placementPtr = NULL; // it got flushed + placementPtr = nullptr; // it got flushed } return(placementPtr); } uchar *UdpConnection::InternalAckSend(uchar *bufferedAckPtr, const uchar *ackPtr, int ackLen) { - if (bufferedAckPtr != NULL) + if (bufferedAckPtr != nullptr) { memcpy(bufferedAckPtr, ackPtr, ackLen); return(bufferedAckPtr); } - BufferedSend(ackPtr, ackLen, NULL, 0, false); - return(NULL); // FIX THIS + BufferedSend(ackPtr, ackLen, nullptr, 0, false); + return(nullptr); // FIX THIS } void UdpConnection::FlushMultiBuffer() @@ -2665,7 +2665,7 @@ void UdpConnection::FlushMultiBuffer() // notify all the reliable channels to clear their buffered acks for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { mChannel[i]->ClearBufferedAck(); } @@ -2689,7 +2689,7 @@ int UdpConnection::DecryptNone(uchar *destData, const uchar *sourceData, int sou int UdpConnection::EncryptUserSupplied(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedEncrypt(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2698,7 +2698,7 @@ int UdpConnection::EncryptUserSupplied(uchar *destData, const uchar *sourceData, int UdpConnection::DecryptUserSupplied(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedDecrypt(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2707,7 +2707,7 @@ int UdpConnection::DecryptUserSupplied(uchar *destData, const uchar *sourceData, int UdpConnection::EncryptUserSupplied2(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedEncrypt2(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2716,7 +2716,7 @@ int UdpConnection::EncryptUserSupplied2(uchar *destData, const uchar *sourceData int UdpConnection::DecryptUserSupplied2(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedDecrypt2(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2866,7 +2866,7 @@ void UdpConnection::SetupEncryptModel() mEncryptExpansionBytes += 0; // set up encrypt buffer (random numbers generated based on seed) - if (mEncryptXorBuffer == NULL) + if (mEncryptXorBuffer == nullptr) { int len = ((mUdpManager->mParams.maxRawPacketSize + 1) / 4) * 4; mEncryptXorBuffer = new uchar[len]; @@ -2898,7 +2898,7 @@ void UdpConnection::GetChannelStatus(UdpChannel channel, ChannelStatus *channelS case cUdpChannelReliable2: case cUdpChannelReliable3: case cUdpChannelReliable4: - if (mChannel[channel - cUdpChannelReliable1] != NULL) + if (mChannel[channel - cUdpChannelReliable1] != nullptr) { mChannel[channel - cUdpChannelReliable1]->GetChannelStatus(channelStatus); } @@ -2975,12 +2975,12 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mLogicalPacketsQueued = 0; mLogicalBytesQueued = 0; - mCoalescePacket = NULL; - mCoalesceStartPtr = NULL; - mCoalesceEndPtr = NULL; + mCoalescePacket = nullptr; + mCoalesceStartPtr = nullptr; + mCoalesceEndPtr = nullptr; mCoalesceCount = 0; - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; mStatDuplicatePacketsReceived = 0; mStatResentPacketsAccelerated = 0; @@ -2994,7 +2994,7 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; mFragmentNextPos = 0; mLastTimeStampAcknowledged = 0; mMaxxedOutCurrentWindow = false; @@ -3003,23 +3003,23 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mPhysicalPackets = new PhysicalPacket[mConfig.maxOutstandingPackets]; mReliableIncoming = new IncomingQueueEntry[mConfig.maxInstandingPackets]; - mLogicalRoot = NULL; - mLogicalEnd = NULL; + mLogicalRoot = nullptr; + mLogicalEnd = nullptr; } UdpReliableChannel::~UdpReliableChannel() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } const LogicalPacket *cur = mLogicalRoot; - while (cur != NULL) + while (cur != nullptr) { const LogicalPacket *next = cur->mReliableQueueNext; - cur->mReliableQueueNext = NULL; // make sure and mark it available so others could possibly use it (if it is a shared logical packet) + cur->mReliableQueueNext = nullptr; // make sure and mark it available so others could possibly use it (if it is a shared logical packet) cur->Release(); if (cur == next) // pointing to self, so this is end of list break; @@ -3035,7 +3035,7 @@ UdpReliableChannel::~UdpReliableChannel() void UdpReliableChannel::Send(const uchar *data, int dataLen, const uchar *data2, int dataLen2) { - if (mLogicalPacketsQueued == 0 && mCoalescePacket == NULL) + if (mLogicalPacketsQueued == 0 && mCoalescePacket == nullptr) { // if we are adding something to a previously empty logical queue, then it is possible that // we may be able to send it, so mark ourselves to take time the next time it is offered @@ -3086,7 +3086,7 @@ void UdpReliableChannel::Send(const LogicalPacket *packet) void UdpReliableChannel::FlushCoalesce() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { if (mCoalesceCount == 1) { @@ -3103,16 +3103,16 @@ void UdpReliableChannel::FlushCoalesce() } mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } } void UdpReliableChannel::SendCoalesce(const uchar *data, int dataLen, const uchar *data2, int dataLen2) { int totalLen = dataLen + dataLen2; - if (mCoalescePacket == NULL) + if (mCoalescePacket == nullptr) { - mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(NULL, mMaxDataBytes); + mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(nullptr, mMaxDataBytes); mCoalesceEndPtr = mCoalesceStartPtr = (uchar *)mCoalescePacket->GetDataPtr(); *mCoalesceEndPtr++ = 0; *mCoalesceEndPtr++ = UdpConnection::cUdpPacketGroup; @@ -3132,10 +3132,10 @@ void UdpReliableChannel::SendCoalesce(const uchar *data, int dataLen, const ucha // append on end of coalesce mCoalesceCount++; mCoalesceEndPtr += UdpMisc::PutVariableValue(mCoalesceEndPtr, totalLen); - if (data != NULL) + if (data != nullptr) memcpy(mCoalesceEndPtr, data, dataLen); mCoalesceEndPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) memcpy(mCoalesceEndPtr, data2, dataLen2); mCoalesceEndPtr += dataLen2; } @@ -3145,7 +3145,7 @@ void UdpReliableChannel::QueueLogicalPacket(const LogicalPacket *packet) mLogicalPacketsQueued++; mLogicalBytesQueued += packet->GetDataLen(); - if (packet->mReliableQueueNext != NULL) + if (packet->mReliableQueueNext != nullptr) { packet = mUdpConnection->mUdpManager->WrappedBorrow(packet); } @@ -3155,13 +3155,13 @@ void UdpReliableChannel::QueueLogicalPacket(const LogicalPacket *packet) } packet->mReliableQueueNext = packet; // have it point to itself to signify that the mNext pointer is taken (ie. reserve it), yet still represents the end of the list - if (mLogicalEnd != NULL) + if (mLogicalEnd != nullptr) { mLogicalEnd->mReliableQueueNext = packet; } mLogicalEnd = packet; - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) { mLogicalRoot = packet; } @@ -3182,10 +3182,10 @@ bool UdpReliableChannel::PullDown(int windowSpaceLeft) int physicalCount = (int)(mReliableOutgoingId - mReliableOutgoingPendingId); while (windowSpaceLeft > 0 && physicalCount < mConfig.maxOutstandingPackets) { - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) { FlushCoalesce(); // this is guaranteed to stick - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) break; // nothing flushed, so we are done } @@ -3225,10 +3225,10 @@ bool UdpReliableChannel::PullDown(int windowSpaceLeft) mLogicalRoot = mLogicalRoot->mReliableQueueNext; if (mLogicalRoot == lp) // ie, we were pointing to ourself, meaning we were the end of the list { - mLogicalRoot = NULL; - mLogicalEnd = NULL; + mLogicalRoot = nullptr; + mLogicalEnd = nullptr; } - lp->mReliableQueueNext = NULL; // clear our next link since we are no longer using it (so somebody else can use it potentially) + lp->mReliableQueueNext = nullptr; // clear our next link since we are no longer using it (so somebody else can use it potentially) lp->Release(); // release from logical queue } else @@ -3279,7 +3279,7 @@ int UdpReliableChannel::GiveTime() mMaxxedOutCurrentWindow = false; int outstandingNextSendTime = 10 * 60000; // if we have something to do - if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalRoot != NULL || mCoalescePacket != NULL) + if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalRoot != nullptr || mCoalescePacket != nullptr) { // first, let's calculate how many bytes we figure is outstanding based on who is still waiting for an ack-packet UdpMisc::ClockStamp oldestResendTime = udpMax(hotClock - optimalResendDelay, mLastTimeStampAcknowledged); // anything older than this, we need to resend @@ -3304,7 +3304,7 @@ int UdpReliableChannel::GiveTime() // if this packet has not been acked and it is NOT ready to be sent (was recently sent) then we consider it outstanding // note: packets needing re-sending probably got lost and are therefore not outstanding PhysicalPacket *entry = &mPhysicalPackets[i % mConfig.maxOutstandingPackets]; - if (entry->mDataPtr != NULL) // acked packets set the dataPtr to NULL + if (entry->mDataPtr != nullptr) // acked packets set the dataPtr to nullptr { // if this packet is ready to be sent (ie: needs time now, or some later packet has already been ack'ed) windowSpaceLeft -= entry->mDataLen; // window-space is effectively taken whether we have sent it yet or not @@ -3464,7 +3464,7 @@ int UdpReliableChannel::GiveTime() void UdpReliableChannel::GetChannelStatus(UdpConnection::ChannelStatus *channelStatus) const { int coalesceBytes = 0; - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) coalesceBytes = mCoalesceEndPtr - mCoalesceStartPtr; channelStatus->totalPendingBytes = mLogicalBytesQueued + mReliableOutgoingBytes + coalesceBytes; @@ -3525,7 +3525,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) mReliableIncomingId++; // process other packets that have arrived - while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != NULL) + while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != nullptr) { int spot = (int)(mReliableIncomingId % mConfig.maxInstandingPackets); if (mReliableIncoming[spot].mMode != cReliablePacketModeDelivered) @@ -3534,7 +3534,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) } mReliableIncoming[spot].mPacket->Release(); - mReliableIncoming[spot].mPacket = NULL; + mReliableIncoming[spot].mPacket = nullptr; mReliableIncomingId++; } } @@ -3542,7 +3542,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) { // not the one we need next, but it is later than the one we need , so store it in our buffer until it's turn comes up int spot = (int)(reliableId % mConfig.maxInstandingPackets); - if (mReliableIncoming[spot].mPacket == NULL) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) + if (mReliableIncoming[spot].mPacket == nullptr) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) { mReliableIncoming[spot].mMode = mode; mReliableIncoming[spot].mPacket = mUdpConnection->mUdpManager->CreatePacket(data + UdpConnection::cUdpPacketReliableSize, dataLen - UdpConnection::cUdpPacketReliableSize); @@ -3584,16 +3584,16 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) // a simple ack for us only *bufPtr++ = (uchar)(UdpConnection::cUdpPacketAck1 + mChannelNumber); bufPtr += UdpMisc::PutValue16(bufPtr, (ushort)(reliableId & 0xffff)); - mBufferedAckPtr = NULL; // not allowed to replace an old one with a selective-ack + mBufferedAckPtr = nullptr; // not allowed to replace an old one with a selective-ack } - if (mBufferedAckPtr != NULL && mConfig.ackDeduping) + if (mBufferedAckPtr != nullptr && mConfig.ackDeduping) { memcpy(mBufferedAckPtr, buf, bufPtr - buf); } else { - mBufferedAckPtr = mUdpConnection->BufferedSend(buf, bufPtr - buf, NULL, 0, true); // safe to append on our data, it is stack data + mBufferedAckPtr = mUdpConnection->BufferedSend(buf, bufPtr - buf, nullptr, 0, true); // safe to append on our data, it is stack data } } @@ -3610,7 +3610,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const uchar *dat else if (mode == cReliablePacketModeFragment) { // append onto end of big packet (or create new big packet if not existing already) - if (mBigDataPtr == NULL) + if (mBigDataPtr == nullptr) { mBigDataTargetLen = UdpMisc::GetValue32(data); // first fragment has a total-length int header on it. mBigDataPtr = new uchar[mBigDataTargetLen]; @@ -3633,7 +3633,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const uchar *dat delete[] mBigDataPtr; mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; } } } @@ -3663,7 +3663,7 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) int pos = (int)(reliableId % mConfig.maxOutstandingPackets); PhysicalPacket *entry = &mPhysicalPackets[pos]; - if (entry->mDataPtr != NULL) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) + if (entry->mDataPtr != nullptr) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) { mNextNeedTime = 0; // something got acked, so we actually need to take the time next time it is offered @@ -3721,14 +3721,14 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) // this packet we have queued has been acknowledged, so delete it from queue mReliableOutgoingBytes -= entry->mDataLen; entry->mDataLen = 0; - entry->mDataPtr = NULL; + entry->mDataPtr = nullptr; entry->mParent->Release(); - entry->mParent = NULL; + entry->mParent = nullptr; // advance the pending ptr until it reaches outgoingId or an entry that has yet to acknowledged while (mReliableOutgoingPendingId < mReliableOutgoingId) { - if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != NULL) + if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != nullptr) break; mReliableOutgoingPendingId++; } @@ -3750,25 +3750,25 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) UdpReliableChannel::IncomingQueueEntry::IncomingQueueEntry() { - mPacket = NULL; + mPacket = nullptr; mMode = UdpReliableChannel::cReliablePacketModeReliable; } UdpReliableChannel::IncomingQueueEntry::~IncomingQueueEntry() { - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->Release(); } UdpReliableChannel::PhysicalPacket::PhysicalPacket() { - mParent = NULL; + mParent = nullptr; } UdpReliableChannel::PhysicalPacket::~PhysicalPacket() { - if (mParent != NULL) + if (mParent != nullptr) mParent->Release(); } @@ -3780,7 +3780,7 @@ UdpReliableChannel::PhysicalPacket::~PhysicalPacket() LogicalPacket::LogicalPacket() { mRefCount = 1; - mReliableQueueNext = NULL; + mReliableQueueNext = nullptr; } LogicalPacket::~LogicalPacket() @@ -3815,7 +3815,7 @@ SimpleLogicalPacket::SimpleLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; mData = new uchar[mDataLen]; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -3850,7 +3850,7 @@ void SimpleLogicalPacket::SetDataLen(int len) GroupLogicalPacket::GroupLogicalPacket() : LogicalPacket() { mDataLen = 0; - mData = NULL; + mData = nullptr; } GroupLogicalPacket::~GroupLogicalPacket() @@ -3860,13 +3860,13 @@ GroupLogicalPacket::~GroupLogicalPacket() void GroupLogicalPacket::AddPacket(const LogicalPacket *packet) { - assert(packet != NULL); + assert(packet != nullptr); AddPacketInternal(packet->GetDataPtr(), packet->GetDataLen(), packet->IsInternalPacket()); } void GroupLogicalPacket::AddPacket(const void *data, int dataLen) { - assert(data != NULL); + assert(data != nullptr); assert(dataLen >= 0); AddPacketInternal(data, dataLen, false); } @@ -3932,16 +3932,16 @@ PooledLogicalPacket::PooledLogicalPacket(UdpManager *manager, int len) mDataLen = 0; mUdpManager = manager; - mAvailableNext = NULL; - mCreatedNext = NULL; - mCreatedPrev = NULL; + mAvailableNext = nullptr; + mCreatedNext = nullptr; + mCreatedPrev = nullptr; mUdpManager->PoolCreated(this); } PooledLogicalPacket::~PooledLogicalPacket() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->PoolDestroyed(this); } @@ -3956,7 +3956,7 @@ void PooledLogicalPacket::AddRef() const void PooledLogicalPacket::Release() const { - if (mRefCount == 1 && mUdpManager != NULL) + if (mRefCount == 1 && mUdpManager != nullptr) mUdpManager->PoolReturn(const_cast(this)); // if pool wants to keep us, it will inc our ref count, preventing our destruction // we cast off our const, as when we are added back to the pool, we can be modified LogicalPacket::Release(); @@ -3986,9 +3986,9 @@ void PooledLogicalPacket::SetDataLen(int len) void PooledLogicalPacket::SetData(const void *data, int dataLen, const void *data2, int dataLen2) { mDataLen = dataLen + dataLen2; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(mData + dataLen, data2, dataLen2); } @@ -3999,23 +3999,23 @@ void PooledLogicalPacket::SetData(const void *data, int dataLen, const void *dat /////////////////////////////////////////////////////////////////////////////////////////// WrappedLogicalPacket::WrappedLogicalPacket(UdpManager *udpManager) { - mPacket = NULL; + mPacket = nullptr; mUdpManager = udpManager; - mAvailableNext = NULL; - mCreatedNext = NULL; - mCreatedPrev = NULL; + mAvailableNext = nullptr; + mCreatedNext = nullptr; + mCreatedPrev = nullptr; mUdpManager->WrappedCreated(this); } WrappedLogicalPacket::~WrappedLogicalPacket() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->WrappedDestroyed(this); } - if (mPacket != NULL) + if (mPacket != nullptr) { mPacket->Release(); } @@ -4028,7 +4028,7 @@ void WrappedLogicalPacket::AddRef() const void WrappedLogicalPacket::Release() const { - if (mRefCount == 1 && mUdpManager != NULL) + if (mRefCount == 1 && mUdpManager != nullptr) mUdpManager->WrappedReturn(const_cast(this)); // if pool wants to keep us, it will inc our ref count, preventing our destruction // we cast off our const, as when we are added back to the pool, we can be modified LogicalPacket::Release(); @@ -4036,10 +4036,10 @@ void WrappedLogicalPacket::Release() const void WrappedLogicalPacket::SetLogicalPacket(const LogicalPacket *packet) { - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->Release(); mPacket = packet; - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->AddRef(); } @@ -4075,7 +4075,7 @@ UdpManager::SimulateQueueEntry::SimulateQueueEntry(const uchar *data, int dataLe memcpy(mData, data, dataLen); mIp = ip; mPort = port; - mNext = NULL; + mNext = nullptr; } UdpManager::SimulateQueueEntry::~SimulateQueueEntry() @@ -4110,7 +4110,7 @@ UdpMisc::ClockStamp UdpMisc::Clock() static ClockStamp sLastStamp = 0; static ClockStamp sCurrentCorrection = 0; struct timeval tv; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); UdpMisc::ClockStamp cs = static_cast(tv.tv_sec) * 1000 + static_cast(tv.tv_usec / 1000); cs += sCurrentCorrection; if (cs < sLastStamp) @@ -4226,19 +4226,19 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) if (bytes == 0) { - if (ptr != NULL) + if (ptr != nullptr) { free((uchar *)ptr - cAlignment); } - return(NULL); + return(nullptr); } uchar *ptr2; - if (ptr == NULL) + if (ptr == nullptr) { ptr2 = (uchar *)malloc(bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); } @@ -4248,8 +4248,8 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) return(ptr); ptr2 = (uchar *)realloc((uchar *)ptr - cAlignment, bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); @@ -4312,30 +4312,30 @@ LogicalPacket *UdpMisc::CreateQuickLogicalPacket(const void *data, int dataLen, switch(q) { case 0: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 1: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 2: case 3: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 4: case 5: case 6: case 7: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; default: - tlp = new SimpleLogicalPacket(NULL, totalDataLen); + tlp = new SimpleLogicalPacket(nullptr, totalDataLen); break; } uchar *dest = (uchar *)tlp->GetDataPtr(); - if (data != NULL) + if (data != nullptr) memcpy(dest, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(dest + dataLen, data2, dataLen2); return(tlp); } @@ -4349,7 +4349,7 @@ UdpIpAddress UdpMisc::GetHostByName(const char *hostName) { struct hostent * lphp; lphp = gethostbyname(hostName); - if (lphp == NULL) + if (lphp == nullptr) { address = 0; } diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.hpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.hpp index 27fc28d1..9db50e40 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.hpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.hpp @@ -150,7 +150,7 @@ class UdpMisc // memory manager does a little bit of this, but if you know you have an allocation that is likely // to grow quite a bit, you can set the round'ing size up to a fairly large number and avoid // unnecessary reallocs at the cost of a little potentially wasted space - // initial allocations are done by passing in ptr==NULL, freeing is done by passing in bytes==0 + // initial allocations are done by passing in ptr==nullptr, freeing is done by passing in bytes==0 static void *SmartResize(void *ptr, int bytes, int round = 1); // the following two functions store values in the buffer as a variable length (B1, 0xffB2B1, 0xffffffB4B3B2B1) @@ -170,7 +170,7 @@ class UdpMisc static uint GetValue24(const void *buffer); // gets a 24-bit value from the buffer in big-endian format static ushort GetValue16(const void *buffer); // gets a 16-bit value from the buffer in big-endian format - static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); // looks up the specified name and translates it to an IP address // this is a blocking call that can at times take a significant amount of time, but will generally be fast (less than 300ms) @@ -243,7 +243,7 @@ class LogicalPacket protected: friend class UdpReliableChannel; mutable const LogicalPacket *mReliableQueueNext; // owned/managed by the reliable channel object as an optimizations, do not touch - // NULL = unclaimed, point-to-self = claimed, but end of list + // nullptr = unclaimed, point-to-self = claimed, but end of list }; class SimpleLogicalPacket : public LogicalPacket @@ -252,7 +252,7 @@ class SimpleLogicalPacket : public LogicalPacket // it was originally created to allow the internal code to handle reliable data that was sent // via the Send(char *, int) api call. public: - SimpleLogicalPacket(const void *data, int dataLen); // data can be NULL if you want to populate it after it is allocated (get the pointer and write to it) + SimpleLogicalPacket(const void *data, int dataLen); // data can be nullptr if you want to populate it after it is allocated (get the pointer and write to it) virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -323,7 +323,7 @@ template class StructLogicalPacket : public LogicalPacket // with virtual functions) via this method as they may contain hidden data-members (such as pointers // to vtables). public: - StructLogicalPacket(T *initData = NULL); + StructLogicalPacket(T *initData = nullptr); virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -396,7 +396,7 @@ class PooledLogicalPacket : public LogicalPacket int mMaxDataLen; protected: friend class UdpManager; - void SetData(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + void SetData(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); UdpManager *mUdpManager; PooledLogicalPacket *mAvailableNext; PooledLogicalPacket *mCreatedNext; @@ -476,7 +476,7 @@ class UdpManager // pointer equal to your object and the UdpManager will call it as appropriate. The UdpConnection object // also has a handler mechanism that replaces the other callback functions below, see UdpConnection::SetHandler // if a handler is specified, the callback function is ignored, even if specified. - // default = NULL (not used) + // default = nullptr (not used) UdpManagerHandler *handler; // this is the maximum number of connections that can be established by this manager, any incoming/outgoing connections @@ -901,7 +901,7 @@ class UdpManager // will call EstablishConnection, then sit in a loop calling UdpManager::GiveTime and checking to see // if the status of the returned UdpConnection object is changed from cStatusNegotiating. This allows // the application to look for the ESC key or timeout an attempted connection. - // This function will return NULL if the manager object has exceeded its maximum number of connections + // This function will return nullptr if the manager object has exceeded its maximum number of connections // or if the serverAddress cannot be resolved to an IP address // as is noted in the declaration, it is the responsibility of the application establishing the connection to delete it // setting the timeout value (in milliseconds) to something greater than 0 will cause the UdpConnection object to change @@ -933,13 +933,13 @@ class UdpManager // manually forces all live connections to flush their multi buffers immediately void FlushAllMultiBuffer(); - // creates a logical packet and populates it with data. data can be NULL, in which case it gives you logical packet + // creates a logical packet and populates it with data. data can be nullptr, in which case it gives you logical packet // of the size specified, but copies no data into it. If you are using pool management (see Params::poolPacketMax), // it will give you a packet out of the pool if possible, otherwise it will create a packet for you. When logical // are packets are needed internally for various things (like reliable channel sends that use the (void *, int) interface) // they are gotten from this function, so your application can likely take advantage of pooling, even if it never bothers // to explicitly call this function. - LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); protected: friend class PooledLogicalPacket; @@ -1165,7 +1165,7 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, int ConnectionAge() const; // returns the UdpManager object that is managing this connection - // will return NULL if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) + // will return nullptr if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) UdpManager *GetUdpManager() const; // returns the 32-bit encryption-code that was negotiated as part of the connection-establishment process. @@ -1245,9 +1245,9 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, friend class UdpManager; friend class UdpReliableChannel; - // note: if connectPacket is NULL, that means this connection object is being created to establish + // note: if connectPacket is nullptr, that means this connection object is being created to establish // a new connection to the specified ip/port (ie. the connection starts out in cStatusNegotiating mode) - // if connectPacket is non-NULL, that menas this connection object is being created to handle an + // if connectPacket is non-nullptr, that menas this connection object is being created to handle an // incoming connect request and it will start out in cStatusConnected mode. UdpConnection(UdpManager *udpManager, UdpIpAddress destIp, int destPort, int timeout); // starts connection-establishment protocol UdpConnection(UdpManager *udpManager, const UdpManager::PacketHistoryEntry *e); // starts already connected, replying to connection request @@ -1282,7 +1282,7 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, void PhysicalSend(const uchar *data, int dataLen, bool appendAllowed); // sends a physical packet (encrypts and adds crc bytes) uchar *BufferedSend(const uchar *data, int dataLen, const uchar *data2, int dataLen2, bool appendAllowed); // buffers logical packets waiting til we have more data (makes multi-packets) bool InternalSend(UdpChannel channel, const LogicalPacket *packet); - bool InternalSend(UdpChannel channel, const uchar *data, int dataLen, const uchar *data2 = NULL, int dataLen2 = 0); + bool InternalSend(UdpChannel channel, const uchar *data, int dataLen, const uchar *data2 = nullptr, int dataLen2 = 0); uchar *InternalAckSend(uchar *bufferedAckPtr, const uchar *ackPtr, int ackLen); // used by reliable channel to send acks (special send that allows for deduping ack feature) @@ -1573,7 +1573,7 @@ class UdpReliableChannel void ProcessPacket(ReliablePacketMode mode, const uchar *data, int dataLen); bool PullDown(int windowSpaceLeft); void FlushCoalesce(); - void SendCoalesce(const uchar *data, int dataLen, const uchar *data2 = NULL, int dataLen2 = 0); + void SendCoalesce(const uchar *data, int dataLen, const uchar *data2 = nullptr, int dataLen2 = 0); void QueueLogicalPacket(const LogicalPacket *packet); UdpManager::ReliableConfig mConfig; @@ -1627,7 +1627,7 @@ class UdpReliableChannel template FixedLogicalPacket::FixedLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -1657,7 +1657,7 @@ template void FixedLogicalPacket::SetDataLen(int l ///////////////////////////////////////////////////////////////////////// template StructLogicalPacket::StructLogicalPacket(T *initData) { - if (initData != NULL) + if (initData != nullptr) mStruct = *initData; } @@ -1802,7 +1802,7 @@ inline void UdpManager::SetPriority(UdpConnection *con, UdpMisc::ClockStamp stam if (stamp < mMinimumScheduledStamp) stamp = mMinimumScheduledStamp; - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) mPriorityQueue->Add(con, stamp); } @@ -1829,7 +1829,7 @@ inline void UdpManager::PoolReturn(PooledLogicalPacket *packet) inline void UdpManager::WrappedReturn(WrappedLogicalPacket *wp) { - wp->SetLogicalPacket(NULL); + wp->SetLogicalPacket(nullptr); if (mWrappedAvailable < mParams.wrappedPoolMax) { @@ -1877,7 +1877,7 @@ inline void UdpConnection::ScheduleTimeNow() // prevents us from reprioritizing to 0, only to shortly thereafter be reprioritized to where we actually belong. if (!mGettingTime) { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) mUdpManager->SetPriority(this, 0); } } @@ -2066,7 +2066,7 @@ inline int UdpReliableChannel::TotalPendingBytes() const inline void UdpReliableChannel::ClearBufferedAck() { - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; } inline udp_int64 UdpReliableChannel::GetReliableOutgoingId(int reliableStamp) const diff --git a/external/3rd/library/udplibrary/PointerDeque.hpp b/external/3rd/library/udplibrary/PointerDeque.hpp index 6124afd8..8cc2ccc2 100644 --- a/external/3rd/library/udplibrary/PointerDeque.hpp +++ b/external/3rd/library/udplibrary/PointerDeque.hpp @@ -2,7 +2,7 @@ #define POINTERDEQUE_HPP // This is a simple double ended queue template. Any pointer-type can be stored in this deque - // I pop/peek return NULL if the queue is empty. + // I pop/peek return nullptr if the queue is empty. template class PointerDeque { public: @@ -32,7 +32,7 @@ template class PointerDeque template PointerDeque::PointerDeque(int entriesPerPage) { mEntriesPerPage = entriesPerPage; - mEntries = NULL; + mEntries = nullptr; mOffsetLeft = 0; mEntriesMax = 0; mEntriesCount = 0; @@ -73,7 +73,7 @@ template void PointerDeque::PushLeft(T* obj) template T* PointerDeque::PopLeft() { if (mEntriesCount == 0) - return(NULL); + return(nullptr); T* hold = mEntries[mOffsetLeft]; mOffsetLeft = (mOffsetLeft + 1) % mEntriesMax; mEntriesCount--; @@ -91,7 +91,7 @@ template void PointerDeque::PushRight(T* obj) template T* PointerDeque::PopRight() { if (mEntriesCount == 0) - return(NULL); + return(nullptr); mEntriesCount--; return(mEntries[(mOffsetLeft + mEntriesCount) % mEntriesMax]); } @@ -99,21 +99,21 @@ template T* PointerDeque::PopRight() template T* PointerDeque::PeekLeft() { if (mEntriesCount == 0) - return(NULL); + return(nullptr); return(mEntries[mOffsetLeft]); } template T* PointerDeque::PeekRight() { if (mEntriesCount == 0) - return(NULL); + return(nullptr); return(mEntries[(mOffsetLeft + mEntriesCount - 1) % mEntriesMax]); } template T* PointerDeque::Peek(int index) { if (index >= mEntriesCount) - return(NULL); + return(nullptr); return(mEntries[(mOffsetLeft + index) % mEntriesMax]); } diff --git a/external/3rd/library/udplibrary/UdpLibrary.cpp b/external/3rd/library/udplibrary/UdpLibrary.cpp index a84e147d..c8436157 100755 --- a/external/3rd/library/udplibrary/UdpLibrary.cpp +++ b/external/3rd/library/udplibrary/UdpLibrary.cpp @@ -144,7 +144,7 @@ UdpIpAddress::UdpIpAddress(unsigned int ip) char *UdpIpAddress::GetAddress(char *buffer) const { - assert(buffer != NULL); + assert(buffer != nullptr); struct sockaddr_in addr_serverUDP; addr_serverUDP.sin_addr.s_addr = mIp; @@ -157,7 +157,7 @@ char *UdpIpAddress::GetAddress(char *buffer) const ///////////////////////////////////////////////////////////////////////////////////////////////////// UdpManager::Params::Params() { - handler = NULL; + handler = nullptr; outgoingBufferSize = 64 * 1024; incomingBufferSize = 64 * 1024; packetHistoryMax = 100; @@ -258,7 +258,7 @@ UdpManager::UdpManager(const UdpManager::Params *params) mParams.maxDataHoldSize = udpMin(mParams.maxDataHoldSize, mParams.maxRawPacketSize); mParams.packetHistoryMax = udpMax(1, mParams.packetHistoryMax); mPacketHistoryPosition = 0; - mPassThroughData = NULL; + mPassThroughData = nullptr; typedef PacketHistoryEntry *PacketHistoryEntryPtr; mPacketHistory = new PacketHistoryEntryPtr[mParams.packetHistoryMax]; @@ -279,17 +279,17 @@ UdpManager::UdpManager(const UdpManager::Params *params) mUdpSocket = INVALID_SOCKET; mConnectionListCount = 0; - mConnectionList = NULL; + mConnectionList = nullptr; mPoolCreated = 0; mPoolAvailable = 0; - mPoolAvailableRoot = NULL; - mPoolCreatedRoot = NULL; + mPoolAvailableRoot = nullptr; + mPoolCreatedRoot = nullptr; mWrappedCreated = 0; mWrappedAvailable = 0; - mWrappedAvailableRoot = NULL; - mWrappedCreatedRoot = NULL; + mWrappedAvailableRoot = nullptr; + mWrappedCreatedRoot = nullptr; for (i = 0; i < mParams.pooledPacketInitial && i < mParams.pooledPacketMax; i++) { @@ -299,16 +299,16 @@ UdpManager::UdpManager(const UdpManager::Params *params) lp->Release(); } - mSimulateQueueStart = NULL; - mSimulateQueueEnd = NULL; + mSimulateQueueStart = nullptr; + mSimulateQueueEnd = nullptr; mSimulateNextOutgoingTime = 0; mSimulateNextIncomingTime = 0; mSimulateQueueBytes = 0; - mDisconnectPendingList = NULL; + mDisconnectPendingList = nullptr; if (mParams.avoidPriorityQueue) - mPriorityQueue = NULL; + mPriorityQueue = nullptr; else mPriorityQueue = new PriorityQueue(mParams.maxConnections); @@ -339,14 +339,14 @@ UdpManager::~UdpManager() // first we need to tell all the pooled packets we have created that they can no longer check themselves back into use // when they are released PooledLogicalPacket *walk = mPoolCreatedRoot; - while (walk != NULL) + while (walk != nullptr) { - walk->mUdpManager = NULL; + walk->mUdpManager = nullptr; walk = walk->mCreatedNext; } // next release the ones we have in our available pool walk = mPoolAvailableRoot; - while (walk != NULL) + while (walk != nullptr) { PooledLogicalPacket *hold = walk; walk = walk->mAvailableNext; @@ -359,14 +359,14 @@ UdpManager::~UdpManager() // next we need to tell all the warpped packets we have created that they can no longer check themselves back into use // when they are released WrappedLogicalPacket *walk = mWrappedCreatedRoot; - while (walk != NULL) + while (walk != nullptr) { - walk->mUdpManager = NULL; + walk->mUdpManager = nullptr; walk = walk->mCreatedNext; } // next release the ones we have in our available pool walk = mWrappedAvailableRoot; - while (walk != NULL) + while (walk != nullptr) { WrappedLogicalPacket *hold = walk; walk = walk->mAvailableNext; @@ -376,7 +376,7 @@ UdpManager::~UdpManager() // next thing we must do is tell all the connections to disconnect (which severs their link to this dying manager) // this has to be done first since they will call back into us and have themselves removed from our connection-list/priority-queue/etc - while (mConnectionList != NULL) + while (mConnectionList != nullptr) { mConnectionList->InternalDisconnect(0, UdpConnection::cDisconnectReasonManagerDeleted); // the above call ended up calling us back and removing them from our connection list, so now mConnectionList is pointing to the next entry @@ -384,7 +384,7 @@ UdpManager::~UdpManager() } // release any objects that were pending disconnection - while (mDisconnectPendingList != NULL) + while (mDisconnectPendingList != nullptr) { UdpConnection *next = mDisconnectPendingList->mDisconnectPendingNextConnection; mDisconnectPendingList->Release(); @@ -404,7 +404,7 @@ UdpManager::~UdpManager() } delete[] mPacketHistory; - while (mSimulateQueueStart != NULL) + while (mSimulateQueueStart != nullptr) { SimulateQueueEntry *entry = mSimulateQueueStart; mSimulateQueueStart = entry->mNext; @@ -517,12 +517,12 @@ void UdpManager::ProcessDisconnectPending() { UdpConnection *entry = mDisconnectPendingList; UdpConnection **prev = &mDisconnectPendingList; - while (entry != NULL) + while (entry != nullptr) { if (entry->GetStatus() == UdpConnection::cStatusDisconnected) { *prev = entry->mDisconnectPendingNextConnection; - entry->mDisconnectPendingNextConnection = NULL; + entry->mDisconnectPendingNextConnection = nullptr; entry->Release(); entry = *prev; } @@ -536,19 +536,19 @@ void UdpManager::ProcessDisconnectPending() void UdpManager::RemoveConnection(UdpConnection *con) { - assert(con != NULL); // attemped to remove a NULL connection object + assert(con != nullptr); // attemped to remove a nullptr connection object // note: it's a bug to Remove a connection object that is already removed...should never be able to happen. mConnectionListCount--; - if (con->mPrevConnection != NULL) + if (con->mPrevConnection != nullptr) con->mPrevConnection->mNextConnection = con->mNextConnection; - if (con->mNextConnection != NULL) + if (con->mNextConnection != nullptr) con->mNextConnection->mPrevConnection = con->mPrevConnection; if (mConnectionList == con) mConnectionList = con->mNextConnection; - con->mNextConnection = NULL; - con->mPrevConnection = NULL; - if (mPriorityQueue != NULL) + con->mNextConnection = nullptr; + con->mPrevConnection = nullptr; + if (mPriorityQueue != nullptr) mPriorityQueue->Remove(con); mAddressHashTable->Remove(con, AddressHashValue(con->mIp, con->mPort)); @@ -557,11 +557,11 @@ void UdpManager::RemoveConnection(UdpConnection *con) void UdpManager::AddConnection(UdpConnection *con) { - assert(con != NULL); // attemped to add a NULL connection object + assert(con != nullptr); // attemped to add a nullptr connection object con->mNextConnection = mConnectionList; - con->mPrevConnection = NULL; - if (mConnectionList != NULL) + con->mPrevConnection = nullptr; + if (mConnectionList != nullptr) mConnectionList->mPrevConnection = con; mConnectionList = con; mConnectionListCount++; @@ -574,7 +574,7 @@ void UdpManager::FlushAllMultiBuffer() { AddRef(); UdpConnection *cur = mConnectionList; - while (cur != NULL) + while (cur != nullptr) { cur->FlushMultiBuffer(); cur = cur->mNextConnection; @@ -597,7 +597,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) { PacketHistoryEntry *e = ActualReceive(); - if (e == NULL) + if (e == nullptr) { mLastEmptySocketBufferStamp = UdpMisc::Clock(); break; @@ -625,7 +625,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) if (giveConnectionsTime) { - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) { // give time to everybody in the priority-queue that needs it UdpMisc::ClockStamp curPriority = UdpMisc::Clock(); @@ -643,7 +643,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) for (;;) { UdpConnection *top = mPriorityQueue->TopRemove(curPriority); - if (top == NULL) + if (top == nullptr) break; top->AddRef(); top->GiveTime(); @@ -656,7 +656,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) { // give time to everybody UdpConnection *cur = mConnectionList; - while (cur != NULL) + while (cur != nullptr) { cur->GiveTime(); cur = cur->mNextConnection; @@ -666,7 +666,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) ProcessDisconnectPending(); } - if (mSimulateQueueStart != NULL && UdpMisc::Clock() >= mSimulateNextOutgoingTime) + if (mSimulateQueueStart != nullptr && UdpMisc::Clock() >= mSimulateNextOutgoingTime) { SimulateQueueEntry *entry = mSimulateQueueStart; mSimulateQueueStart = mSimulateQueueStart->mNext; @@ -674,7 +674,7 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) ActualSendHelper(entry->mData, entry->mDataLen, entry->mIp, entry->mPort); UdpConnection *con = AddressGetConnection(entry->mIp, entry->mPort); - if (con != NULL) + if (con != nullptr) con->mSimulateQueueBytes -= entry->mDataLen; mSimulateQueueBytes -= entry->mDataLen; delete entry; @@ -687,11 +687,11 @@ bool UdpManager::GiveTime(int maxPollingTime, bool giveConnectionsTime) UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int serverPort, int timeout) { assert(serverPort != 0); // can't connect to no port - assert(serverAddress != NULL); + assert(serverAddress != nullptr); assert(serverAddress[0] != 0); if (mConnectionListCount >= mParams.maxConnections) - return(NULL); + return(nullptr); // get server address unsigned long address = inet_addr(serverAddress); @@ -699,16 +699,16 @@ UdpConnection *UdpManager::EstablishConnection(const char *serverAddress, int se { struct hostent * lphp; lphp = gethostbyname(serverAddress); - if (lphp == NULL) - return(NULL); + if (lphp == nullptr) + return(nullptr); address = ((struct in_addr *)(lphp->h_addr))->s_addr; } UdpIpAddress destIp(address); // first, see if we already have a connection object managing this ip/port, if we do, then fail UdpConnection *con = AddressGetConnection(destIp, serverPort); - if (con != NULL) - return(NULL); + if (con != nullptr) + return(nullptr); return(new UdpConnection(this, destIp, serverPort, timeout)); } @@ -721,7 +721,7 @@ void UdpManager::KeepUntilDisconnected(UdpConnection *con) void UdpManager::GetStats(UdpManagerStatistics *stats) const { - assert(stats != NULL); + assert(stats != nullptr); *stats = mManagerStats; stats->poolAvailable = mPoolAvailable; stats->poolCreated = mPoolCreated; @@ -736,10 +736,10 @@ void UdpManager::ResetStats() void UdpManager::DumpPacketHistory(const char *filename) const { - assert(filename != NULL); + assert(filename != nullptr); assert(filename[0] != 0); FILE *file = fopen(filename, "wt"); - if (file != NULL) + if (file != nullptr) { // dump history of packets... for (int i = 0; i < mParams.packetHistoryMax; i++) @@ -785,7 +785,7 @@ int UdpManager::GetLocalPort() const UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() { if (mParams.simulateIncomingByteRate > 0 && UdpMisc::Clock() < mSimulateNextIncomingTime) - return(NULL); + return(nullptr); struct sockaddr_in addr_from; socklen_t sf = sizeof(addr_from); @@ -795,7 +795,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() if (res != SOCKET_ERROR) { if (mParams.simulateIncomingLossPercent > 0 && ((rand() % 100) < mParams.simulateIncomingLossPercent)) - return(NULL); // packet, what packet? + return(nullptr); // packet, what packet? if (mParams.simulateIncomingByteRate > 0) mSimulateNextIncomingTime = UdpMisc::Clock() + (res * 1000 / mParams.simulateIncomingByteRate); @@ -820,7 +820,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() UdpIpAddress ip = UdpIpAddress(addr_from.sin_addr.s_addr); int port = (int)ntohs(addr_from.sin_port); UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { con->AddRef(); con->PortUnreachable(); @@ -840,7 +840,7 @@ UdpManager::PacketHistoryEntry *UdpManager::ActualReceive() } #endif } - return(NULL); + return(nullptr); } void UdpManager::ProcessIcmpErrors() @@ -868,7 +868,7 @@ void UdpManager::ProcessIcmpErrors() struct cmsghdr * cmsg; if(CMSG_FIRSTHDR(&msgh)) { - for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) + for(cmsg = CMSG_FIRSTHDR(&msgh); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msgh, cmsg)) { if(cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR) { @@ -882,7 +882,7 @@ void UdpManager::ProcessIcmpErrors() UdpIpAddress ip = UdpIpAddress(msg_name.sin_addr.s_addr); int port = (int)htons(msg_name.sin_port); UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { con->AddRef(); con->PortUnreachable(); @@ -911,7 +911,7 @@ void UdpManager::ActualSend(const uchar *data, int dataLen, UdpIpAddress ip, int { // simulating outgoing byte-rate, so queue it up for sending later UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) { if (mParams.simulateDestinationOverloadLevel > 0 && con->mSimulateQueueBytes + dataLen > mParams.simulateDestinationOverloadLevel) return; // no room, packet gets lost @@ -919,17 +919,17 @@ void UdpManager::ActualSend(const uchar *data, int dataLen, UdpIpAddress ip, int if (mParams.simulateOutgoingOverloadLevel > 0 && mSimulateQueueBytes + dataLen > mParams.simulateOutgoingOverloadLevel) return; // no room, packet gets lost - if (con != NULL) + if (con != nullptr) con->mSimulateQueueBytes += dataLen; mSimulateQueueBytes += dataLen; SimulateQueueEntry *entry = new SimulateQueueEntry(data, dataLen, ip, port); - if (mSimulateQueueStart != NULL) + if (mSimulateQueueStart != nullptr) mSimulateQueueEnd->mNext = entry; else mSimulateQueueStart = entry; mSimulateQueueEnd = entry; - mSimulateQueueEnd->mNext = NULL; + mSimulateQueueEnd->mNext = nullptr; return; } ActualSendHelper(data, dataLen, ip, port); @@ -952,7 +952,7 @@ void UdpManager::ActualSendHelper(const uchar *data, int dataLen, UdpIpAddress i // flag connection to terminate itself for port-unreachable error on next give time // we need to flag it instead of actually terminating it to prevent callbacks from occuring during application sends UdpConnection *con = AddressGetConnection(ip, port); - if (con != NULL) + if (con != nullptr) con->FlagPortUnreachable(); return; } @@ -990,7 +990,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) UdpConnection *con = AddressGetConnection(e->mIp, e->mPort); - if (con == NULL) + if (con == nullptr) { // packet coming from an unknown ip/port // if it is a connection request packet, then establish a new connection object to reply to it @@ -1003,7 +1003,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) int protocolVersion = UdpMisc::GetValue32(e->mBuffer + 2); if (protocolVersion == cProtocolVersion) { - if (mParams.handler != NULL) + if (mParams.handler != nullptr) { UdpConnection *newcon = new UdpConnection(this, e); mParams.handler->OnConnectRequest(newcon); @@ -1032,7 +1032,7 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) int encryptCode = UdpMisc::GetValue32(ptr); UdpConnection *con = ConnectCodeGetConnection(connectCode); - if (con != NULL) + if (con != nullptr) { if (mParams.allowAddressRemapping || con->mIp == e->mIp) { @@ -1082,25 +1082,25 @@ void UdpManager::ProcessRawPacket(const PacketHistoryEntry *e) UdpConnection *UdpManager::AddressGetConnection(UdpIpAddress ip, int port) const { UdpConnection *found = static_cast(mAddressHashTable->FindFirst(AddressHashValue(ip, port))); - while (found != NULL) + while (found != nullptr) { if (found->mIp == ip && found->mPort == port) return(found); found = static_cast(mAddressHashTable->FindNext(found)); } - return(NULL); + return(nullptr); } UdpConnection *UdpManager::ConnectCodeGetConnection(int connectCode) const { UdpConnection *found = static_cast(mConnectCodeHashTable->FindFirst(connectCode)); - while (found != NULL) + while (found != nullptr) { if (found->mConnectCode == connectCode) return(found); found = static_cast(mConnectCodeHashTable->FindNext(found)); } - return(NULL); + return(nullptr); } WrappedLogicalPacket *UdpManager::WrappedBorrow(const LogicalPacket *lp) @@ -1124,7 +1124,7 @@ WrappedLogicalPacket *UdpManager::WrappedBorrow(const LogicalPacket *lp) void UdpManager::WrappedCreated(WrappedLogicalPacket *wp) { wp->mCreatedNext = mWrappedCreatedRoot; - if (mWrappedCreatedRoot != NULL) + if (mWrappedCreatedRoot != nullptr) mWrappedCreatedRoot->mCreatedPrev = wp; mWrappedCreatedRoot = wp; mWrappedCreated++; @@ -1132,11 +1132,11 @@ void UdpManager::WrappedCreated(WrappedLogicalPacket *wp) void UdpManager::WrappedDestroyed(WrappedLogicalPacket *wp) { - if (wp->mCreatedNext != NULL) + if (wp->mCreatedNext != nullptr) { wp->mCreatedNext->mCreatedPrev = wp->mCreatedPrev; } - if (wp->mCreatedPrev != NULL) + if (wp->mCreatedPrev != nullptr) { wp->mCreatedPrev->mCreatedNext = wp->mCreatedNext; } @@ -1146,9 +1146,9 @@ void UdpManager::WrappedDestroyed(WrappedLogicalPacket *wp) mWrappedCreatedRoot = wp->mCreatedNext; } - wp->mCreatedPrev = NULL; - wp->mCreatedNext = NULL; - wp->mUdpManager = NULL; + wp->mCreatedPrev = nullptr; + wp->mCreatedNext = nullptr; + wp->mUdpManager = nullptr; mWrappedCreated--; } @@ -1183,7 +1183,7 @@ LogicalPacket *UdpManager::CreatePacket(const void *data, int dataLen, const voi void UdpManager::PoolCreated(PooledLogicalPacket *packet) { packet->mCreatedNext = mPoolCreatedRoot; - if (mPoolCreatedRoot != NULL) + if (mPoolCreatedRoot != nullptr) mPoolCreatedRoot->mCreatedPrev = packet; mPoolCreatedRoot = packet; mPoolCreated++; @@ -1191,11 +1191,11 @@ void UdpManager::PoolCreated(PooledLogicalPacket *packet) void UdpManager::PoolDestroyed(PooledLogicalPacket *packet) { - if (packet->mCreatedNext != NULL) + if (packet->mCreatedNext != nullptr) { packet->mCreatedNext->mCreatedPrev = packet->mCreatedPrev; } - if (packet->mCreatedPrev != NULL) + if (packet->mCreatedPrev != nullptr) { packet->mCreatedPrev->mCreatedNext = packet->mCreatedNext; } @@ -1205,9 +1205,9 @@ void UdpManager::PoolDestroyed(PooledLogicalPacket *packet) mPoolCreatedRoot = packet->mCreatedNext; } - packet->mCreatedPrev = NULL; - packet->mCreatedNext = NULL; - packet->mUdpManager = NULL; + packet->mCreatedPrev = nullptr; + packet->mCreatedNext = nullptr; + packet->mUdpManager = nullptr; mPoolCreated--; } @@ -1282,7 +1282,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mLastClockSyncTime = 0; mDataHoldTime = 0; mGettingTime = false; - mHandler = NULL; + mHandler = nullptr; mNoDataTimeout = mUdpManager->mParams.noDataTimeout; mKeepAliveDelay = mUdpManager->mParams.keepAliveDelay; @@ -1290,13 +1290,13 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mMultiBufferData = new uchar[mUdpManager->mParams.maxRawPacketSize]; mMultiBufferPtr = mMultiBufferData; - mDisconnectPendingNextConnection = NULL; - mNextConnection = NULL; - mPrevConnection = NULL; + mDisconnectPendingNextConnection = nullptr; + mNextConnection = nullptr; + mPrevConnection = nullptr; mIcmpErrorRetryStartStamp = 0; // when the timer started for ICMP error retry delay (gets reset on a successful packet receive) mPortRemapRequestStartStamp = 0; - mEncryptXorBuffer = NULL; + mEncryptXorBuffer = nullptr; mEncryptExpansionBytes = 0; mOrderedCountOutgoing = 0; mOrderedCountOutgoing2 = 0; @@ -1307,7 +1307,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo mConnectionCreateTime = UdpMisc::Clock(); mSimulateQueueBytes = 0; - mPassThroughData = NULL; + mPassThroughData = nullptr; mSilentDisconnect = false; mLastSendBin = 0; @@ -1325,7 +1325,7 @@ void UdpConnection::Init(UdpManager *udpManager, UdpIpAddress destIp, int destPo UdpConnection::~UdpConnection() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) InternalDisconnect(0, mDisconnectReason); for (int i = 0; i < UdpManager::cReliableChannelCount; i++) @@ -1372,7 +1372,7 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason if (mStatus == cStatusNegotiating) flushTimeout = 0; - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { if (flushTimeout > 0) { @@ -1402,13 +1402,13 @@ void UdpConnection::InternalDisconnect(int flushTimeout, DisconnectReason reason } mUdpManager->RemoveConnection(this); - mUdpManager = NULL; + mUdpManager = nullptr; } mStatus = cStatusDisconnected; - if (startStatus != cStatusDisconnected && startUdpManager != NULL) + if (startStatus != cStatusDisconnected && startUdpManager != nullptr) { - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnTerminated(this); } } @@ -1442,7 +1442,7 @@ bool UdpConnection::Send(UdpChannel channel, const void *data, int dataLen) if (dataLen == 0) // zero length packets are ignored return(false); - assert(data != NULL); // can't send a null packet + assert(data != nullptr); // can't send a nullptr packet mUdpManager->mManagerStats.applicationPacketsSent++; mConnectionStats.applicationPacketsSent++; @@ -1459,7 +1459,7 @@ bool UdpConnection::Send(UdpChannel channel, const void *data, int dataLen) bool UdpConnection::Send(UdpChannel channel, const LogicalPacket *packet) { - assert(packet != NULL); // can't send a null packet + assert(packet != nullptr); // can't send a nullptr packet assert(channel >= 0 && channel < cUdpChannelCount); assert(mStatus != cStatusNegotiating); // you are not allowed to start sending data on a connection that is still in the process of negotiating (only applicable client-side obviously since servers never have connections in this state) @@ -1505,7 +1505,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data { uchar *bufPtr = tempBuffer; memcpy(bufPtr, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen, true); return(true); @@ -1518,9 +1518,9 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data bufPtr[1] = cUdpPacketOrdered2; UdpMisc::PutValue16(bufPtr + 2, (ushort)(++mOrderedCountOutgoing2 & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); - BufferedSend(bufPtr, totalDataLen + 4, NULL, 0, true); + BufferedSend(bufPtr, totalDataLen + 4, nullptr, 0, true); return(true); break; } @@ -1531,7 +1531,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data bufPtr[1] = cUdpPacketOrdered2; UdpMisc::PutValue16(bufPtr + 2, (ushort)(++mOrderedCountOutgoing2 & 0xffff)); memcpy(bufPtr + 4, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(bufPtr + 4 + dataLen, data2, dataLen2); PhysicalSend(bufPtr, totalDataLen + 4, true); return(true); @@ -1543,7 +1543,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const uchar *data, int data case cUdpChannelReliable4: { int num = channel - cUdpChannelReliable1; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->Send(data, dataLen, data2, dataLen2); return(true); @@ -1565,7 +1565,7 @@ bool UdpConnection::InternalSend(UdpChannel channel, const LogicalPacket *packet case cUdpChannelReliable4: { int num = channel - cUdpChannelReliable1; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->Send(packet); return(true); @@ -1605,9 +1605,9 @@ void UdpConnection::PingStatReset() void UdpConnection::GetStats(UdpConnectionStatistics *cs) const { - assert(cs != NULL); + assert(cs != nullptr); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; *cs = mConnectionStats; @@ -1623,13 +1623,13 @@ void UdpConnection::GetStats(UdpConnectionStatistics *cs) const if (cs->syncTheirSent > 0) cs->percentReceivedSuccess = (float)cs->syncOurReceived / (float)cs->syncTheirSent; cs->reliableAveragePing = 0; - if (mChannel[0] != NULL) + if (mChannel[0] != nullptr) cs->reliableAveragePing = mChannel[0]->GetAveragePing(); } void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (e->mBuffer[0] != 0 || e->mBuffer[1] != cUdpPacketUnreachableConnection) @@ -1731,7 +1731,7 @@ void UdpConnection::ProcessRawPacket(const UdpManager::PacketHistoryEntry *e) { mConnectionStats.crcRejectedPackets++; mUdpManager->mManagerStats.crcRejectedPackets++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnCrcReject(this, e->mBuffer, e->mLen); return; } @@ -1792,7 +1792,7 @@ void UdpConnection::CallbackRoutePacket(const uchar *data, int dataLen) mUdpManager->mManagerStats.applicationPacketsReceived++; mConnectionStats.applicationPacketsReceived++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnRoutePacket(this, data, dataLen); } } @@ -1801,7 +1801,7 @@ void UdpConnection::CallbackCorruptPacket(const uchar *data, int dataLen, UdpCor { mConnectionStats.corruptPacketErrors++; mUdpManager->mManagerStats.corruptPacketErrors++; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnPacketCorrupt(this, data, dataLen, reason); } @@ -1809,7 +1809,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) { uchar buf[256]; uchar *bufPtr; - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; if (data[0] == 0 && dataLen > 1) @@ -1882,7 +1882,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) mConnectionConfig = config; SetupEncryptModel(); mStatus = cStatusConnected; - if (mHandler != NULL) + if (mHandler != nullptr) mHandler->OnConnectComplete(this); } break; @@ -2112,7 +2112,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketFragment4: { int num = (data[1] - cUdpPacketReliable1) % UdpManager::cReliableChannelCount; - if (mChannel[num] == NULL) + if (mChannel[num] == nullptr) mChannel[num] = new UdpReliableChannel(num, this, &mUdpManager->mParams.reliable[num]); mChannel[num]->ReliablePacket(data, dataLen); break; @@ -2123,7 +2123,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketAck4: { int num = data[1] - cUdpPacketAck1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckPacket(data, dataLen); break; } @@ -2133,7 +2133,7 @@ void UdpConnection::ProcessCookedPacket(const uchar *data, int dataLen) case cUdpPacketAckAll4: { int num = data[1] - cUdpPacketAckAll1; - if (mChannel[num] != NULL) + if (mChannel[num] != nullptr) mChannel[num]->AckAllPacket(data, dataLen); break; } @@ -2173,7 +2173,7 @@ void UdpConnection::FlagPortUnreachable() void UdpConnection::GiveTime() { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; UdpManager *myManager = mUdpManager; @@ -2266,11 +2266,11 @@ void UdpConnection::InternalGiveTime() int totalPendingBytes = 0; for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { totalPendingBytes += mChannel[i]->TotalPendingBytes(); int myNext = mChannel[i]->GiveTime(); - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // giving the reliable channel time caused it to callback the application which may disconnect us nextSchedule = udpMin(nextSchedule, myNext); } @@ -2359,7 +2359,7 @@ void UdpConnection::InternalGiveTime() break; } - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { // safety to prevent us for scheduling ourselves for a time period that has already passed, // as doing so could result in infinite looping in the priority queue processing. @@ -2376,7 +2376,7 @@ int UdpConnection::TotalPendingBytes() const int total = 0; for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) total += mChannel[i]->TotalPendingBytes(); } return(total); @@ -2442,7 +2442,7 @@ int UdpConnection::ExpireReceiveBin() void UdpConnection::PhysicalSend(const uchar *data, int dataLen, bool appendAllowed) { - if (mUdpManager == NULL) + if (mUdpManager == nullptr) return; // if we attempt to do a physical send (ie. encrypt/compress/crc a packet) while we are not connected @@ -2540,8 +2540,8 @@ void UdpConnection::PhysicalSend(const uchar *data, int dataLen, bool appendAllo // function can do its job uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar *data2, int dataLen2, bool appendAllowed) { - if (mUdpManager == NULL) - return(NULL); + if (mUdpManager == nullptr) + return(nullptr); int used = mMultiBufferPtr - mMultiBufferData; int actualMaxDataHoldSize = udpMin(mUdpManager->mParams.maxDataHoldSize, mConnectionConfig.maxRawPacketSize); @@ -2556,7 +2556,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * FlushMultiBuffer(); // now send it (the multi-buffer is empty if you need to use it temporarily to concatenate two data chunks -- it is large enough to hold the largest raw packet) - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferData, data, dataLen); memcpy(mMultiBufferData + dataLen, data2, dataLen2); @@ -2564,7 +2564,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * } else PhysicalSend(data, dataLen, appendAllowed); - return(NULL); + return(nullptr); } // if this data will not fit into buffer @@ -2592,7 +2592,7 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * uchar *placementPtr = mMultiBufferPtr; memcpy(mMultiBufferPtr, data, dataLen); mMultiBufferPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) { memcpy(mMultiBufferPtr, data2, dataLen2); mMultiBufferPtr += dataLen2; @@ -2601,21 +2601,21 @@ uchar *UdpConnection::BufferedSend(const uchar *data, int dataLen, const uchar * if ((mMultiBufferPtr - mMultiBufferData) >= actualMaxDataHoldSize) { FlushMultiBuffer(); - placementPtr = NULL; // it got flushed + placementPtr = nullptr; // it got flushed } return(placementPtr); } uchar *UdpConnection::InternalAckSend(uchar *bufferedAckPtr, const uchar *ackPtr, int ackLen) { - if (bufferedAckPtr != NULL) + if (bufferedAckPtr != nullptr) { memcpy(bufferedAckPtr, ackPtr, ackLen); return(bufferedAckPtr); } - BufferedSend(ackPtr, ackLen, NULL, 0, false); - return(NULL); // FIX THIS + BufferedSend(ackPtr, ackLen, nullptr, 0, false); + return(nullptr); // FIX THIS } void UdpConnection::FlushMultiBuffer() @@ -2631,7 +2631,7 @@ void UdpConnection::FlushMultiBuffer() // notify all the reliable channels to clear their buffered acks for (int i = 0; i < UdpManager::cReliableChannelCount; i++) { - if (mChannel[i] != NULL) + if (mChannel[i] != nullptr) { mChannel[i]->ClearBufferedAck(); } @@ -2656,7 +2656,7 @@ int UdpConnection::DecryptNone(uchar *destData, const uchar *sourceData, int sou int UdpConnection::EncryptUserSupplied(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedEncrypt(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2665,7 +2665,7 @@ int UdpConnection::EncryptUserSupplied(uchar *destData, const uchar *sourceData, int UdpConnection::DecryptUserSupplied(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedDecrypt(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2674,7 +2674,7 @@ int UdpConnection::DecryptUserSupplied(uchar *destData, const uchar *sourceData, int UdpConnection::EncryptUserSupplied2(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedEncrypt2(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2683,7 +2683,7 @@ int UdpConnection::EncryptUserSupplied2(uchar *destData, const uchar *sourceData int UdpConnection::DecryptUserSupplied2(uchar *destData, const uchar *sourceData, int sourceLen) { UdpManagerHandler *manHandler = mUdpManager->GetHandler(); - if (manHandler != NULL) + if (manHandler != nullptr) return(manHandler->OnUserSuppliedDecrypt2(this, destData, sourceData, sourceLen)); assert(0); // if user-supplied encryption is specified, then you must have a manager handler installed to provide the routines return(0); @@ -2833,7 +2833,7 @@ void UdpConnection::SetupEncryptModel() mEncryptExpansionBytes += 0; // set up encrypt buffer (random numbers generated based on seed) - if (mEncryptXorBuffer == NULL) + if (mEncryptXorBuffer == nullptr) { int len = ((mUdpManager->mParams.maxRawPacketSize + 1) / 4) * 4; mEncryptXorBuffer = new uchar[len]; @@ -2865,7 +2865,7 @@ void UdpConnection::GetChannelStatus(UdpChannel channel, ChannelStatus *channelS case cUdpChannelReliable2: case cUdpChannelReliable3: case cUdpChannelReliable4: - if (mChannel[channel - cUdpChannelReliable1] != NULL) + if (mChannel[channel - cUdpChannelReliable1] != nullptr) { mChannel[channel - cUdpChannelReliable1]->GetChannelStatus(channelStatus); } @@ -2941,12 +2941,12 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mLogicalPacketsQueued = 0; mLogicalBytesQueued = 0; - mCoalescePacket = NULL; - mCoalesceStartPtr = NULL; - mCoalesceEndPtr = NULL; + mCoalescePacket = nullptr; + mCoalesceStartPtr = nullptr; + mCoalesceEndPtr = nullptr; mCoalesceCount = 0; - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; mStatDuplicatePacketsReceived = 0; mStatResentPacketsAccelerated = 0; @@ -2960,7 +2960,7 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; mFragmentNextPos = 0; mLastTimeStampAcknowledged = 0; mMaxxedOutCurrentWindow = false; @@ -2969,23 +2969,23 @@ UdpReliableChannel::UdpReliableChannel(int channelNumber, UdpConnection *con, Ud mPhysicalPackets = new PhysicalPacket[mConfig.maxOutstandingPackets]; mReliableIncoming = new IncomingQueueEntry[mConfig.maxInstandingPackets]; - mLogicalRoot = NULL; - mLogicalEnd = NULL; + mLogicalRoot = nullptr; + mLogicalEnd = nullptr; } UdpReliableChannel::~UdpReliableChannel() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } const LogicalPacket *cur = mLogicalRoot; - while (cur != NULL) + while (cur != nullptr) { const LogicalPacket *next = cur->mReliableQueueNext; - cur->mReliableQueueNext = NULL; // make sure and mark it available so others could possibly use it (if it is a shared logical packet) + cur->mReliableQueueNext = nullptr; // make sure and mark it available so others could possibly use it (if it is a shared logical packet) cur->Release(); if (cur == next) // pointing to self, so this is end of list break; @@ -3052,7 +3052,7 @@ void UdpReliableChannel::Send(const LogicalPacket *packet) void UdpReliableChannel::FlushCoalesce() { - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) { if (mCoalesceCount == 1) { @@ -3069,16 +3069,16 @@ void UdpReliableChannel::FlushCoalesce() } mCoalescePacket->Release(); - mCoalescePacket = NULL; + mCoalescePacket = nullptr; } } void UdpReliableChannel::SendCoalesce(const uchar *data, int dataLen, const uchar *data2, int dataLen2) { int totalLen = dataLen + dataLen2; - if (mCoalescePacket == NULL) + if (mCoalescePacket == nullptr) { - mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(NULL, mMaxDataBytes); + mCoalescePacket = mUdpConnection->mUdpManager->CreatePacket(nullptr, mMaxDataBytes); mCoalesceEndPtr = mCoalesceStartPtr = (uchar *)mCoalescePacket->GetDataPtr(); *mCoalesceEndPtr++ = 0; *mCoalesceEndPtr++ = UdpConnection::cUdpPacketGroup; @@ -3098,10 +3098,10 @@ void UdpReliableChannel::SendCoalesce(const uchar *data, int dataLen, const ucha // append on end of coalesce mCoalesceCount++; mCoalesceEndPtr += UdpMisc::PutVariableValue(mCoalesceEndPtr, totalLen); - if (data != NULL) + if (data != nullptr) memcpy(mCoalesceEndPtr, data, dataLen); mCoalesceEndPtr += dataLen; - if (data2 != NULL) + if (data2 != nullptr) memcpy(mCoalesceEndPtr, data2, dataLen2); mCoalesceEndPtr += dataLen2; } @@ -3111,7 +3111,7 @@ void UdpReliableChannel::QueueLogicalPacket(const LogicalPacket *packet) mLogicalPacketsQueued++; mLogicalBytesQueued += packet->GetDataLen(); - if (packet->mReliableQueueNext != NULL) + if (packet->mReliableQueueNext != nullptr) { packet = mUdpConnection->mUdpManager->WrappedBorrow(packet); } @@ -3121,13 +3121,13 @@ void UdpReliableChannel::QueueLogicalPacket(const LogicalPacket *packet) } packet->mReliableQueueNext = packet; // have it point to itself to signify that the mNext pointer is taken (ie. reserve it), yet still represents the end of the list - if (mLogicalEnd != NULL) + if (mLogicalEnd != nullptr) { mLogicalEnd->mReliableQueueNext = packet; } mLogicalEnd = packet; - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) { mLogicalRoot = packet; } @@ -3148,10 +3148,10 @@ bool UdpReliableChannel::PullDown(int windowSpaceLeft) int physicalCount = (int)(mReliableOutgoingId - mReliableOutgoingPendingId); while (windowSpaceLeft > 0 && physicalCount < mConfig.maxOutstandingPackets) { - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) { FlushCoalesce(); // this is guaranteed to stick - if (mLogicalRoot == NULL) + if (mLogicalRoot == nullptr) break; // nothing flushed, so we are done } @@ -3191,10 +3191,10 @@ bool UdpReliableChannel::PullDown(int windowSpaceLeft) mLogicalRoot = mLogicalRoot->mReliableQueueNext; if (mLogicalRoot == lp) // ie, we were pointing to ourself, meaning we were the end of the list { - mLogicalRoot = NULL; - mLogicalEnd = NULL; + mLogicalRoot = nullptr; + mLogicalEnd = nullptr; } - lp->mReliableQueueNext = NULL; // clear our next link since we are no longer using it (so somebody else can use it potentially) + lp->mReliableQueueNext = nullptr; // clear our next link since we are no longer using it (so somebody else can use it potentially) lp->Release(); // release from logical queue } else @@ -3249,9 +3249,9 @@ int UdpReliableChannel::GiveTime() // this next branch was replaced by JeffP in the latest UdpLibrary drop. Please integrate // that. If something catestrophic happens with reliable channels, uncomment this next line to // replace the existing branch - //if (mReliableOutgoingId < mReliableOutgoingPendingId || mLogicalRoot != NULL || mCoalescePacket != NULL) + //if (mReliableOutgoingId < mReliableOutgoingPendingId || mLogicalRoot != nullptr || mCoalescePacket != nullptr) - if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalRoot != NULL || mCoalescePacket != NULL) + if (mReliableOutgoingPendingId < mReliableOutgoingId || mLogicalRoot != nullptr || mCoalescePacket != nullptr) { // first, let's calculate how many bytes we figure is outstanding based on who is still waiting for an ack-packet UdpMisc::ClockStamp oldestResendTime = udpMax(hotClock - optimalResendDelay, mLastTimeStampAcknowledged); // anything older than this, we need to resend @@ -3276,7 +3276,7 @@ int UdpReliableChannel::GiveTime() // if this packet has not been acked and it is NOT ready to be sent (was recently sent) then we consider it outstanding // note: packets needing re-sending probably got lost and are therefore not outstanding PhysicalPacket *entry = &mPhysicalPackets[i % mConfig.maxOutstandingPackets]; - if (entry->mDataPtr != NULL) // acked packets set the dataPtr to NULL + if (entry->mDataPtr != nullptr) // acked packets set the dataPtr to nullptr { // if this packet is ready to be sent (ie: needs time now, or some later packet has already been ack'ed) windowSpaceLeft -= entry->mDataLen; // window-space is effectively taken whether we have sent it yet or not @@ -3436,7 +3436,7 @@ int UdpReliableChannel::GiveTime() void UdpReliableChannel::GetChannelStatus(UdpConnection::ChannelStatus *channelStatus) const { int coalesceBytes = 0; - if (mCoalescePacket != NULL) + if (mCoalescePacket != nullptr) coalesceBytes = mCoalesceEndPtr - mCoalesceStartPtr; channelStatus->totalPendingBytes = mLogicalBytesQueued + mReliableOutgoingBytes + coalesceBytes; @@ -3497,7 +3497,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) mReliableIncomingId++; // process other packets that have arrived - while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != NULL) + while (mReliableIncoming[mReliableIncomingId % mConfig.maxInstandingPackets].mPacket != nullptr) { int spot = (int)(mReliableIncomingId % mConfig.maxInstandingPackets); if (mReliableIncoming[spot].mMode != cReliablePacketModeDelivered) @@ -3506,7 +3506,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) } mReliableIncoming[spot].mPacket->Release(); - mReliableIncoming[spot].mPacket = NULL; + mReliableIncoming[spot].mPacket = nullptr; mReliableIncomingId++; } } @@ -3514,7 +3514,7 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) { // not the one we need next, but it is later than the one we need , so store it in our buffer until it's turn comes up int spot = (int)(reliableId % mConfig.maxInstandingPackets); - if (mReliableIncoming[spot].mPacket == NULL) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) + if (mReliableIncoming[spot].mPacket == nullptr) // only make the copy of it if we don't already have it in our buffer (in cases where it was sent twice, there would be no harm in the copy again since it must be the same packet, it's just inefficient) { mReliableIncoming[spot].mMode = mode; mReliableIncoming[spot].mPacket = mUdpConnection->mUdpManager->CreatePacket(data + UdpConnection::cUdpPacketReliableSize, dataLen - UdpConnection::cUdpPacketReliableSize); @@ -3556,16 +3556,16 @@ void UdpReliableChannel::ReliablePacket(const uchar *data, int dataLen) // a simple ack for us only *bufPtr++ = (uchar)(UdpConnection::cUdpPacketAck1 + mChannelNumber); bufPtr += UdpMisc::PutValue16(bufPtr, (ushort)(reliableId & 0xffff)); - mBufferedAckPtr = NULL; // not allowed to replace an old one with a selective-ack + mBufferedAckPtr = nullptr; // not allowed to replace an old one with a selective-ack } - if (mBufferedAckPtr != NULL && mConfig.ackDeduping) + if (mBufferedAckPtr != nullptr && mConfig.ackDeduping) { memcpy(mBufferedAckPtr, buf, bufPtr - buf); } else { - mBufferedAckPtr = mUdpConnection->BufferedSend(buf, bufPtr - buf, NULL, 0, true); // safe to append on our data, it is stack data + mBufferedAckPtr = mUdpConnection->BufferedSend(buf, bufPtr - buf, nullptr, 0, true); // safe to append on our data, it is stack data } } @@ -3582,7 +3582,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const uchar *dat else if (mode == cReliablePacketModeFragment) { // append onto end of big packet (or create new big packet if not existing already) - if (mBigDataPtr == NULL) + if (mBigDataPtr == nullptr) { mBigDataTargetLen = UdpMisc::GetValue32(data); // first fragment has a total-length int header on it. mBigDataPtr = new uchar[mBigDataTargetLen]; @@ -3611,7 +3611,7 @@ void UdpReliableChannel::ProcessPacket(ReliablePacketMode mode, const uchar *dat delete[] mBigDataPtr; mBigDataLen = 0; mBigDataTargetLen = 0; - mBigDataPtr = NULL; + mBigDataPtr = nullptr; } } } @@ -3641,7 +3641,7 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) int pos = (int)(reliableId % mConfig.maxOutstandingPackets); PhysicalPacket *entry = &mPhysicalPackets[pos]; - if (entry->mDataPtr != NULL) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) + if (entry->mDataPtr != nullptr) // if this packet has not been acknowledged yet (sometimes we get back two acks for the same packet) { mNextNeedTime = 0; // something got acked, so we actually need to take the time next time it is offered @@ -3699,14 +3699,14 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) // this packet we have queued has been acknowledged, so delete it from queue mReliableOutgoingBytes -= entry->mDataLen; entry->mDataLen = 0; - entry->mDataPtr = NULL; + entry->mDataPtr = nullptr; entry->mParent->Release(); - entry->mParent = NULL; + entry->mParent = nullptr; // advance the pending ptr until it reaches outgoingId or an entry that has yet to acknowledged while (mReliableOutgoingPendingId < mReliableOutgoingId) { - if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != NULL) + if (mPhysicalPackets[mReliableOutgoingPendingId % mConfig.maxOutstandingPackets].mDataPtr != nullptr) break; mReliableOutgoingPendingId++; } @@ -3728,25 +3728,25 @@ void UdpReliableChannel::Ack(udp_int64 reliableId) UdpReliableChannel::IncomingQueueEntry::IncomingQueueEntry() { - mPacket = NULL; + mPacket = nullptr; mMode = UdpReliableChannel::cReliablePacketModeReliable; } UdpReliableChannel::IncomingQueueEntry::~IncomingQueueEntry() { - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->Release(); } UdpReliableChannel::PhysicalPacket::PhysicalPacket() { - mParent = NULL; + mParent = nullptr; } UdpReliableChannel::PhysicalPacket::~PhysicalPacket() { - if (mParent != NULL) + if (mParent != nullptr) mParent->Release(); } @@ -3758,7 +3758,7 @@ UdpReliableChannel::PhysicalPacket::~PhysicalPacket() LogicalPacket::LogicalPacket() { mRefCount = 1; - mReliableQueueNext = NULL; + mReliableQueueNext = nullptr; } LogicalPacket::~LogicalPacket() @@ -3793,7 +3793,7 @@ SimpleLogicalPacket::SimpleLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; mData = new uchar[mDataLen]; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -3828,7 +3828,7 @@ void SimpleLogicalPacket::SetDataLen(int len) GroupLogicalPacket::GroupLogicalPacket() : LogicalPacket() { mDataLen = 0; - mData = NULL; + mData = nullptr; } GroupLogicalPacket::~GroupLogicalPacket() @@ -3838,13 +3838,13 @@ GroupLogicalPacket::~GroupLogicalPacket() void GroupLogicalPacket::AddPacket(const LogicalPacket *packet) { - assert(packet != NULL); + assert(packet != nullptr); AddPacketInternal(packet->GetDataPtr(), packet->GetDataLen(), packet->IsInternalPacket()); } void GroupLogicalPacket::AddPacket(const void *data, int dataLen) { - assert(data != NULL); + assert(data != nullptr); assert(dataLen >= 0); AddPacketInternal(data, dataLen, false); } @@ -3910,16 +3910,16 @@ PooledLogicalPacket::PooledLogicalPacket(UdpManager *manager, int len) mDataLen = 0; mUdpManager = manager; - mAvailableNext = NULL; - mCreatedNext = NULL; - mCreatedPrev = NULL; + mAvailableNext = nullptr; + mCreatedNext = nullptr; + mCreatedPrev = nullptr; mUdpManager->PoolCreated(this); } PooledLogicalPacket::~PooledLogicalPacket() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->PoolDestroyed(this); } @@ -3934,7 +3934,7 @@ void PooledLogicalPacket::AddRef() const void PooledLogicalPacket::Release() const { - if (mRefCount == 1 && mUdpManager != NULL) + if (mRefCount == 1 && mUdpManager != nullptr) mUdpManager->PoolReturn(const_cast(this)); // if pool wants to keep us, it will inc our ref count, preventing our destruction // we cast off our const, as when we are added back to the pool, we can be modified LogicalPacket::Release(); @@ -3964,9 +3964,9 @@ void PooledLogicalPacket::SetDataLen(int len) void PooledLogicalPacket::SetData(const void *data, int dataLen, const void *data2, int dataLen2) { mDataLen = dataLen + dataLen2; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(mData + dataLen, data2, dataLen2); } @@ -3977,23 +3977,23 @@ void PooledLogicalPacket::SetData(const void *data, int dataLen, const void *dat /////////////////////////////////////////////////////////////////////////////////////////// WrappedLogicalPacket::WrappedLogicalPacket(UdpManager *udpManager) { - mPacket = NULL; + mPacket = nullptr; mUdpManager = udpManager; - mAvailableNext = NULL; - mCreatedNext = NULL; - mCreatedPrev = NULL; + mAvailableNext = nullptr; + mCreatedNext = nullptr; + mCreatedPrev = nullptr; mUdpManager->WrappedCreated(this); } WrappedLogicalPacket::~WrappedLogicalPacket() { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) { mUdpManager->WrappedDestroyed(this); } - if (mPacket != NULL) + if (mPacket != nullptr) { mPacket->Release(); } @@ -4006,7 +4006,7 @@ void WrappedLogicalPacket::AddRef() const void WrappedLogicalPacket::Release() const { - if (mRefCount == 1 && mUdpManager != NULL) + if (mRefCount == 1 && mUdpManager != nullptr) mUdpManager->WrappedReturn(const_cast(this)); // if pool wants to keep us, it will inc our ref count, preventing our destruction // we cast off our const, as when we are added back to the pool, we can be modified LogicalPacket::Release(); @@ -4014,10 +4014,10 @@ void WrappedLogicalPacket::Release() const void WrappedLogicalPacket::SetLogicalPacket(const LogicalPacket *packet) { - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->Release(); mPacket = packet; - if (mPacket != NULL) + if (mPacket != nullptr) mPacket->AddRef(); } @@ -4053,7 +4053,7 @@ UdpManager::SimulateQueueEntry::SimulateQueueEntry(const uchar *data, int dataLe memcpy(mData, data, dataLen); mIp = ip; mPort = port; - mNext = NULL; + mNext = nullptr; } UdpManager::SimulateQueueEntry::~SimulateQueueEntry() @@ -4088,7 +4088,7 @@ UdpMisc::ClockStamp UdpMisc::Clock() static ClockStamp sLastStamp = 0; static ClockStamp sCurrentCorrection = 0; struct timeval tv; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); UdpMisc::ClockStamp cs = static_cast(tv.tv_sec) * 1000 + static_cast(tv.tv_usec / 1000); cs += sCurrentCorrection; if (cs < sLastStamp) @@ -4204,19 +4204,19 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) if (bytes == 0) { - if (ptr != NULL) + if (ptr != nullptr) { free((uchar *)ptr - cAlignment); } - return(NULL); + return(nullptr); } uchar *ptr2; - if (ptr == NULL) + if (ptr == nullptr) { ptr2 = (uchar *)malloc(bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); } @@ -4226,8 +4226,8 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round) return(ptr); ptr2 = (uchar *)realloc((uchar *)ptr - cAlignment, bytes + cAlignment); - if (ptr2 == NULL) - return(NULL); + if (ptr2 == nullptr) + return(nullptr); *(int *)ptr2 = bytes; return(ptr2 + cAlignment); @@ -4290,30 +4290,30 @@ LogicalPacket *UdpMisc::CreateQuickLogicalPacket(const void *data, int dataLen, switch(q) { case 0: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 1: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 2: case 3: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; case 4: case 5: case 6: case 7: - tlp = new FixedLogicalPacket(NULL, totalDataLen); + tlp = new FixedLogicalPacket(nullptr, totalDataLen); break; default: - tlp = new SimpleLogicalPacket(NULL, totalDataLen); + tlp = new SimpleLogicalPacket(nullptr, totalDataLen); break; } uchar *dest = (uchar *)tlp->GetDataPtr(); - if (data != NULL) + if (data != nullptr) memcpy(dest, data, dataLen); - if (data2 != NULL) + if (data2 != nullptr) memcpy(dest + dataLen, data2, dataLen2); return(tlp); } @@ -4327,7 +4327,7 @@ UdpIpAddress UdpMisc::GetHostByName(const char *hostName) { struct hostent * lphp; lphp = gethostbyname(hostName); - if (lphp == NULL) + if (lphp == nullptr) { address = 0; } diff --git a/external/3rd/library/udplibrary/UdpLibrary.hpp b/external/3rd/library/udplibrary/UdpLibrary.hpp index 43a20328..39f05a43 100644 --- a/external/3rd/library/udplibrary/UdpLibrary.hpp +++ b/external/3rd/library/udplibrary/UdpLibrary.hpp @@ -148,7 +148,7 @@ class UdpMisc // memory manager does a little bit of this, but if you know you have an allocation that is likely // to grow quite a bit, you can set the round'ing size up to a fairly large number and avoid // unnecessary reallocs at the cost of a little potentially wasted space - // initial allocations are done by passing in ptr==NULL, freeing is done by passing in bytes==0 + // initial allocations are done by passing in ptr==nullptr, freeing is done by passing in bytes==0 static void *SmartResize(void *ptr, int bytes, int round = 1); // the following two functions store values in the buffer as a variable length (B1, 0xffB2B1, 0xffffffB4B3B2B1) @@ -168,7 +168,7 @@ class UdpMisc static uint GetValue24(const void *buffer); // gets a 24-bit value from the buffer in big-endian format static ushort GetValue16(const void *buffer); // gets a 16-bit value from the buffer in big-endian format - static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + static LogicalPacket *CreateQuickLogicalPacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); // looks up the specified name and translates it to an IP address // this is a blocking call that can at times take a significant amount of time, but will generally be fast (less than 300ms) @@ -241,7 +241,7 @@ class LogicalPacket protected: friend class UdpReliableChannel; mutable const LogicalPacket *mReliableQueueNext; // owned/managed by the reliable channel object as an optimizations, do not touch - // NULL = unclaimed, point-to-self = claimed, but end of list + // nullptr = unclaimed, point-to-self = claimed, but end of list }; class SimpleLogicalPacket : public LogicalPacket @@ -250,7 +250,7 @@ class SimpleLogicalPacket : public LogicalPacket // it was originally created to allow the internal code to handle reliable data that was sent // via the Send(char *, int) api call. public: - SimpleLogicalPacket(const void *data, int dataLen); // data can be NULL if you want to populate it after it is allocated (get the pointer and write to it) + SimpleLogicalPacket(const void *data, int dataLen); // data can be nullptr if you want to populate it after it is allocated (get the pointer and write to it) virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -321,7 +321,7 @@ template class StructLogicalPacket : public LogicalPacket // with virtual functions) via this method as they may contain hidden data-members (such as pointers // to vtables). public: - StructLogicalPacket(T *initData = NULL); + StructLogicalPacket(T *initData = nullptr); virtual void *GetDataPtr(); virtual const void *GetDataPtr() const; virtual int GetDataLen() const; @@ -394,7 +394,7 @@ class PooledLogicalPacket : public LogicalPacket int mMaxDataLen; protected: friend class UdpManager; - void SetData(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + void SetData(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); UdpManager *mUdpManager; PooledLogicalPacket *mAvailableNext; PooledLogicalPacket *mCreatedNext; @@ -474,7 +474,7 @@ class UdpManager // pointer equal to your object and the UdpManager will call it as appropriate. The UdpConnection object // also has a handler mechanism that replaces the other callback functions below, see UdpConnection::SetHandler // if a handler is specified, the callback function is ignored, even if specified. - // default = NULL (not used) + // default = nullptr (not used) UdpManagerHandler *handler; // this is the maximum number of connections that can be established by this manager, any incoming/outgoing connections @@ -883,7 +883,7 @@ class UdpManager // will call EstablishConnection, then sit in a loop calling UdpManager::GiveTime and checking to see // if the status of the returned UdpConnection object is changed from cStatusNegotiating. This allows // the application to look for the ESC key or timeout an attempted connection. - // This function will return NULL if the manager object has exceeded its maximum number of connections + // This function will return nullptr if the manager object has exceeded its maximum number of connections // or if the serverAddress cannot be resolved to an IP address // as is noted in the declaration, it is the responsibility of the application establishing the connection to delete it // setting the timeout value (in milliseconds) to something greater than 0 will cause the UdpConnection object to change @@ -915,13 +915,13 @@ class UdpManager // manually forces all live connections to flush their multi buffers immediately void FlushAllMultiBuffer(); - // creates a logical packet and populates it with data. data can be NULL, in which case it gives you logical packet + // creates a logical packet and populates it with data. data can be nullptr, in which case it gives you logical packet // of the size specified, but copies no data into it. If you are using pool management (see Params::poolPacketMax), // it will give you a packet out of the pool if possible, otherwise it will create a packet for you. When logical // are packets are needed internally for various things (like reliable channel sends that use the (void *, int) interface) // they are gotten from this function, so your application can likely take advantage of pooling, even if it never bothers // to explicitly call this function. - LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = NULL, int dataLen2 = 0); + LogicalPacket *CreatePacket(const void *data, int dataLen, const void *data2 = nullptr, int dataLen2 = 0); protected: friend class PooledLogicalPacket; @@ -1147,7 +1147,7 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, int ConnectionAge() const; // returns the UdpManager object that is managing this connection - // will return NULL if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) + // will return nullptr if the connection has been disconnected for some reason (because disconnecting severes the link to UdpManager) UdpManager *GetUdpManager() const; // returns the 32-bit encryption-code that was negotiated as part of the connection-establishment process. @@ -1227,9 +1227,9 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, friend class UdpManager; friend class UdpReliableChannel; - // note: if connectPacket is NULL, that means this connection object is being created to establish + // note: if connectPacket is nullptr, that means this connection object is being created to establish // a new connection to the specified ip/port (ie. the connection starts out in cStatusNegotiating mode) - // if connectPacket is non-NULL, that menas this connection object is being created to handle an + // if connectPacket is non-nullptr, that menas this connection object is being created to handle an // incoming connect request and it will start out in cStatusConnected mode. UdpConnection(UdpManager *udpManager, UdpIpAddress destIp, int destPort, int timeout); // starts connection-establishment protocol UdpConnection(UdpManager *udpManager, const UdpManager::PacketHistoryEntry *e); // starts already connected, replying to connection request @@ -1264,7 +1264,7 @@ class UdpConnection : public PriorityQueueMember, public AddressHashTableMember, void PhysicalSend(const uchar *data, int dataLen, bool appendAllowed); // sends a physical packet (encrypts and adds crc bytes) uchar *BufferedSend(const uchar *data, int dataLen, const uchar *data2, int dataLen2, bool appendAllowed); // buffers logical packets waiting til we have more data (makes multi-packets) bool InternalSend(UdpChannel channel, const LogicalPacket *packet); - bool InternalSend(UdpChannel channel, const uchar *data, int dataLen, const uchar *data2 = NULL, int dataLen2 = 0); + bool InternalSend(UdpChannel channel, const uchar *data, int dataLen, const uchar *data2 = nullptr, int dataLen2 = 0); uchar *InternalAckSend(uchar *bufferedAckPtr, const uchar *ackPtr, int ackLen); // used by reliable channel to send acks (special send that allows for deduping ack feature) @@ -1555,7 +1555,7 @@ class UdpReliableChannel void ProcessPacket(ReliablePacketMode mode, const uchar *data, int dataLen); bool PullDown(int windowSpaceLeft); void FlushCoalesce(); - void SendCoalesce(const uchar *data, int dataLen, const uchar *data2 = NULL, int dataLen2 = 0); + void SendCoalesce(const uchar *data, int dataLen, const uchar *data2 = nullptr, int dataLen2 = 0); void QueueLogicalPacket(const LogicalPacket *packet); UdpManager::ReliableConfig mConfig; @@ -1609,7 +1609,7 @@ class UdpReliableChannel template FixedLogicalPacket::FixedLogicalPacket(const void *data, int dataLen) { mDataLen = dataLen; - if (data != NULL) + if (data != nullptr) memcpy(mData, data, mDataLen); } @@ -1639,7 +1639,7 @@ template void FixedLogicalPacket::SetDataLen(int l ///////////////////////////////////////////////////////////////////////// template StructLogicalPacket::StructLogicalPacket(T *initData) { - if (initData != NULL) + if (initData != nullptr) mStruct = *initData; } @@ -1784,7 +1784,7 @@ inline void UdpManager::SetPriority(UdpConnection *con, UdpMisc::ClockStamp stam if (stamp < mMinimumScheduledStamp) stamp = mMinimumScheduledStamp; - if (mPriorityQueue != NULL) + if (mPriorityQueue != nullptr) mPriorityQueue->Add(con, stamp); } @@ -1811,7 +1811,7 @@ inline void UdpManager::PoolReturn(PooledLogicalPacket *packet) inline void UdpManager::WrappedReturn(WrappedLogicalPacket *wp) { - wp->SetLogicalPacket(NULL); + wp->SetLogicalPacket(nullptr); if (mWrappedAvailable < mParams.wrappedPoolMax) { @@ -1859,7 +1859,7 @@ inline void UdpConnection::ScheduleTimeNow() // prevents us from reprioritizing to 0, only to shortly thereafter be reprioritized to where we actually belong. if (!mGettingTime) { - if (mUdpManager != NULL) + if (mUdpManager != nullptr) mUdpManager->SetPriority(this, 0); } } @@ -2048,7 +2048,7 @@ inline int UdpReliableChannel::TotalPendingBytes() const inline void UdpReliableChannel::ClearBufferedAck() { - mBufferedAckPtr = NULL; + mBufferedAckPtr = nullptr; } inline udp_int64 UdpReliableChannel::GetReliableOutgoingId(int reliableStamp) const diff --git a/external/3rd/library/udplibrary/hashtable.hpp b/external/3rd/library/udplibrary/hashtable.hpp index 8c7340bc..f37a40e1 100644 --- a/external/3rd/library/udplibrary/hashtable.hpp +++ b/external/3rd/library/udplibrary/hashtable.hpp @@ -175,11 +175,11 @@ template class HashTable bool Remove(T& obj, int hashValue); void Reset(); // removes all entries from the table - T *FindFirst(int hashValue) const; // returns NULL if not found - T *FindNext(T *prevResult) const; // returns NULL if not found + T *FindFirst(int hashValue) const; // returns nullptr if not found + T *FindNext(T *prevResult) const; // returns nullptr if not found - T *WalkFirst() const; // returns NULL if not found - T *WalkNext(T *prevResult) const; // returns NULL if not found + T *WalkFirst() const; // returns nullptr if not found + T *WalkNext(T *prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -201,7 +201,7 @@ template class HashTable template HashTable::HashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -221,9 +221,9 @@ template void HashTable::Insert(T& obj, int hashValue) entry->hashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - entry->nextEntry = NULL; + entry->nextEntry = nullptr; mTable[spot] = entry; mStatUsedSlots++; } @@ -240,14 +240,14 @@ template bool HashTable::Remove(T& obj, int hashValue) int spot = ((unsigned)hashValue) % mTableSize; HashEntry* next = mTable[spot]; HashEntry** prev = &mTable[spot]; - while (next != NULL) + while (next != nullptr) { if (next->obj == obj && next->hashValue == hashValue) { *prev = next->nextEntry; delete next; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -264,17 +264,17 @@ template void HashTable::Reset() for (int spot = 0; spot < mTableSize; spot++) { HashEntry *curr = mTable[spot]; - if (curr != NULL) + if (curr != nullptr) { mStatUsedSlots--; - while (curr != NULL) + while (curr != nullptr) { HashEntry *next = curr->nextEntry; delete curr; mEntryCount--; curr = next; } - mTable[spot] = NULL; + mTable[spot] = nullptr; } } } @@ -282,13 +282,13 @@ template void HashTable::Reset() template T *HashTable::FindFirst(int hashValue) const { HashEntry *entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::FindNext(T *prevResult) const @@ -296,13 +296,13 @@ template T *HashTable::FindNext(T *prevResult) const HashEntry *entry = (HashEntry *)(((char *)prevResult) - offsetof(HashEntry, obj)); int hashValue = entry->hashValue; entry = entry->nextEntry; - while (entry != NULL) + while (entry != nullptr) { if (entry->hashValue == hashValue) return(&entry->obj); entry = entry->nextEntry; } - return(NULL); + return(nullptr); } template T *HashTable::WalkFirst() const @@ -310,10 +310,10 @@ template T *HashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template T *HashTable::WalkNext(T *prevResult) const @@ -322,17 +322,17 @@ template T *HashTable::WalkNext(T *prevResult) const int bucket = ((unsigned)entry->hashValue) % mTableSize; entry = entry->nextEntry; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { HashEntry *entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(&entry->obj); } - return(NULL); + return(nullptr); } template void HashTable::Resize(int hashSize) @@ -352,16 +352,16 @@ template void HashTable::Resize(int hashSize) for (int i = 0; i < oldSize; i++) { HashEntry* next = oldTable[i]; - while (next != NULL) + while (next != nullptr) { HashEntry* hold = next; next = next->nextEntry; // insert hold into new table int spot = ((unsigned)hold->hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - hold->nextEntry = NULL; + hold->nextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } @@ -415,11 +415,11 @@ template class ObjectHashTable bool Remove(T obj, int hashValue); void Reset(); // removes all entries from the table - T FindFirst(int hashValue) const; // returns NULL if not found - T FindNext(T prevResult) const; // returns NULL if not found + T FindFirst(int hashValue) const; // returns nullptr if not found + T FindNext(T prevResult) const; // returns nullptr if not found - T WalkFirst() const; // returns NULL if not found - T WalkNext(T prevResult) const; // returns NULL if not found + T WalkFirst() const; // returns nullptr if not found + T WalkNext(T prevResult) const; // returns nullptr if not found void Resize(int hashSize); // the actual hash size will be rounded up to the next larger prime number (very slow, not recommended) void GetStatistics(HashTableStatistics *stats) const; @@ -434,7 +434,7 @@ template class ObjectHashTable template ObjectHashTable::ObjectHashTable(int hashSize) { - mTable = NULL; + mTable = nullptr; mTableSize = 0; mEntryCount = 0; mStatUsedSlots = 0; @@ -452,9 +452,9 @@ template void ObjectHashTable::Insert(T obj, int hashValue) obj->mHashValue = hashValue; int spot = ((unsigned)hashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - obj->mHashNextEntry = NULL; + obj->mHashNextEntry = nullptr; mTable[spot] = obj; mStatUsedSlots++; } @@ -471,14 +471,14 @@ template bool ObjectHashTable::Remove(T obj, int hashValue) int spot = ((unsigned)hashValue) % mTableSize; T next = mTable[spot]; T *prev = &mTable[spot]; - while (next != NULL) + while (next != nullptr) { if (next == obj) { *prev = (T)next->mHashNextEntry; - next->mHashNextEntry = NULL; + next->mHashNextEntry = nullptr; mEntryCount--; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) mStatUsedSlots--; return(true); break; @@ -495,16 +495,16 @@ template void ObjectHashTable::Reset() for (int spot = 0; spot < mTableSize; spot++) { T curr = mTable[spot]; - if (curr != NULL) + if (curr != nullptr) { - while (curr != NULL) + while (curr != nullptr) { T next = (T)curr->mHashNextEntry; - curr->mHashNextEntry = NULL; + curr->mHashNextEntry = nullptr; mEntryCount--; curr = next; } - mTable[spot] = NULL; + mTable[spot] = nullptr; mStatUsedSlots--; } } @@ -513,13 +513,13 @@ template void ObjectHashTable::Reset() template T ObjectHashTable::FindFirst(int hashValue) const { T entry = mTable[((unsigned)hashValue) % mTableSize]; - while (entry != NULL) + while (entry != nullptr) { if (entry->mHashValue == hashValue) return(entry); entry = (T)entry->mHashNextEntry; } - return(NULL); + return(nullptr); } template T ObjectHashTable::FindNext(T prevResult) const @@ -527,13 +527,13 @@ template T ObjectHashTable::FindNext(T prevResult) const T entry = prevResult; int hashValue = entry->mHashValue; entry = (T)entry->mHashNextEntry; - while (entry != NULL) + while (entry != nullptr) { if (entry->mHashValue == hashValue) return(entry); entry = (T)entry->mHashNextEntry; } - return(NULL); + return(nullptr); } template T ObjectHashTable::WalkFirst() const @@ -541,10 +541,10 @@ template T ObjectHashTable::WalkFirst() const for (int bucket = 0; bucket < mTableSize; bucket++) { T entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template T ObjectHashTable::WalkNext(T prevResult) const @@ -553,17 +553,17 @@ template T ObjectHashTable::WalkNext(T prevResult) const int bucket = ((unsigned)entry->mHashValue) % mTableSize; entry = (T)entry->mHashNextEntry; - if (entry != NULL) + if (entry != nullptr) return(entry); bucket++; // go onto next bucket for (; bucket < mTableSize; bucket++) { entry = mTable[bucket]; - if (entry != NULL) + if (entry != nullptr) return(entry); } - return(NULL); + return(nullptr); } template void ObjectHashTable::Resize(int hashSize) @@ -583,16 +583,16 @@ template void ObjectHashTable::Resize(int hashSize) for (int i = 0; i < oldSize; i++) { T next = oldTable[i]; - while (next != NULL) + while (next != nullptr) { T hold = next; next = (T)next->mHashNextEntry; // insert hold into new table int spot = ((unsigned)hold->mHashValue) % mTableSize; - if (mTable[spot] == NULL) + if (mTable[spot] == nullptr) { - hold->mHashNextEntry = NULL; + hold->mHashNextEntry = nullptr; mTable[spot] = hold; mStatUsedSlots++; } diff --git a/external/3rd/library/udplibrary/priority.hpp b/external/3rd/library/udplibrary/priority.hpp index 19f34ab3..516619db 100644 --- a/external/3rd/library/udplibrary/priority.hpp +++ b/external/3rd/library/udplibrary/priority.hpp @@ -37,12 +37,12 @@ template class PriorityQueue PriorityQueue(int queueSize); ~PriorityQueue(); - T* Top(); // returns NULL if queue is empty - T* TopRemove(); // returns NULL if queue is empty - T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return NULL + T* Top(); // returns nullptr if queue is empty + T* TopRemove(); // returns nullptr if queue is empty + T* TopRemove(P priority); // removes item from queue if it has a lower priority value, otherwise return nullptr T* Add(T* entry, P priority); // reprioritizes if already in queue, returns entry always T* Remove(T* entry); // returns entry always (even if it was not in the queue) - P *GetPriority(T* entry); // returns NULL if entry is not in the queue + P *GetPriority(T* entry); // returns nullptr if entry is not in the queue int QueueUsed(); // returns how many entries are in the queue protected: struct QueueEntry @@ -88,14 +88,14 @@ template PriorityQueue::~PriorityQueue() template T* PriorityQueue::Top() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); return(mQueue[0].entry); } template T* PriorityQueue::TopRemove() { if (mQueueEnd == 0) - return(NULL); + return(nullptr); T* top = mQueue[0].entry; Remove(top); return(top); @@ -105,14 +105,14 @@ template T* PriorityQueue::TopRemove(P priority) { if (mQueueEnd > 0 && mQueue[0].priority <= priority) return(Remove(mQueue[0].entry)); - return(NULL); + return(nullptr); } template P* PriorityQueue::GetPriority(T* entry) { if (entry->mPriorityQueuePosition >= 0) return(&mQueue[entry->mPriorityQueuePosition].priority); - return(NULL); + return(nullptr); } template T* PriorityQueue::Add(T* entry, P priority) @@ -121,7 +121,7 @@ template T* PriorityQueue::Add(T* entry, P priorit { // not in queue, so add it to the bottom if (mQueueEnd >= mQueueSize) - return(NULL); + return(nullptr); mQueue[mQueueEnd].entry = entry; mQueue[mQueueEnd].priority = priority; mQueue[mQueueEnd].entry->mPriorityQueuePosition = mQueueEnd; diff --git a/external/3rd/library/udplibrary/udpclient.cpp b/external/3rd/library/udplibrary/udpclient.cpp index 9debac0e..9ed52d3e 100755 --- a/external/3rd/library/udplibrary/udpclient.cpp +++ b/external/3rd/library/udplibrary/udpclient.cpp @@ -106,7 +106,7 @@ int main(int argc, char **argv) printf("Connecting to: %s,%d.", connectIp, connectPort); UdpConnection *myConnection = myUdpManager->EstablishConnection(connectIp, connectPort); myConnection->SetHandler(&myConnectionHandler); - assert(myConnection != NULL); + assert(myConnection != nullptr); int count = 0; while (myConnection->GetStatus() == UdpConnection::cStatusNegotiating) { @@ -181,7 +181,7 @@ int main(int argc, char **argv) if (myConnection->TotalPendingBytes() == 0) { // send another packet - SimpleLogicalPacket *lp = new SimpleLogicalPacket(NULL, 30000000); + SimpleLogicalPacket *lp = new SimpleLogicalPacket(nullptr, 30000000); int dlen = lp->GetDataLen(); char *ptr = (char *)lp->GetDataPtr(); diff --git a/external/3rd/library/udplibrary/udpserver.cpp b/external/3rd/library/udplibrary/udpserver.cpp index c523a05b..c8641671 100755 --- a/external/3rd/library/udplibrary/udpserver.cpp +++ b/external/3rd/library/udplibrary/udpserver.cpp @@ -182,7 +182,7 @@ Player::~Player() { char hold[256]; printf("TERMINATE %s,%d \n", mConnection->GetDestinationIp().GetAddress(hold), mConnection->GetDestinationPort()); - mConnection->SetHandler(NULL); + mConnection->SetHandler(nullptr); mConnection->Disconnect(); mConnection->Release(); } diff --git a/external/ours/library/archive/src/shared/AutoDeltaVariableCallback.h b/external/ours/library/archive/src/shared/AutoDeltaVariableCallback.h index ef0cc7fa..34373722 100755 --- a/external/ours/library/archive/src/shared/AutoDeltaVariableCallback.h +++ b/external/ours/library/archive/src/shared/AutoDeltaVariableCallback.h @@ -186,7 +186,7 @@ inline void AutoDeltaVariableCallback::se ValueType const tmp = this->get(); AutoDeltaVariable::set(source); - if (sourceObject != NULL && tmp != source) + if (sourceObject != nullptr && tmp != source) callback.modified(*sourceObject, tmp, source, true); } diff --git a/external/ours/library/archive/src/shared/ByteStream.cpp b/external/ours/library/archive/src/shared/ByteStream.cpp index 2e19cb81..4965bc8c 100755 --- a/external/ours/library/archive/src/shared/ByteStream.cpp +++ b/external/ours/library/archive/src/shared/ByteStream.cpp @@ -20,7 +20,7 @@ namespace Archive { @brief ReadIterator ctor Initializes the read position to zero, and the ByteStream member value - is NULL + is nullptr */ ReadIterator::ReadIterator() : readPtr(0), diff --git a/external/ours/library/archive/src/shared/ByteStream.h b/external/ours/library/archive/src/shared/ByteStream.h index eda154d5..a94aeb36 100755 --- a/external/ours/library/archive/src/shared/ByteStream.h +++ b/external/ours/library/archive/src/shared/ByteStream.h @@ -261,7 +261,7 @@ inline void ReadIterator::get(void * target, const unsigned long int readSize) } else { - static const char * const desc = "Archive::ReadIterator::get - read operation on null stream object"; + static const char * const desc = "Archive::ReadIterator::get - read operation on nullptr stream object"; ReadException ex(desc); throw (ex); } diff --git a/external/ours/library/crypto/src/shared/original/cryptlib.h b/external/ours/library/crypto/src/shared/original/cryptlib.h index dbbc7fa7..fd258706 100755 --- a/external/ours/library/crypto/src/shared/original/cryptlib.h +++ b/external/ours/library/crypto/src/shared/original/cryptlib.h @@ -440,7 +440,7 @@ public: //@{ //! returns whether this object allows attachment virtual bool Attachable() {return false;} - //! returns the object immediately attached to this object or NULL for no attachment + //! returns the object immediately attached to this object or nullptr for no attachment virtual BufferedTransformation *AttachedTransformation() {return 0;} //! virtual const BufferedTransformation *AttachedTransformation() const diff --git a/external/ours/library/crypto/src/shared/original/filters.cpp b/external/ours/library/crypto/src/shared/original/filters.cpp index 7caaf21d..852a7b7f 100755 --- a/external/ours/library/crypto/src/shared/original/filters.cpp +++ b/external/ours/library/crypto/src/shared/original/filters.cpp @@ -55,7 +55,7 @@ const byte *FilterWithBufferedInput::BlockQueue::GetBlock() return ptr; } else - return NULL; + return nullptr; } const byte *FilterWithBufferedInput::BlockQueue::GetContigousBlocks(unsigned int &numberOfBlocks) @@ -175,7 +175,7 @@ void FilterWithBufferedInput::Put(const byte *inString, unsigned int length) void FilterWithBufferedInput::MessageEnd(int propagation) { if (!m_firstInputDone && m_firstSize==0) - FirstPut(NULL); + FirstPut(nullptr); SecByteBlock temp(m_queue.CurrentSize()); m_queue.GetAll(temp); @@ -200,7 +200,7 @@ void FilterWithBufferedInput::ForceNextPut() // ************************************************************* ProxyFilter::ProxyFilter(Filter *filter, unsigned int firstSize, unsigned int lastSize, BufferedTransformation *outQ) - : FilterWithBufferedInput(firstSize, 1, lastSize, outQ), m_filter(filter), m_proxy(NULL) + : FilterWithBufferedInput(firstSize, 1, lastSize, outQ), m_filter(filter), m_proxy(nullptr) { if (m_filter.get()) m_filter->Attach(m_proxy = new OutputProxy(*this, false)); @@ -229,7 +229,7 @@ void ProxyFilter::SetFilter(Filter *filter) m_filter->Attach(temp.release()); } else - m_proxy=NULL; + m_proxy=nullptr; } void ProxyFilter::NextPut(const byte *s, unsigned int len) diff --git a/external/ours/library/crypto/src/shared/original/filters.h b/external/ours/library/crypto/src/shared/original/filters.h index 6a2f0389..b80c518a 100755 --- a/external/ours/library/crypto/src/shared/original/filters.h +++ b/external/ours/library/crypto/src/shared/original/filters.h @@ -17,7 +17,7 @@ public: bool Attachable() {return true;} BufferedTransformation *AttachedTransformation() {return m_outQueue.get();} const BufferedTransformation *AttachedTransformation() const {return m_outQueue.get();} - void Detach(BufferedTransformation *newOut = NULL); + void Detach(BufferedTransformation *newOut = nullptr); protected: virtual void NotifyAttachmentChange() {} @@ -33,7 +33,7 @@ private: class TransparentFilter : public Filter { public: - TransparentFilter(BufferedTransformation *outQ=NULL) : Filter(outQ) {} + TransparentFilter(BufferedTransformation *outQ=nullptr) : Filter(outQ) {} void Put(byte inByte) {AttachedTransformation()->Put(inByte);} void Put(const byte *inString, unsigned int length) {AttachedTransformation()->Put(inString, length);} }; @@ -42,7 +42,7 @@ public: class OpaqueFilter : public Filter { public: - OpaqueFilter(BufferedTransformation *outQ=NULL) : Filter(outQ) {} + OpaqueFilter(BufferedTransformation *outQ=nullptr) : Filter(outQ) {} void Put(byte inByte) {} void Put(const byte *inString, unsigned int length) {} }; @@ -122,7 +122,7 @@ class StreamCipherFilter : public Filter { public: StreamCipherFilter(StreamCipher &c, - BufferedTransformation *outQueue = NULL) + BufferedTransformation *outQueue = nullptr) : cipher(c), Filter(outQueue) {} void Put(byte inByte) @@ -138,7 +138,7 @@ private: class HashFilter : public Filter { public: - HashFilter(HashModule &hm, BufferedTransformation *outQueue = NULL, bool putMessage=false) + HashFilter(HashModule &hm, BufferedTransformation *outQueue = nullptr, bool putMessage=false) : Filter(outQueue), m_hashModule(hm), m_putMessage(putMessage) {} void MessageEnd(int propagation=-1); @@ -163,7 +163,7 @@ public: }; enum Flags {HASH_AT_BEGIN=1, PUT_MESSAGE=2, PUT_HASH=4, PUT_RESULT=8, THROW_EXCEPTION=16}; - HashVerifier(HashModule &hm, BufferedTransformation *outQueue = NULL, word32 flags = HASH_AT_BEGIN | PUT_RESULT); + HashVerifier(HashModule &hm, BufferedTransformation *outQueue = nullptr, word32 flags = HASH_AT_BEGIN | PUT_RESULT); bool GetLastResult() const {return m_verified;} @@ -183,7 +183,7 @@ private: class SignerFilter : public Filter { public: - SignerFilter(RandomNumberGenerator &rng, const PK_Signer &signer, BufferedTransformation *outQueue = NULL) + SignerFilter(RandomNumberGenerator &rng, const PK_Signer &signer, BufferedTransformation *outQueue = nullptr) : m_rng(rng), m_signer(signer), m_messageAccumulator(signer.NewMessageAccumulator()), Filter(outQueue) {} void MessageEnd(int propagation); @@ -204,7 +204,7 @@ private: class VerifierFilter : public Filter { public: - VerifierFilter(const PK_Verifier &verifier, BufferedTransformation *outQueue = NULL) + VerifierFilter(const PK_Verifier &verifier, BufferedTransformation *outQueue = nullptr) : m_verifier(verifier), m_messageAccumulator(verifier.NewMessageAccumulator()) , m_signature(verifier.SignatureLength()), Filter(outQueue) {} @@ -244,11 +244,11 @@ extern BitBucket g_bitBucket; class Redirector : public Sink { public: - Redirector() : m_target(NULL), m_passSignal(true) {} + Redirector() : m_target(nullptr), m_passSignal(true) {} Redirector(BufferedTransformation &target, bool passSignal=true) : m_target(&target), m_passSignal(passSignal) {} void Redirect(BufferedTransformation &target) {m_target = ⌖} - void StopRedirect() {m_target = NULL;} + void StopRedirect() {m_target = nullptr;} bool GetPassSignal() const {return m_passSignal;} void SetPassSignal(bool passSignal) {m_passSignal = passSignal;} @@ -498,7 +498,7 @@ public: class GeneralSource : public Source { public: - GeneralSource(BufferedTransformation &store, bool pumpAll, BufferedTransformation *outQueue = NULL) + GeneralSource(BufferedTransformation &store, bool pumpAll, BufferedTransformation *outQueue = nullptr) : Source(outQueue), m_store(store) { if (pumpAll) PumpAll(); @@ -517,13 +517,13 @@ private: class StringSource : public Source { public: - StringSource(const char *string, bool pumpAll, BufferedTransformation *outQueue = NULL); - StringSource(const byte *string, unsigned int length, bool pumpAll, BufferedTransformation *outQueue = NULL); + StringSource(const char *string, bool pumpAll, BufferedTransformation *outQueue = nullptr); + StringSource(const byte *string, unsigned int length, bool pumpAll, BufferedTransformation *outQueue = nullptr); #ifdef __MWERKS__ // CW60 workaround - StringSource(const std::string &string, bool pumpAll, BufferedTransformation *outQueue = NULL) + StringSource(const std::string &string, bool pumpAll, BufferedTransformation *outQueue = nullptr) #else - template StringSource(const T &string, bool pumpAll, BufferedTransformation *outQueue = NULL) + template StringSource(const T &string, bool pumpAll, BufferedTransformation *outQueue = nullptr) #endif : Source(outQueue), m_store(string) { @@ -544,7 +544,7 @@ private: class RandomNumberSource : public Source { public: - RandomNumberSource(RandomNumberGenerator &rng, unsigned int length, bool pumpAll, BufferedTransformation *outQueue = NULL); + RandomNumberSource(RandomNumberGenerator &rng, unsigned int length, bool pumpAll, BufferedTransformation *outQueue = nullptr); unsigned long Pump(unsigned long pumpMax=ULONG_MAX) {return m_store.TransferTo(*AttachedTransformation(), pumpMax);} diff --git a/external/ours/library/crypto/src/shared/original/queue.cpp b/external/ours/library/crypto/src/shared/original/queue.cpp index b18c2b4a..2fb3250a 100755 --- a/external/ours/library/crypto/src/shared/original/queue.cpp +++ b/external/ours/library/crypto/src/shared/original/queue.cpp @@ -152,7 +152,7 @@ void ByteQueue::CopyFrom(const ByteQueue ©) m_tail = m_tail->next; } - m_tail->next = NULL; + m_tail->next = nullptr; Put(copy.m_lazyString, copy.m_lazyLength); } diff --git a/external/ours/library/crypto/src/shared/original/smartptr.h b/external/ours/library/crypto/src/shared/original/smartptr.h index 6a0595a1..f5c0b41b 100755 --- a/external/ours/library/crypto/src/shared/original/smartptr.h +++ b/external/ours/library/crypto/src/shared/original/smartptr.h @@ -9,7 +9,7 @@ NAMESPACE_BEGIN(CryptoPP) template class member_ptr { public: - explicit member_ptr(T *p = NULL) : m_p(p) {} + explicit member_ptr(T *p = nullptr) : m_p(p) {} ~member_ptr(); @@ -47,9 +47,9 @@ template class value_ptr : public member_ptr { public: value_ptr(const T &obj) : member_ptr(new T(obj)) {} - value_ptr(T *p = NULL) : member_ptr(p) {} + value_ptr(T *p = nullptr) : member_ptr(p) {} value_ptr(const value_ptr& rhs) - : member_ptr(rhs.m_p ? new T(*rhs.m_p) : NULL) {} + : member_ptr(rhs.m_p ? new T(*rhs.m_p) : nullptr) {} value_ptr& operator=(const value_ptr& rhs); bool operator==(const value_ptr& rhs) @@ -61,7 +61,7 @@ public: template value_ptr& value_ptr::operator=(const value_ptr& rhs) { T *old_p = this->m_p; - this->m_p = rhs.m_p ? new T(*rhs.m_p) : NULL; + this->m_p = rhs.m_p ? new T(*rhs.m_p) : nullptr; delete old_p; return *this; } @@ -72,9 +72,9 @@ template class clonable_ptr : public member_ptr { public: clonable_ptr(const T &obj) : member_ptr(obj.Clone()) {} - clonable_ptr(T *p = NULL) : member_ptr(p) {} + clonable_ptr(T *p = nullptr) : member_ptr(p) {} clonable_ptr(const clonable_ptr& rhs) - : member_ptr(rhs.m_p ? rhs.m_p->Clone() : NULL) {} + : member_ptr(rhs.m_p ? rhs.m_p->Clone() : nullptr) {} clonable_ptr& operator=(const clonable_ptr& rhs); }; @@ -82,7 +82,7 @@ public: template clonable_ptr& clonable_ptr::operator=(const clonable_ptr& rhs) { T *old_p = this->m_p; - this->m_p = rhs.m_p ? rhs.m_p->Clone() : NULL; + this->m_p = rhs.m_p ? rhs.m_p->Clone() : nullptr; delete old_p; return *this; } @@ -184,8 +184,8 @@ template class ConstructorTemp { protected: - ConstructorTemp(const ConstructorTemp ©) : m_temp(NULL) {} - ConstructorTemp(T *t = NULL) : m_temp(t) {} + ConstructorTemp(const ConstructorTemp ©) : m_temp(nullptr) {} + ConstructorTemp(T *t = nullptr) : m_temp(t) {} ConstructorTemp(const T &t) : m_temp(new T(t)) {} member_ptr m_temp; }; diff --git a/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.cpp b/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.cpp index 0a88c460..9a272ae3 100755 --- a/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.cpp +++ b/external/ours/library/crypto/src/shared/wrapper/TwofishCrypt.cpp @@ -84,7 +84,7 @@ void TwofishCrypt::process(const unsigned char * const inputBuffer, unsigned cha } assert( r == 0 ); // size must be a 16 byte block for Twofish to do it's job! } - assert(cipher != NULL); // can't process data without a twofish encryptor or decryptor! + assert(cipher != nullptr); // can't process data without a twofish encryptor or decryptor! } //----------------------------------------------------------------------- diff --git a/external/ours/library/fileInterface/src/shared/AbstractFile.cpp b/external/ours/library/fileInterface/src/shared/AbstractFile.cpp index dd575c36..ef76c7cf 100755 --- a/external/ours/library/fileInterface/src/shared/AbstractFile.cpp +++ b/external/ours/library/fileInterface/src/shared/AbstractFile.cpp @@ -15,7 +15,7 @@ namespace AbstractFileNamespace { - AbstractFile::AudioServeFunction s_audioServeFunction = NULL; + AbstractFile::AudioServeFunction s_audioServeFunction = nullptr; } using namespace AbstractFileNamespace; @@ -51,7 +51,7 @@ void AbstractFile::flush() byte *AbstractFile::readEntireFileAndClose() { - if (s_audioServeFunction != NULL) + if (s_audioServeFunction != nullptr) (*s_audioServeFunction)(); seek(SeekBegin, 0); @@ -84,7 +84,7 @@ int AbstractFile::getZlibCompressedLength() const void AbstractFile::getZlibCompressedDataAndClose(byte *& compressedBuffer, int & compressedBufferLength) { - compressedBuffer = NULL; + compressedBuffer = nullptr; compressedBufferLength = -1; } diff --git a/external/ours/library/fileInterface/src/shared/AbstractFile.h b/external/ours/library/fileInterface/src/shared/AbstractFile.h index 0f649d1e..62c4f804 100755 --- a/external/ours/library/fileInterface/src/shared/AbstractFile.h +++ b/external/ours/library/fileInterface/src/shared/AbstractFile.h @@ -110,7 +110,7 @@ public: * Read the entire file into a memory buffer. The client is responsible for deleting the buffer * using operator delete(). The file will be closed after the read completes. * - * @return null if an error occured + * @return nullptr if an error occured */ virtual unsigned char *readEntireFileAndClose(); diff --git a/external/ours/library/fileInterface/src/shared/StdioFile.cpp b/external/ours/library/fileInterface/src/shared/StdioFile.cpp index 1e7225ed..bb890dfa 100755 --- a/external/ours/library/fileInterface/src/shared/StdioFile.cpp +++ b/external/ours/library/fileInterface/src/shared/StdioFile.cpp @@ -35,7 +35,7 @@ void StdioFile::close() if(m_file) { fclose(m_file); - m_file = NULL; + m_file = nullptr; } } @@ -43,7 +43,7 @@ void StdioFile::close() bool StdioFile::isOpen() const { - return m_file != NULL; + return m_file != nullptr; } // ---------------------------------------------------------------------- @@ -71,7 +71,7 @@ int StdioFile::tell() const bool StdioFile::seek(SeekType seekType, int offset) { - assert(m_file != NULL); + assert(m_file != nullptr); m_justWrote = false; int result = 0; @@ -97,7 +97,7 @@ bool StdioFile::seek(SeekType seekType, int offset) int StdioFile::read(void* dest_buffer, int num_bytes) { - assert(m_file != NULL); + assert(m_file != nullptr); resyncStream(); return static_cast(fread(dest_buffer, 1, static_cast(num_bytes), m_file)); } @@ -106,7 +106,7 @@ int StdioFile::read(void* dest_buffer, int num_bytes) int StdioFile::write(int num_bytes, const void* source_buffer) { - assert(m_file != NULL); + assert(m_file != nullptr); m_justWrote = true; return static_cast(fwrite(source_buffer, 1, static_cast(num_bytes), m_file)); } @@ -115,7 +115,7 @@ int StdioFile::write(int num_bytes, const void* source_buffer) void StdioFile::flush() { - assert(m_file != NULL); + assert(m_file != nullptr); fflush(m_file); m_justWrote = false; } @@ -136,9 +136,9 @@ void StdioFile::resyncStream() AbstractFile* StdioFileFactory::createFile(const char *fileName, const char *openType) { if(!fileName || !openType) - return NULL; + return nullptr; else if (fileName[0] == '\0' || openType[0] == '\0') - return NULL; + return nullptr; else return new StdioFile(fileName, openType); } diff --git a/external/ours/library/localization/src/shared/LocalizationManager.cpp b/external/ours/library/localization/src/shared/LocalizationManager.cpp index 518bf42b..e7b106ca 100755 --- a/external/ours/library/localization/src/shared/LocalizationManager.cpp +++ b/external/ours/library/localization/src/shared/LocalizationManager.cpp @@ -77,8 +77,8 @@ using namespace LocalizationManagerNamespace; //---------------------------------------------------------------------- bool LocalizationManager::ms_installed = 0; -LocalizationManager::LocalizationManagerHashMap * LocalizationManager::ms_singletonHashMap = NULL; -Unicode::NarrowString * LocalizationManager::ms_firstLocaleLoaded = NULL; +LocalizationManager::LocalizationManagerHashMap * LocalizationManager::ms_singletonHashMap = nullptr; +Unicode::NarrowString * LocalizationManager::ms_firstLocaleLoaded = nullptr; //----------------------------------------------------------------- @@ -103,7 +103,7 @@ m_displayBadStringIds (displayBadStringIds) m_usingEnglishLocale = false; } - assert (m_fileFactory != NULL);//lint !e1924 // c-style cast. MSVC bug + assert (m_fileFactory != nullptr);//lint !e1924 // c-style cast. MSVC bug } //----------------------------------------------------------------- @@ -181,23 +181,23 @@ void LocalizationManager::install (AbstractFileFactory * fileFactory, Unicode::U void LocalizationManager::remove () { assert (ms_installed);//lint !e1924 // c-style cast. MSVC bug - assert (ms_singletonHashMap != NULL);//lint !e1924 // c-style cast. MSVC bug - assert (ms_firstLocaleLoaded != NULL); + assert (ms_singletonHashMap != nullptr);//lint !e1924 // c-style cast. MSVC bug + assert (ms_firstLocaleLoaded != nullptr); LocalizationManagerHashMap::iterator end = ms_singletonHashMap->end(); for (LocalizationManagerHashMap::iterator it = ms_singletonHashMap->begin(); it != end; ++it) { LocalizationManager * current = (*it).second; - (*it).second = NULL; + (*it).second = nullptr; delete current; } ms_singletonHashMap->clear(); delete ms_singletonHashMap; - ms_singletonHashMap = NULL; + ms_singletonHashMap = nullptr; delete ms_firstLocaleLoaded; - ms_firstLocaleLoaded = NULL; + ms_firstLocaleLoaded = nullptr; ms_installed = false; } @@ -277,7 +277,7 @@ LocalizedStringTable * LocalizationManager::fetchStringTable(const Unicode::Narr if(find_iter != stmap.end ()) { TimedStringTable & tst = (*find_iter).second; - //-- this can be null + //-- this can be nullptr table = tst.second; tst.first = time(0); } diff --git a/external/ours/library/localization/src/shared/LocalizedString.cpp b/external/ours/library/localization/src/shared/LocalizedString.cpp index 88817b83..de996f95 100755 --- a/external/ours/library/localization/src/shared/LocalizedString.cpp +++ b/external/ours/library/localization/src/shared/LocalizedString.cpp @@ -193,10 +193,10 @@ LocalizedString * LocalizedString::load_0000 (AbstractFile & fl) if (!fl.read (&buflen, sizeof (id_type))) return 0; - // buflen does not include null terminator + // buflen does not include nullptr terminator Unicode::unicode_char_t * buf = new Unicode::unicode_char_t [buflen+1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; @@ -214,7 +214,7 @@ LocalizedString * LocalizedString::load_0000 (AbstractFile & fl) // TODO: Localized strings are stored little endian! loc_str = new LocalizedString(id, buf); - assert (loc_str != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (loc_str != nullptr); //lint !e1924 // c-style cast. MSVC bug loc_str->resetLineCounts (); @@ -247,10 +247,10 @@ LocalizedString * LocalizedString::load_0001 (AbstractFile & fl) if (!fl.read (&buflen, sizeof (id_type))) return 0; - // buflen does not include null terminator + // buflen does not include nullptr terminator Unicode::unicode_char_t * buf = new Unicode::unicode_char_t [buflen+1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; @@ -268,7 +268,7 @@ LocalizedString * LocalizedString::load_0001 (AbstractFile & fl) // TODO: Localized strings are stored little endian! loc_str = new LocalizedString(id, crcSource, buf); - assert (loc_str != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (loc_str != nullptr); //lint !e1924 // c-style cast. MSVC bug loc_str->resetLineCounts (); diff --git a/external/ours/library/localization/src/shared/LocalizedStringTable.cpp b/external/ours/library/localization/src/shared/LocalizedStringTable.cpp index 10ab6c60..e0519d6e 100755 --- a/external/ours/library/localization/src/shared/LocalizedStringTable.cpp +++ b/external/ours/library/localization/src/shared/LocalizedStringTable.cpp @@ -187,10 +187,10 @@ bool LocalizedStringTable::load_0000 (AbstractFile & fl) if (!fl.read (&buflen, sizeof (LocalizedString::id_type))) return false; - // buflen does not include null terminator + // buflen does not include nullptr terminator char * buf = new char [buflen+1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; @@ -276,10 +276,10 @@ bool LocalizedStringTable::load_0001(AbstractFile & fl) if (!fl.read (&buflen, sizeof (LocalizedString::id_type))) return false; - // buflen does not include null terminator + // buflen does not include nullptr terminator char * buf = new char [buflen+1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; @@ -333,7 +333,7 @@ LocalizedStringTable *LocalizedStringTable::load (AbstractFileFactory & fileFact { case 0: table = new LocalizedStringTable (filename); - assert (table != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (table != nullptr); //lint !e1924 // c-style cast. MSVC bug if (table->load_0000 (*fl) == false) { @@ -344,7 +344,7 @@ LocalizedStringTable *LocalizedStringTable::load (AbstractFileFactory & fileFact case 1: table = new LocalizedStringTable (filename); - assert (table != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (table != nullptr); //lint !e1924 // c-style cast. MSVC bug if (table->load_0001 (*fl) == false) { diff --git a/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp b/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp index 19e95784..e7dfbf27 100755 --- a/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp +++ b/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp @@ -126,7 +126,7 @@ bool LocalizedStringTableRW::str_write(AbstractFile & fl, LocalizedString & locs // TODO: swab this buffer Unicode::unicode_char_t * buf = new Unicode::unicode_char_t [buflen+1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; memcpy (buf, locstr.m_str.c_str (), sizeof (Unicode::unicode_char_t) * buflen); @@ -183,7 +183,7 @@ bool LocalizedStringTableRW::write(AbstractFile & fl) const char * buf = new char [buflen + 1]; - assert (buf != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buf != nullptr); //lint !e1924 // c-style cast. MSVC bug buf [buflen] = 0; @@ -230,7 +230,7 @@ LocalizedStringTableRW *LocalizedStringTableRW::loadRW (AbstractFileFactory & fi { case 0: table = new LocalizedStringTableRW (filename); - assert (table != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (table != nullptr); //lint !e1924 // c-style cast. MSVC bug if (table->load_0000 (*fl) == false) { @@ -241,7 +241,7 @@ LocalizedStringTableRW *LocalizedStringTableRW::loadRW (AbstractFileFactory & fi case 1: table = new LocalizedStringTableRW (filename); - assert (table != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (table != nullptr); //lint !e1924 // c-style cast. MSVC bug if (table->load_0001 (*fl) == false) { @@ -336,7 +336,7 @@ LocalizedString * LocalizedStringTableRW::addString (const Unicode::String & st { LocalizedString * const locstr = (m_map [m_nextUniqueId] = new LocalizedString (m_nextUniqueId, int(time(0)), str)); - assert (locstr != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (locstr != nullptr); //lint !e1924 // c-style cast. MSVC bug char buf[64]; sprintf (buf, "%03ld_default", m_nextUniqueId); @@ -538,7 +538,7 @@ void LocalizedStringTableRW::prepareTable (const LocalizedStringTableRW & rhs) LocalizedString * locstr = new LocalizedString (rhs_locstr->m_id, 0, rhs_locstr->m_str); - assert (locstr != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (locstr != nullptr); //lint !e1924 // c-style cast. MSVC bug m_map.insert (Map_t::value_type (locstr->getId (), locstr )); } } diff --git a/external/ours/library/singleton/src/shared/Singleton2.h b/external/ours/library/singleton/src/shared/Singleton2.h index 130d0cd7..1b42905d 100755 --- a/external/ours/library/singleton/src/shared/Singleton2.h +++ b/external/ours/library/singleton/src/shared/Singleton2.h @@ -138,7 +138,7 @@ inline Singleton2::Singleton2() template inline Singleton2::~Singleton2() { - assert(instance != NULL); + assert(instance != nullptr); instance = 0; } @@ -165,7 +165,7 @@ inline Singleton2::~Singleton2() template inline ValueType & Singleton2::getInstance() { - assert(instance != NULL); + assert(instance != nullptr); return *instance; } diff --git a/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp b/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp index 3f67e74a..6206b680 100755 --- a/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp +++ b/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.cpp @@ -218,7 +218,7 @@ CharDataMap::ErrorCode CharDataMap::generateMapFromBuffer (const Unicode::Blocks { CharData * data = new CharData; - assert (data != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (data != nullptr); //lint !e1924 // c-style cast. MSVC bug data->m_reverseCase = 0; @@ -244,7 +244,7 @@ CharDataMap::ErrorCode CharDataMap::generateMapFromBuffer (const Unicode::Blocks m_contiguousData = new CharData [validChars]; - assert (m_contiguousData != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (m_contiguousData != nullptr); //lint !e1924 // c-style cast. MSVC bug size_t dataIndex = 0; @@ -288,7 +288,7 @@ CharDataMap::ErrorCode CharDataMap::generateMap (const Unicode::Blocks::Mapping char * buffer = new char [fileLen + 1]; buffer [fileLen] = 0; - assert (buffer != NULL); //lint !e1924 // c-style cast. MSVC bug + assert (buffer != nullptr); //lint !e1924 // c-style cast. MSVC bug if (fread (buffer, fileLen, 1, fl) != 1) { diff --git a/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.h b/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.h index ba84cac2..7659b543 100755 --- a/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.h +++ b/external/ours/library/unicode/src/shared/UnicodeCharacterDataMap.h @@ -117,7 +117,7 @@ namespace Unicode /** * Find a CharData for the given code point. - * @return null if no CharData exists for this code point + * @return nullptr if no CharData exists for this code point */ inline const CharData * CharDataMap::findCharData (const unicode_char_t code) const diff --git a/external/ours/library/unicode/src/shared/UnicodeUtils.cpp b/external/ours/library/unicode/src/shared/UnicodeUtils.cpp index 4417fc0c..7bf90e7d 100755 --- a/external/ours/library/unicode/src/shared/UnicodeUtils.cpp +++ b/external/ours/library/unicode/src/shared/UnicodeUtils.cpp @@ -103,7 +103,7 @@ namespace Unicode } else if (*from == 0x0000) { - // null character + // nullptr character str += static_cast(0x0000); } else if (*from >= 0x0800) diff --git a/external/ours/library/unicode/src/shared/UnicodeUtils.h b/external/ours/library/unicode/src/shared/UnicodeUtils.h index f2a722ae..348bb64f 100755 --- a/external/ours/library/unicode/src/shared/UnicodeUtils.h +++ b/external/ours/library/unicode/src/shared/UnicodeUtils.h @@ -79,8 +79,8 @@ namespace Unicode bool getNthToken (const Unicode::NarrowString & str, const size_t n, size_t & pos, size_t & endpos, Unicode::NarrowString & token, const char * sepChars = ascii_whitespace); size_t skipWhitespace (const Unicode::NarrowString & str, size_t pos, const char * white = ascii_whitespace); - bool tokenize (const Unicode::String & theStr, UnicodeStringVector & result, Unicode::String const * const delimiters = NULL, Unicode::String const * const separators = NULL); - bool tokenize (const Unicode::String & theStr, UnicodeStringVector & result, const size_t tokenPos, size_t & whichToken, size_t & token_start, size_t & token_end, Unicode::String const * const delimiters = NULL, Unicode::String const * const separators = NULL); + bool tokenize (const Unicode::String & theStr, UnicodeStringVector & result, Unicode::String const * const delimiters = nullptr, Unicode::String const * const separators = nullptr); + bool tokenize (const Unicode::String & theStr, UnicodeStringVector & result, const size_t tokenPos, size_t & whichToken, size_t & token_start, size_t & token_end, Unicode::String const * const delimiters = nullptr, Unicode::String const * const separators = nullptr); bool isUnicode (const Unicode::String & theStr); diff --git a/external/ours/library/unicode/src/shared/utf8.cpp b/external/ours/library/unicode/src/shared/utf8.cpp index 75901043..3a19d82a 100755 --- a/external/ours/library/unicode/src/shared/utf8.cpp +++ b/external/ours/library/unicode/src/shared/utf8.cpp @@ -96,7 +96,7 @@ int UTF8_convertCharToUTF16( char * ptr , UTF16 * ret ) int UTF8_convertToUTF16( char * ptr , UTF16 * ret, int limit ) { int len = 0; - while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the null terminator + while (( *ptr != 0 ) && ( len < ( limit - 1 ) ))//we use limit -1 to leave room for the nullptr terminator { int clen = UTF8_convertCharToUTF16( ptr, ret ); if (clen == 0) diff --git a/game/server/application/SwgDatabaseServer/src/linux/main.cpp b/game/server/application/SwgDatabaseServer/src/linux/main.cpp index 9878eed1..71cc11b2 100755 --- a/game/server/application/SwgDatabaseServer/src/linux/main.cpp +++ b/game/server/application/SwgDatabaseServer/src/linux/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char ** argv) SetupSharedFoundation::install (setupFoundationData); SetupSharedFile::install(false); - SetupSharedRandom::install(time(NULL)); + SetupSharedRandom::install(time(nullptr)); SetupSharedNetwork::SetupData networkSetupData; SetupSharedNetwork::getDefaultServerSetupData(networkSetupData); SetupSharedNetwork::install(networkSetupData); diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/AuctionLocationsBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/AuctionLocationsBuffer.cpp index c0baa227..ec5603db 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/AuctionLocationsBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/AuctionLocationsBuffer.cpp @@ -30,7 +30,7 @@ AuctionLocationsBuffer::~AuctionLocationsBuffer(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -56,7 +56,7 @@ void AuctionLocationsBuffer::removeAuctionLocations(const NetworkId &locationId) if (i!=m_rows.end()) { delete i->second; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); } } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/BattlefieldParticipantBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/BattlefieldParticipantBuffer.cpp index 7abc8164..41038e8a 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/BattlefieldParticipantBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/BattlefieldParticipantBuffer.cpp @@ -30,7 +30,7 @@ BattlefieldParticipantBuffer::~BattlefieldParticipantBuffer(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -156,7 +156,7 @@ void BattlefieldParticipantBuffer::removeObject(const NetworkId &object) IndexType::iterator next=i; ++next; delete i->second; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); i=next; } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/BountyHunterTargetBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/BountyHunterTargetBuffer.cpp index 4098e2c3..16d361fe 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/BountyHunterTargetBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/BountyHunterTargetBuffer.cpp @@ -31,7 +31,7 @@ BountyHunterTargetBuffer::~BountyHunterTargetBuffer() for (DataType::iterator i=m_data.begin(); i!=m_data.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/CreatureObjectBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/CreatureObjectBuffer.cpp index 10556590..92dcbbfd 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/CreatureObjectBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/CreatureObjectBuffer.cpp @@ -238,7 +238,7 @@ void CreatureObjectBuffer::getAttributesForObject(const NetworkId &objectId, std } if (value == -999) { - WARNING(true,("Object %s had null attribute %i, defaulting to 100",objectId.getValueString().c_str(), position)); + WARNING(true,("Object %s had nullptr attribute %i, defaulting to 100",objectId.getValueString().c_str(), position)); value = 100; } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ExperienceBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ExperienceBuffer.cpp index 5c361b16..ffd4068f 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ExperienceBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ExperienceBuffer.cpp @@ -31,7 +31,7 @@ ExperienceBuffer::~ExperienceBuffer(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -157,7 +157,7 @@ void ExperienceBuffer::removeObject(const NetworkId &object) IndexType::iterator next=i; ++next; delete i->second; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); i=next; } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h index 5180b92a..65ba2205 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h @@ -103,7 +103,7 @@ IndexedNetworkTableBuffer::~IndexedNetworkTable { delete i->second; ++m_sRowsDeleted; - i->second=NULL; + i->second=nullptr; } } @@ -161,7 +161,7 @@ void IndexedNetworkTableBuffer::removeObject(co { delete i->second; ++m_sRowsDeleted; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); } } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ManufactureSchematicAttributeBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ManufactureSchematicAttributeBuffer.cpp index 12c4e790..487169ef 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ManufactureSchematicAttributeBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ManufactureSchematicAttributeBuffer.cpp @@ -31,7 +31,7 @@ ManufactureSchematicAttributeBuffer::~ManufactureSchematicAttributeBuffer(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -174,7 +174,7 @@ void ManufactureSchematicAttributeBuffer::removeObject(const NetworkId &object) IndexType::iterator next=i; ++next; delete i->second; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); i=next; } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionBidsBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionBidsBuffer.cpp index 3a024651..65d95c48 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionBidsBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionBidsBuffer.cpp @@ -31,7 +31,7 @@ MarketAuctionBidsBuffer::~MarketAuctionBidsBuffer(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -57,7 +57,7 @@ void MarketAuctionBidsBuffer::removeMarketAuctionBids(const NetworkId &itemId) if (i!=m_rows.end()) { delete i->second; - i->second=NULL; + i->second=nullptr; m_rows.erase(i); } } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.cpp index 8663d1ef..b8529107 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.cpp @@ -31,7 +31,7 @@ MarketAuctionsBufferCreate::~MarketAuctionsBufferCreate(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -217,7 +217,7 @@ MarketAuctionsBufferDelete::~MarketAuctionsBufferDelete(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -330,7 +330,7 @@ MarketAuctionsBufferUpdate::~MarketAuctionsBufferUpdate(void) for (IndexType::iterator i=m_rows.begin(); i!=m_rows.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp index 4491b654..b3d787d0 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp @@ -265,11 +265,11 @@ bool ObjectTableBuffer::save(DB::Session *session) #if 0 // Enable this to debug load_with problems DEBUG_REPORT_LOG(true,("Save object %s ",i->second->object_id.getValue().getValueString().c_str())); if (i->second->contained_by.isNull()) - DEBUG_REPORT_LOG(true, ("contained_by NULL ")); + DEBUG_REPORT_LOG(true, ("contained_by nullptr ")); else DEBUG_REPORT_LOG(true, ("contained_by %s ",i->second->contained_by.getValue().getValueString().c_str())); if (i->second->load_with.isNull()) - DEBUG_REPORT_LOG(true,("load_with NULL\n")); + DEBUG_REPORT_LOG(true,("load_with nullptr\n")); else DEBUG_REPORT_LOG(true,("load_with %s\n",i->second->load_with.getValue().getValueString().c_str())); #endif @@ -671,7 +671,7 @@ void ObjectTableBuffer::getObjvarsForObject(const NetworkId &objectId, std::vect int ObjectTableBuffer::encodeObjVarFreeFlags(const NetworkId & objectId) const { const DBSchema::ObjectBufferRow *row=findConstRowByIndex(objectId); - WARNING_STRICT_FATAL(row==NULL,("Loading object %s, no ObjectRow in the buffer\n",objectId.getValueString().c_str())); + WARNING_STRICT_FATAL(row==nullptr,("Loading object %s, no ObjectRow in the buffer\n",objectId.getValueString().c_str())); if (!row) return 0; diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ResourceTypeBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ResourceTypeBuffer.cpp index 0784be9b..fe6cca4f 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ResourceTypeBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ResourceTypeBuffer.cpp @@ -31,7 +31,7 @@ ResourceTypeBuffer::~ResourceTypeBuffer() for (DataType::iterator i=m_data.begin(); i!=m_data.end(); ++i) { delete i->second; - i->second=NULL; + i->second=nullptr; } } @@ -41,7 +41,7 @@ void ResourceTypeBuffer::handleAddResourceTypeMessage(AddResourceTypeMessage con { for (std::vector::const_iterator typeData = message.getData().begin(); typeData != message.getData().end(); ++typeData) { - DBSchema::ResourceTypeRow * row = NULL; + DBSchema::ResourceTypeRow * row = nullptr; DataType::iterator rowIter = m_data.find(typeData->m_networkId); if (rowIter == m_data.end()) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp index 7b73fc9b..f4653cd9 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp @@ -45,7 +45,7 @@ bool TaskObjectTemplateListUpdater::process(DB::Session *session) strcpy(s_sql,"commit"); else if ( i_retval == 2 ) // got ID & Name { - s_name[256]=0; // null term to make sure it fits + s_name[256]=0; // nullptr term to make sure it fits sprintf(s_sql,"insert into object_templates values (%d,'%s')",i_id,s_name); } else diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.cpp index 405d6a80..56ac35e8 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/CMLoader.cpp @@ -25,7 +25,7 @@ #include "TaskGetLocationList.h" #include "TaskGetBidList.h" -CMLoader *CMLoader::ms_instance = NULL; +CMLoader *CMLoader::ms_instance = nullptr; // ====================================================================== @@ -42,7 +42,7 @@ void CMLoader::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; } // ---------------------------------------------------------------------- diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp index d5955036..e442f568 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp @@ -17,8 +17,8 @@ // ====================================================================== -ObjvarNameManager * ObjvarNameManager::ms_instance = NULL; -ObjvarNameManager * ObjvarNameManager::ms_goldInstance = NULL; +ObjvarNameManager * ObjvarNameManager::ms_instance = nullptr; +ObjvarNameManager * ObjvarNameManager::ms_goldInstance = nullptr; // ====================================================================== @@ -37,11 +37,11 @@ void ObjvarNameManager::remove() { NOT_NULL(ms_instance); delete ms_instance; - ms_instance = NULL; + ms_instance = nullptr; NOT_NULL(ms_goldInstance); delete ms_goldInstance; - ms_goldInstance = NULL; + ms_goldInstance = nullptr; } // ---------------------------------------------------------------------- @@ -64,9 +64,9 @@ ObjvarNameManager::~ObjvarNameManager() delete m_nameToIdMap; delete m_idToNameMap; delete m_newNames; - m_nameToIdMap=NULL; - m_idToNameMap=NULL; - m_newNames=NULL; + m_nameToIdMap=nullptr; + m_idToNameMap=nullptr; + m_newNames=nullptr; } // ---------------------------------------------------------------------- @@ -169,7 +169,7 @@ DB::TaskRequest *ObjvarNameManager::saveNewNames() return task; } else - return NULL; + return nullptr; } // ====================================================================== diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgLoader.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgLoader.cpp index 206cd1ee..99d689d9 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgLoader.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgLoader.cpp @@ -29,9 +29,9 @@ void SwgLoader::install() SwgLoader::SwgLoader() : Loader(), - m_pendingTaskVerifyCharacter(NULL), - m_loadingTaskVerifyCharacter(NULL), - m_verifyCharacterTaskQ(NULL) + m_pendingTaskVerifyCharacter(nullptr), + m_loadingTaskVerifyCharacter(nullptr), + m_verifyCharacterTaskQ(nullptr) { m_verifyCharacterTaskQ = new DB::TaskQueue(1,DatabaseProcess::getInstance().getDBServer(),4); } @@ -95,7 +95,7 @@ void SwgLoader::update(real updateTime) if (m_pendingTaskVerifyCharacter && !m_loadingTaskVerifyCharacter) { m_loadingTaskVerifyCharacter = m_pendingTaskVerifyCharacter; - m_pendingTaskVerifyCharacter = NULL; + m_pendingTaskVerifyCharacter = nullptr; m_verifyCharacterTaskQ->asyncRequest(m_loadingTaskVerifyCharacter); } @@ -109,7 +109,7 @@ void SwgLoader::verifyCharacterFinished (TaskVerifyCharacter *task) { UNREF(task); DEBUG_FATAL(task!=m_loadingTaskVerifyCharacter,("Programmer bug: wrong TaskVerifyCharacter finished.\n")); - m_loadingTaskVerifyCharacter = NULL; + m_loadingTaskVerifyCharacter = nullptr; } // ---------------------------------------------------------------------- diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgPersister.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgPersister.cpp index 216a6aec..a792d1b5 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgPersister.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgPersister.cpp @@ -110,7 +110,7 @@ void SwgPersister::moveToPlayer(const NetworkId &oid, const NetworkId &player, c void SwgPersister::getMoneyFromOfflineObject(uint32 replyServer, NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector::fwd const & packedDictionary) { - SwgSnapshot * snapshot=NULL; + SwgSnapshot * snapshot=nullptr; if (hasDataForObject(sourceObject)) snapshot=safe_cast(&getSnapshotForObject(sourceObject, 0)); diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp index b5e7e461..ccb9ccad 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp @@ -96,8 +96,8 @@ SwgSnapshot::SwgSnapshot(DB::ModeQuery::Mode mode, bool useGoldDatabase) : m_vehicleObjectBuffer(mode), m_waypointBuffer(mode), m_weaponObjectBuffer(mode), - m_immediateDeleteStep(NULL), - m_offlineMoneyCustomPersistStep(NULL) + m_immediateDeleteStep(nullptr), + m_offlineMoneyCustomPersistStep(nullptr) { m_bufferList.push_back(&m_battlefieldMarkerObjectBuffer); m_bufferList.push_back(&m_battlefieldParticipantBuffer); @@ -290,10 +290,10 @@ void SwgSnapshot::decodeScriptObject(NetworkId const & objectId, Archive::ReadIt Archive::get(data,packedScriptList); if (packedScriptList.length()==0) - packedScriptList=' '; // avoid confusing an empty list with NULL + packedScriptList=' '; // avoid confusing an empty list with nullptr DBSchema::ObjectBufferRow *row=m_objectTableBuffer.findRowByIndex(objectId); - if (row==NULL) + if (row==nullptr) row=m_objectTableBuffer.addEmptyRow(objectId); row->script_list=packedScriptList; diff --git a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.cpp b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.cpp index 9a245c47..f5ae1da4 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.cpp @@ -90,7 +90,7 @@ bool AuctionLocationsQuery::setupData(DB::Session *session) bool AuctionLocationsQuery::addData(const DB::Row *_data) { const AuctionLocationsRow *myData=dynamic_cast(_data); - FATAL(myData == NULL, ("Adding NULL data into AuctionLocations")); + FATAL(myData == nullptr, ("Adding nullptr data into AuctionLocations")); switch(mode) { case mode_UPDATE: @@ -413,7 +413,7 @@ bool MarketAuctionsQuery::addData(const DB::Row *_data) case mode_UPDATE: { const MarketAuctionsRowUpdate *myData=dynamic_cast(_data); - FATAL(myData == NULL, ("Adding NULL data into MarketAuctions for mode_UPDATE")); + FATAL(myData == nullptr, ("Adding nullptr data into MarketAuctions for mode_UPDATE")); if (!m_item_ids.push_back(myData->item_id.getValueASCII())) return false; if (!m_owner_ids.push_back(myData->owner_id.getValueASCII())) return false; @@ -424,7 +424,7 @@ bool MarketAuctionsQuery::addData(const DB::Row *_data) case mode_INSERT: { const MarketAuctionsRow *myData=dynamic_cast(_data); - FATAL(myData == NULL, ("Adding NULL data into MarketAuctions for mode_INSERT")); + FATAL(myData == nullptr, ("Adding nullptr data into MarketAuctions for mode_INSERT")); if (!m_item_ids.push_back(myData->item_id.getValueASCII())) return false; if (!m_owner_ids.push_back(myData->owner_id.getValueASCII())) return false; @@ -450,7 +450,7 @@ bool MarketAuctionsQuery::addData(const DB::Row *_data) case mode_DELETE: { const MarketAuctionsRowDelete *myData=dynamic_cast(_data); - FATAL(myData == NULL, ("Adding NULL data into MarketAuctions for mode_DELETE")); + FATAL(myData == nullptr, ("Adding nullptr data into MarketAuctions for mode_DELETE")); if (!m_item_ids.push_back(myData->item_id.getValueASCII())) return false; break; @@ -716,7 +716,7 @@ bool MarketAuctionBidsQuery::addData(const DB::Row *_data) { const MarketAuctionBidsRow *myData=dynamic_cast(_data); - FATAL(myData == NULL, ("Adding NULL data into MarketAuctionBids")); + FATAL(myData == nullptr, ("Adding nullptr data into MarketAuctionBids")); switch(mode) { diff --git a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.cpp b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.cpp index f30e0962..d809771f 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.cpp @@ -24,7 +24,7 @@ TaskSaveObjvarNames::TaskSaveObjvarNames(const NameList &names) : TaskSaveObjvarNames::~TaskSaveObjvarNames() { delete m_objvarNames; - m_objvarNames=NULL; + m_objvarNames=nullptr; } // ---------------------------------------------------------------------- diff --git a/game/server/application/SwgGameServer/src/shared/combat/CombatEngine.cpp b/game/server/application/SwgGameServer/src/shared/combat/CombatEngine.cpp index 50a12bbb..4f4269cd 100755 --- a/game/server/application/SwgGameServer/src/shared/combat/CombatEngine.cpp +++ b/game/server/application/SwgGameServer/src/shared/combat/CombatEngine.cpp @@ -102,7 +102,7 @@ void CombatEngine::aim(const Command &, const NetworkId & actor, const NetworkId CachedNetworkId attackerId(actor); TangibleObject * attacker = dynamic_cast(attackerId.getObject()); - if (attacker != NULL) + if (attacker != nullptr) { attacker->addAim(); } @@ -121,7 +121,7 @@ bool CombatEngine::addTargetAction(TangibleObject & attacker, { // @todo: support tangible attacks CreatureObject * const creatureAttacker = attacker.asCreatureObject (); - if (creatureAttacker == NULL) + if (creatureAttacker == nullptr) { WARNING_STRICT_FATAL(true, ("Tangible attackers not supported yet")); return false; @@ -146,7 +146,7 @@ bool CombatEngine::addAttackAction(TangibleObject & attacker, { // @todo: support tangible attacks CreatureObject * const creatureAttacker = attacker.asCreatureObject (); - if (creatureAttacker == NULL) + if (creatureAttacker == nullptr) { WARNING_STRICT_FATAL(true, ("Tangible attackers not supported yet")); return false; @@ -176,7 +176,7 @@ bool CombatEngine::addAimAction(TangibleObject & attacker) // @todo: support tangible attacks CreatureObject * const creatureAttacker = attacker.asCreatureObject (); - if (creatureAttacker == NULL) + if (creatureAttacker == nullptr) { WARNING_STRICT_FATAL(true, ("Tangible attackers not supported yet")); return false; @@ -203,7 +203,7 @@ bool CombatEngine::onSuccessfulAttack(const TangibleObject & attacker, TangibleObject & defender, const WeaponObject & weapon, int damageAmount, int hitLocation) { - const bool creatureDefender = defender.asCreatureObject() != NULL; + const bool creatureDefender = defender.asCreatureObject() != nullptr; const bool isVehicle = GameObjectTypes::isTypeOf (defender.getGameObjectType (), SharedObjectTemplate::GOT_vehicle); // if attacking an object, always hit location 0 @@ -262,9 +262,9 @@ bool CombatEngine::onSuccessfulAttack(const TangibleObject & attacker, } else { - TangibleController * const tangibleController = (defender.getController() != NULL) ? defender.getController()->asTangibleController() : NULL; + TangibleController * const tangibleController = (defender.getController() != nullptr) ? defender.getController()->asTangibleController() : nullptr; - if (tangibleController == NULL) + if (tangibleController == nullptr) { WARNING_STRICT_FATAL(true, ("CombatEngine::onSuccessfulAttack non-auth " "defender %s doesn't have a TangibleController!", @@ -311,7 +311,7 @@ bool CombatEngine::onSuccessfulAttack(const TangibleObject & attacker, TangibleObject & defender, int damageAmount, int hitLocation) { - const bool creatureDefender = defender.asCreatureObject() != NULL; + const bool creatureDefender = defender.asCreatureObject() != nullptr; const bool isVehicle = GameObjectTypes::isTypeOf (defender.getGameObjectType (), SharedObjectTemplate::GOT_vehicle); // if attacking an object, always hit location 0 @@ -359,9 +359,9 @@ bool CombatEngine::onSuccessfulAttack(const TangibleObject & attacker, } else { - TangibleController * const tangibleController = (defender.getController() != NULL) ? defender.getController()->asTangibleController() : NULL; + TangibleController * const tangibleController = (defender.getController() != nullptr) ? defender.getController()->asTangibleController() : nullptr; - if (tangibleController == NULL) + if (tangibleController == nullptr) { WARNING_STRICT_FATAL(true, ("CombatEngine::onSuccessfulAttack non-auth " "defender %s doesn't have a TangibleController!", @@ -411,7 +411,7 @@ bool CombatEngine::damage(TangibleObject & defender, const WeaponObject & weapon const bool isVehicle = GameObjectTypes::isTypeOf (defender.getGameObjectType (), SharedObjectTemplate::GOT_vehicle); // if attacking an object, always hit location 0 - if (critter == NULL || isVehicle) + if (critter == nullptr || isVehicle) hitLocation = 0; // get the damage profile for the hit location @@ -425,7 +425,7 @@ bool CombatEngine::damage(TangibleObject & defender, const WeaponObject & weapon // put a attribMod structure on the defender's damage list for each type of // damage received DamageList damageList; - if (critter != NULL && !isVehicle) + if (critter != nullptr && !isVehicle) { computeCreatureDamage(&hitLocationData, damageAmount, damageList); } @@ -456,7 +456,7 @@ bool CombatEngine::damage(TangibleObject & defender, const WeaponObject & weapon damageData.damage.insert(damageData.damage.end(), damageList.begin(), damageList.end()); damageData.wounded = isWounded; - if (critter != NULL || !defender.isDisabled()) + if (critter != nullptr || !defender.isDisabled()) { // update the object's hit points or attributes for the damage defender.applyDamage(damageData); @@ -485,7 +485,7 @@ void CombatEngine::damage(TangibleObject & defender, const bool isVehicle = GameObjectTypes::isTypeOf (defender.getGameObjectType (), SharedObjectTemplate::GOT_vehicle); // if attacking an object, always hit location 0 - if (critter == NULL || isVehicle) + if (critter == nullptr || isVehicle) hitLocation = 0; // get the damage profile for the hit location @@ -514,7 +514,7 @@ void CombatEngine::damage(TangibleObject & defender, damageData.hitLocationIndex = hitLocation; damageData.damage.insert(damageData.damage.end(), damageList.begin(), damageList.end()); - if (critter != NULL || !defender.isDisabled()) + if (critter != nullptr || !defender.isDisabled()) { // update the object's hit points or attributes for the damage defender.applyDamage(damageData); @@ -668,7 +668,7 @@ void CombatEngine::alter(TangibleObject & object) { NOT_NULL(object.getController()); - if ( (object.getCombatData() == NULL) + if ( (object.getCombatData() == nullptr) || object.getCombatData()->defenseData.damage.empty()) { return; @@ -682,7 +682,7 @@ void CombatEngine::alter(TangibleObject & object) // if the object is a creature, get it's attributes Attributes::Value currentAttribs[Attributes::NumberOfAttributes]; CreatureObject * const critter = object.asCreatureObject (); - if (critter != NULL) + if (critter != nullptr) { for (int i = 0; i < Attributes::NumberOfAttributes; ++i) currentAttribs[i] = critter->getAttribute(i); @@ -710,7 +710,7 @@ void CombatEngine::alter(TangibleObject & object) { TangibleController * const tangibleController = object.getController()->asTangibleController(); - if (tangibleController == NULL) + if (tangibleController == nullptr) { WARNING_STRICT_FATAL(true, ("CombatEngine::alter non-auth " "object %s doesn't have a TangibleController!", diff --git a/game/server/application/SwgGameServer/src/shared/controller/JediManagerController.cpp b/game/server/application/SwgGameServer/src/shared/controller/JediManagerController.cpp index 80099996..defcc868 100755 --- a/game/server/application/SwgGameServer/src/shared/controller/JediManagerController.cpp +++ b/game/server/application/SwgGameServer/src/shared/controller/JediManagerController.cpp @@ -40,7 +40,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_removeJedi: { const MessageQueueGenericValueType * const msg = safe_cast *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->removeJedi(msg->getValue()); } @@ -49,7 +49,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_addJedi: { const MessageQueueJediData * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { owner->addJedi(msg->getId(), msg->getName(), @@ -69,7 +69,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJedi: { const MessageQueueJediData * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJedi(msg->getId(), msg->getVisibility(), @@ -83,7 +83,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJediState: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJedi(msg->getValue().first, static_cast(msg->getValue().second) @@ -95,7 +95,7 @@ void JediManagerController::handleMessage (const int message, const float value, { /* const MessageQueueGenericValueType > > * const msg = safe_cast > > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJedi(msg->getValue().first, msg->getValue().second @@ -107,7 +107,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJediLocation: { const MessageQueueJediLocation * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJediLocation(msg->getId(), msg->getLocation(), @@ -119,7 +119,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_setJediOffline: { const MessageQueueJediLocation * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { owner->setJediOffline(msg->getId(), msg->getLocation(), @@ -131,7 +131,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_requestJediBounty: { const MessageQueueRequestJediBounty * const msg = safe_cast(data); - if (msg != NULL) + if (msg != nullptr) { owner->requestJediBounty(msg->getTargetId(), msg->getHunterId(), @@ -145,7 +145,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_removeJediBounty: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->removeJediBounty(msg->getValue().first, msg->getValue().second); } @@ -154,7 +154,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_removeAllJediBounties: { const MessageQueueGenericValueType * const msg = safe_cast *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->removeAllJediBounties(msg->getValue()); } @@ -163,7 +163,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJediSpentJediSkillPoints: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJediSpentJediSkillPoints(msg->getValue().first, msg->getValue().second); } @@ -172,7 +172,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJediFaction: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJediFaction(msg->getValue().first, msg->getValue().second); } @@ -181,7 +181,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_updateJediScriptData: { const MessageQueueGenericValueType > > * const msg = safe_cast > > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->updateJediScriptData(msg->getValue().first, msg->getValue().second.first, msg->getValue().second.second); } @@ -190,7 +190,7 @@ void JediManagerController::handleMessage (const int message, const float value, case CM_removeJediScriptData: { const MessageQueueGenericValueType > * const msg = safe_cast > *>(data); - if (msg != NULL) + if (msg != nullptr) { owner->removeJediScriptData(msg->getValue().first, msg->getValue().second); } diff --git a/game/server/application/SwgGameServer/src/shared/controller/SwgPlayerCreatureController.cpp b/game/server/application/SwgGameServer/src/shared/controller/SwgPlayerCreatureController.cpp index dea874be..1e417386 100755 --- a/game/server/application/SwgGameServer/src/shared/controller/SwgPlayerCreatureController.cpp +++ b/game/server/application/SwgGameServer/src/shared/controller/SwgPlayerCreatureController.cpp @@ -40,7 +40,7 @@ void SwgPlayerCreatureController::handleMessage (const int message, const float case CM_setJediState: { const MessageQueueGenericValueType * const msg = dynamic_cast *>(data); - if (msg != NULL) + if (msg != nullptr) playerOwner->setJediState(static_cast(msg->getValue())); } break; diff --git a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp index 5bb0356e..869755e9 100755 --- a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp +++ b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp @@ -767,7 +767,7 @@ CS_CMD( create_crafted_object ) if( !( target && target->isAuthoritative() ) ) return; ServerObject *inventory = target->getInventory(); - if( inventory == NULL ) + if( inventory == nullptr ) return; DEBUG_REPORT_LOG( true, ( "Trying to make %s\n", args[ 1 ].c_str())); GameScriptObject * script = target->getScriptObject(); @@ -1116,7 +1116,7 @@ CS_CMD( delete_object ) const NetworkId oid (args[0]); ServerObject *object = ServerObject::getServerObject( oid ); - if (object == NULL) + if (object == nullptr) { return; } @@ -1174,7 +1174,7 @@ CS_CMD( rename_player ) } if( player_id.isValid() ) { - // null id to pass to the playercreationmanager. + // nullptr id to pass to the playercreationmanager. NetworkId source( "0" ); DEBUG_REPORT_LOG( true, ( "Attempting to rename %s.", args[ 0 ].c_str() ) ); @@ -1213,7 +1213,7 @@ CS_CMD( set_bank_credits ) CreatureObject* creatureActor = CreatureObject::getCreatureObject(player_id); PlayerObject const * const player = PlayerCreatureController::getPlayerObject(creatureActor); - if( ( player != NULL ) && ( player->isAuthoritative() ) ) + if( ( player != nullptr ) && ( player->isAuthoritative() ) ) { amount -= creatureActor->getBankBalance(); DEBUG_REPORT_LOG( true, ( "Amount to modify by: %d (%d current balance)\n", amount, creatureActor->getBankBalance() ) ); @@ -1270,7 +1270,7 @@ CS_CMD( get_pc_info ) if(bindId != NetworkId::cms_invalid) { const ServerObject* const bindObject = ServerObject::getServerObject(bindId); - if (bindObject != NULL) + if (bindObject != nullptr) { bindLoc = bindObject->getPosition_w(); snprintf( stringbuffer, sizeof( stringbuffer ) -1, "%02f %02f %02f", bindLoc.x, bindLoc.y, bindLoc.z ); @@ -1380,11 +1380,11 @@ CS_CMD( get_pc_info ) // residence info PlayerObject const * const player = PlayerCreatureController::getPlayerObject(creatureActor); - if (player != NULL) + if (player != nullptr) { NetworkId houseNetworkId = creatureActor->getHouse(); const ServerObject* const resObject = ServerObject::getServerObject(houseNetworkId); - if (resObject != NULL) + if (resObject != nullptr) { resLoc = resObject->getPosition_w(); snprintf( stringbuffer, sizeof( stringbuffer ) - 1 , "%02f %02f %02f", resLoc.x, resLoc.y, resLoc.z ); diff --git a/game/server/application/SwgGameServer/src/shared/core/SwgGameServer.cpp b/game/server/application/SwgGameServer/src/shared/core/SwgGameServer.cpp index 1b310ffd..1bf01f55 100755 --- a/game/server/application/SwgGameServer/src/shared/core/SwgGameServer.cpp +++ b/game/server/application/SwgGameServer/src/shared/core/SwgGameServer.cpp @@ -55,7 +55,7 @@ SwgGameServer::~SwgGameServer() void SwgGameServer::install() { - DEBUG_FATAL (ms_instance != NULL, ("already installed")); + DEBUG_FATAL (ms_instance != nullptr, ("already installed")); ms_instance = new SwgGameServer; SwgServerUniverse::install(); @@ -110,7 +110,7 @@ void SwgGameServer::receiveMessage(const MessageDispatch::Emitter & source, cons JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL && jediManager->isAuthoritative()) + if (jediManager != nullptr && jediManager->isAuthoritative()) { jediManager->addJediBounties(*msg); delete msg; @@ -129,7 +129,7 @@ void SwgGameServer::receiveMessage(const MessageDispatch::Emitter & source, cons JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->characterBeingDeleted(msg.getValue()); } diff --git a/game/server/application/SwgGameServer/src/shared/core/SwgServerUniverse.cpp b/game/server/application/SwgGameServer/src/shared/core/SwgServerUniverse.cpp index 3d743c93..98bccf40 100755 --- a/game/server/application/SwgGameServer/src/shared/core/SwgServerUniverse.cpp +++ b/game/server/application/SwgGameServer/src/shared/core/SwgServerUniverse.cpp @@ -26,7 +26,7 @@ void SwgServerUniverse::install() SwgServerUniverse::SwgServerUniverse() : ServerUniverse (), - m_jediManager (NULL) + m_jediManager (nullptr) { } @@ -51,7 +51,7 @@ void SwgServerUniverse::updateAndValidateData() "only be called on the process that is authoritative for UniverseObjects.\n")); // create Jedi manager - if (m_jediManager == NULL) + if (m_jediManager == nullptr) { const ServerObjectTemplate * objTemplate = safe_cast(ObjectTemplateList::fetch(ConfigServerGame::getJediManagerTemplate())); m_jediManager = safe_cast(ServerWorld::createNewObject(*objTemplate, Transform::identity, 0, false)); diff --git a/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp b/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp index f4aa0944..89c24610 100755 --- a/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp +++ b/game/server/application/SwgGameServer/src/shared/object/JediManagerObject.cpp @@ -43,7 +43,7 @@ namespace JediManagerObjectNamespace // the bounty hunter target list loaded from the DB; we store it here // and wait until the JediManagerObject object is created, and then // read it into the JediManagerObject object - const BountyHunterTargetListMessage * s_queuedBountyHunterTargetListFromDB = NULL; + const BountyHunterTargetListMessage * s_queuedBountyHunterTargetListFromDB = nullptr; } using namespace JediManagerObjectNamespace; @@ -151,7 +151,7 @@ void JediManagerObject::onServerUniverseGainedAuthority() addJediBounties(*s_queuedBountyHunterTargetListFromDB); delete s_queuedBountyHunterTargetListFromDB; - s_queuedBountyHunterTargetListFromDB = NULL; + s_queuedBountyHunterTargetListFromDB = nullptr; } } @@ -450,7 +450,7 @@ void JediManagerObject::characterBeingDeleted(const NetworkId & id) ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); @@ -1252,7 +1252,7 @@ void JediManagerObject::requestJediBounty(const NetworkId & targetId, ScriptDictionaryPtr dictionary; GameScriptObject::makeScriptDictionary(params, dictionary); - if (dictionary.get() != NULL) + if (dictionary.get() != nullptr) { dictionary->serialize(); if (success) diff --git a/game/server/application/SwgGameServer/src/shared/object/SwgCreatureObject.cpp b/game/server/application/SwgGameServer/src/shared/object/SwgCreatureObject.cpp index e1ab4b18..18cd7b6e 100755 --- a/game/server/application/SwgGameServer/src/shared/object/SwgCreatureObject.cpp +++ b/game/server/application/SwgGameServer/src/shared/object/SwgCreatureObject.cpp @@ -96,7 +96,7 @@ void SwgCreatureObject::onRemovingFromWorld() if (isAuthoritative() && isPlayerControlled() && (getBountyValue() > 0)) { JediManagerObject * const jediManager = static_cast(ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->setJediOffline(getNetworkId(), getPosition_w(), getSceneId()); } @@ -116,7 +116,7 @@ void SwgCreatureObject::onPermanentlyDestroyed() if (isAuthoritative() && isPlayerControlled() && (getBountyValue() > 0)) { JediManagerObject * const jediManager = static_cast(ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->removeJedi(getNetworkId()); } @@ -178,7 +178,7 @@ const int SwgCreatureObject::getSpentJediSkillPoints() const } else { - WARNING(true, ("Creature %s had a null in their skill list", getNetworkId().getValueString().c_str())); + WARNING(true, ("Creature %s had a nullptr in their skill list", getNetworkId().getValueString().c_str())); } } */ @@ -198,7 +198,7 @@ bool SwgCreatureObject::hasBounty(const CreatureObject & target) const { const SwgCreatureObject * swgTarget = dynamic_cast( &target); - if (swgTarget == NULL) + if (swgTarget == nullptr) return false; JediManagerObject * jediManager = static_cast( @@ -296,7 +296,7 @@ void SwgCreatureObject::onAddedToWorld() if (isAuthoritative() && isPlayerControlled() && (getBountyValue() > 0)) { JediManagerObject * jediManager = static_cast(ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->updateJediLocation(getNetworkId(), getPosition_w(), getSceneId()); } @@ -330,7 +330,7 @@ void SwgCreatureObject::setPvpFaction(Pvp::FactionId factionId) if ((oldId != newId) && isAuthoritative() && isPlayerControlled() && (getBountyValue() > 0)) { JediManagerObject * jediManager = static_cast(ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->updateJediFaction(getNetworkId(), newId); } diff --git a/game/server/application/SwgGameServer/src/shared/object/SwgPlayerObject.cpp b/game/server/application/SwgGameServer/src/shared/object/SwgPlayerObject.cpp index ef587054..c8c838ec 100755 --- a/game/server/application/SwgGameServer/src/shared/object/SwgPlayerObject.cpp +++ b/game/server/application/SwgGameServer/src/shared/object/SwgPlayerObject.cpp @@ -92,12 +92,12 @@ void SwgPlayerObject::virtualOnSetAuthority() PlayerObject::virtualOnSetAuthority(); const SwgCreatureObject * owner = safe_cast(getCreatureObject()); - if ((owner != NULL) && owner->isPlayerControlled() && (owner->getBountyValue() > 0)) + if ((owner != nullptr) && owner->isPlayerControlled() && (owner->getBountyValue() > 0)) { // tell the Jedi manager our position JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { jediManager->updateJediLocation(owner->getNetworkId(), owner->getPosition_w(), owner->getSceneId()); @@ -192,7 +192,7 @@ void SwgPlayerObject::updateJediLocationTime(float time) // tell the Jedi manager our position JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { const CreatureObject * owner = getCreatureObject(); if (owner->isInWorld()) @@ -324,7 +324,7 @@ void SwgPlayerObject::setJediBounties(const std::vector & bounties) // update the Jedi manager JediManagerObject * jediManager = static_cast( ServerUniverse::getInstance()).getJediManager(); - if (jediManager != NULL) + if (jediManager != nullptr) { const CreatureObject * owner = getCreatureObject(); jediManager->updateJedi(owner->getNetworkId(), bounties); @@ -351,7 +351,7 @@ bool SwgPlayerObject::getJediBounties(std::vector & bounties) bounties.clear(); SwgCreatureObject * owner = safe_cast(getCreatureObject()); - if (owner != NULL) + if (owner != nullptr) { if (owner->getObjVars().getItem(OBJVAR_JEDI_BOUNTIES, bounties)) { diff --git a/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp b/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp index 90edb0a3..aaf9f5a9 100755 --- a/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp +++ b/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp @@ -94,10 +94,10 @@ Tag ServerJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == NULL) + if (m_baseData == nullptr) return m_templateVersion; const ServerJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == NULL) + if (base == nullptr) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerJediManagerObjectTemplate::getHighestTemplateVersion @@ -150,12 +150,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != NULL) + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) base->releaseReference(); else { - if (m_baseData != NULL) + if (m_baseData != nullptr) m_baseData->releaseReference(); m_baseData = base; } diff --git a/game/server/library/swgServerNetworkMessages/src/shared/core/SetupSwgServerNetworkMessages.cpp b/game/server/library/swgServerNetworkMessages/src/shared/core/SetupSwgServerNetworkMessages.cpp index d93e323f..864e2645 100755 --- a/game/server/library/swgServerNetworkMessages/src/shared/core/SetupSwgServerNetworkMessages.cpp +++ b/game/server/library/swgServerNetworkMessages/src/shared/core/SetupSwgServerNetworkMessages.cpp @@ -235,7 +235,7 @@ namespace SetupSwgServerNetworkMessagesNamespace } MessageQueue::Data* unpackNothing(Archive::ReadIterator &) { - return NULL; + return nullptr; } void packVectorNetworkIdVector(const MessageQueue::Data * data, Archive::ByteStream & target) diff --git a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp index e0c98b96..44559bc5 100755 --- a/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp +++ b/game/shared/library/swgSharedNetworkMessages/src/shared/combat/MessageQueueCombatAction.cpp @@ -297,7 +297,7 @@ void MessageQueueCombatAction::debugDump() const bool hasActionName; char actionName[256]; - if (s_actionNameLookupFunction != NULL) + if (s_actionNameLookupFunction != nullptr) { hasActionName = true; (*s_actionNameLookupFunction)(m_actionId, actionName, sizeof(actionName)); @@ -316,9 +316,9 @@ void MessageQueueCombatAction::debugDump() const // Print attacker info. DEBUG_REPORT_LOG(true, ("MQCA: attacker: id =[%s].\n", m_attacker.id.getValueString().c_str())); - DEBUG_REPORT_LOG(true, ("MQCA: attacker: template =[%s].\n", attackerObject ? attackerObject->getObjectTemplateName() : "")); + DEBUG_REPORT_LOG(true, ("MQCA: attacker: template =[%s].\n", attackerObject ? attackerObject->getObjectTemplateName() : "")); DEBUG_REPORT_LOG(true, ("MQCA: attacker: weapon =[%s].\n", m_attacker.weapon.getValueString().c_str())); - DEBUG_REPORT_LOG(true, ("MQCA: attacker: weapon template =[%s].\n", weaponObject ? weaponObject->getObjectTemplateName() : "")); + DEBUG_REPORT_LOG(true, ("MQCA: attacker: weapon template =[%s].\n", weaponObject ? weaponObject->getObjectTemplateName() : "")); DEBUG_REPORT_LOG(true, ("MQCA: attacker: end posture =[%s].\n", Postures::getPostureName(m_attacker.endPosture))); DEBUG_REPORT_LOG(true, ("MQCA: attacker: trailBits =[0x%02x].\n", m_attacker.trailBits)); DEBUG_REPORT_LOG(true, ("MQCA: attacker: client effect id=[%d].\n", m_attacker.clientEffectId)); @@ -341,7 +341,7 @@ void MessageQueueCombatAction::debugDump() const UNREF(defenderObject); DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: id =[%s].\n", i + 1, data.id.getValueString().c_str())); - DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: template =[%s].\n", i + 1, defenderObject ? defenderObject->getObjectTemplateName() : "")); + DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: template =[%s].\n", i + 1, defenderObject ? defenderObject->getObjectTemplateName() : "")); DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: end posture =[%s].\n", i + 1, Postures::getPostureName(data.endPosture))); DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: defense =[%s].\n", i + 1, CombatEngineData::getCombatDefenseName(data.defense))); DEBUG_REPORT_LOG(true, ("MQCA: defender #%d: client effect id=[%d].\n", i + 1, data.clientEffectId)); diff --git a/game/shared/library/swgSharedNetworkMessages/src/shared/core/SetupSwgSharedNetworkMessages.cpp b/game/shared/library/swgSharedNetworkMessages/src/shared/core/SetupSwgSharedNetworkMessages.cpp index fb9785c0..399a513c 100755 --- a/game/shared/library/swgSharedNetworkMessages/src/shared/core/SetupSwgSharedNetworkMessages.cpp +++ b/game/shared/library/swgSharedNetworkMessages/src/shared/core/SetupSwgSharedNetworkMessages.cpp @@ -482,7 +482,7 @@ namespace SetupSwgSharedNetworkMessagesNamespace MessageQueue::Data* unpackNothing(Archive::ReadIterator &) { - return NULL; + return nullptr; } //---------------------------------------------------------------------- diff --git a/game/shared/library/swgSharedUtility/src/shared/CombatEngineData.h b/game/shared/library/swgSharedUtility/src/shared/CombatEngineData.h index 0a86c6ee..118e2167 100755 --- a/game/shared/library/swgSharedUtility/src/shared/CombatEngineData.h +++ b/game/shared/library/swgSharedUtility/src/shared/CombatEngineData.h @@ -139,7 +139,7 @@ namespace CombatEngineData std::vector damage;// list of attribute modifiers this damage // caused, pre armor effectiveness - CachedNetworkId attackerId; // who caused the damage (null for + CachedNetworkId attackerId; // who caused the damage (nullptr for // environmental effects, etc) NetworkId weaponId; // id of the weapon used DamageType damageType; @@ -175,10 +175,10 @@ namespace CombatEngineData inline ActionItem::~ActionItem(void) { - if (type == target && actionData.targetData.targets != NULL) + if (type == target && actionData.targetData.targets != nullptr) { delete[] actionData.targetData.targets; - actionData.targetData.targets = NULL; + actionData.targetData.targets = nullptr; } } // ActionItem::~ActionItem @@ -195,7 +195,7 @@ namespace CombatEngineData actionId(0), wounded(false), ignoreInvulnerable(false) -// combatActionMessage(NULL) +// combatActionMessage(nullptr) { }