newer standards prefer nullptr over NULL - this is most of them but there are others too

engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp

@@ -14,7 +14,7 @@ GameNetworkMessage("TaskConnectionIdMessage"),
 serverType(static_cast<unsigned char>(id)),
 commandLine(pCommandLine),
 clusterName(pClusterName),
-currentEpochTime(static_cast<long>(::time(NULL)))
+currentEpochTime(static_cast<long>(::time(nullptr)))
 {
 	addVariable(serverType);
 	addVariable(commandLine);

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<uint32, int> const & featureIds, std::map<uint32, std::string> 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<uint32, int> const & featureIds, std::map<uint32, std::string> const & sessionFeatureIdsData, const char * sessionResultString /*= nullptr*/, const char * sessionResultText /*= nullptr*/) :
 	GameNetworkMessage("AccountFeatureIdResponse"),
 	m_requester(requester),
 	m_gameServer(gameServer),

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<uint32, int> const & featureIds, std::map<uint32, std::string> 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<uint32, int> const & featureIds, std::map<uint32, std::string> const & sessionFeatureIdsData, const char * sessionResultString = nullptr, const char * sessionResultText = nullptr);
 	AccountFeatureIdResponse  (Archive::ReadIterator & source);
 	virtual ~AccountFeatureIdResponse ();
 

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),

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<NetworkId> 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);
 

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);

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();
 

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)

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<const AiCreatureStateMessage *>(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);
 	}

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<const AiMovementMessage *> (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;

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)
 	{

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])));