NULL to nullptr

world/AdventureManager.cpp

@@ -553,7 +553,7 @@ bool AdventureManager::IsInExcludedZoneInList(list<AdventureZoneIn> excluded_zon
 
 Adventure **AdventureManager::GetFinishedAdventures(const char *player, int &count)
 {
-	Adventure **ret = NULL;
+	Adventure **ret = nullptr;
 	count = 0;
 
 	list<Adventure*>::iterator iter = adventure_list.begin();
@@ -598,7 +598,7 @@ Adventure *AdventureManager::GetActiveAdventure(const char *player)
 		}
 		iter++;
 	}
-	return NULL;
+	return nullptr;
 }
 
 AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id)
@@ -606,7 +606,7 @@ AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id)
 	map<uint32, list<AdventureTemplate*> >::iterator iter = adventure_entries.find(theme);
 	if(iter == adventure_entries.end())
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	list<AdventureTemplate*>::iterator l_iter = (*iter).second.begin();
@@ -618,7 +618,7 @@ AdventureTemplate *AdventureManager::GetAdventureTemplate(int theme, int id)
 		}
 		l_iter++;
 	}
-	return NULL;
+	return nullptr;
 }
 
 AdventureTemplate *AdventureManager::GetAdventureTemplate(int id)
@@ -626,7 +626,7 @@ AdventureTemplate *AdventureManager::GetAdventureTemplate(int id)
 	map<uint32, AdventureTemplate*>::iterator iter = adventure_templates.find(id);
 	if(iter == adventure_templates.end())
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	return iter->second;
@@ -710,7 +710,7 @@ bool AdventureManager::LoadAdventureEntries()
 		{
 			int id = atoi(row[0]);
 			int template_id = atoi(row[1]);
-			AdventureTemplate* tid = NULL;
+			AdventureTemplate* tid = nullptr;
 
 			map<uint32, AdventureTemplate*>::iterator t_iter = adventure_templates.find(template_id);
 			if(t_iter == adventure_templates.end())
@@ -842,7 +842,7 @@ void AdventureManager::LeaveAdventure(const char *name)
 void AdventureManager::IncrementCount(uint16 instance_id)
 {
 	list<Adventure*>::iterator iter = adventure_list.begin();
-	Adventure *current = NULL;
+	Adventure *current = nullptr;
 	while(iter != adventure_list.end())
 	{
 		if((*iter)->GetInstanceID() == instance_id)
@@ -882,7 +882,7 @@ void AdventureManager::IncrementCount(uint16 instance_id)
 void AdventureManager::IncrementAssassinationCount(uint16 instance_id)
 {
 	list<Adventure*>::iterator iter = adventure_list.begin();
-	Adventure *current = NULL;
+	Adventure *current = nullptr;
 	while(iter != adventure_list.end())
 	{
 		if((*iter)->GetInstanceID() == instance_id)
@@ -903,7 +903,7 @@ void AdventureManager::IncrementAssassinationCount(uint16 instance_id)
 void AdventureManager::GetZoneData(uint16 instance_id)
 {
 	list<Adventure*>::iterator iter = adventure_list.begin();
-	Adventure *current = NULL;
+	Adventure *current = nullptr;
 	while(iter != adventure_list.end())
 	{
 		if((*iter)->GetInstanceID() == instance_id)
@@ -2183,7 +2183,7 @@ void AdventureManager::Load()
 	//disabled for now
 	return;
 
-	char *data = NULL;
+	char *data = nullptr;
 	FILE *f = fopen("adventure_state.dat", "r");
 	if(f)
 	{

world/EQLConfig.cpp

@@ -88,7 +88,7 @@ EQLConfig *EQLConfig::CreateLauncher(const char *name, uint8 dynamic_count) {
 		 namebuf, dynamic_count), errbuf)) {
 		LogFile->write(EQEMuLog::Error, "Error in CreateLauncher query: %s", errbuf);
 		safe_delete_array(query);
-		return NULL;
+		return nullptr;
 	}
 	safe_delete_array(query);
 
@@ -107,7 +107,7 @@ void EQLConfig::GetZones(std::vector<LauncherZone> &result) {
 vector<string> EQLConfig::ListZones() {
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
 	vector<string> res;
-	if(ll == NULL) {
+	if(ll == nullptr) {
 		//if the launcher isnt connected, use the list from the database.
 		map<string, LauncherZone>::iterator cur, end;
 		cur = m_zones.begin();
@@ -154,26 +154,26 @@ void EQLConfig::DeleteLauncher() {
 
 bool EQLConfig::IsConnected() const {
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	return(ll != NULL);
+	return(ll != nullptr);
 }
 
 void EQLConfig::RestartZone(Const_char *zone_ref) {
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll == NULL)
+	if(ll == nullptr)
 		return;
 	ll->RestartZone(zone_ref);
 }
 
 void EQLConfig::StopZone(Const_char *zone_ref) {
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll == NULL)
+	if(ll == nullptr)
 		return;
 	ll->StopZone(zone_ref);
 }
 
 void EQLConfig::StartZone(Const_char *zone_ref) {
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll == NULL)
+	if(ll == nullptr)
 		return;
 	ll->StartZone(zone_ref);
 }
@@ -211,7 +211,7 @@ bool EQLConfig::BootStaticZone(Const_char *short_name, uint16 port) {
 
 	//if the launcher is connected, update it.
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->BootZone(short_name, port);
 	}
 
@@ -259,7 +259,7 @@ bool EQLConfig::ChangeStaticZone(Const_char *short_name, uint16 port) {
 
 	//if the launcher is connected, update it.
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->RestartZone(short_name);
 	}
 
@@ -301,7 +301,7 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) {
 
 	//if the launcher is connected, update it.
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->StopZone(short_name);
 	}
 
@@ -330,7 +330,7 @@ bool EQLConfig::SetDynamicCount(int count) {
 
 	//if the launcher is connected, update it.
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->BootDynamics(count);
 	}
 
@@ -345,7 +345,7 @@ map<string,string> EQLConfig::GetZoneDetails(Const_char *zone_ref) {
 	map<string,string> res;
 
 	LauncherLink *ll = launcher_list.Get(m_name.c_str());
-	if(ll == NULL) {
+	if(ll == nullptr) {
 		res["name"] = zone_ref;
 		res["up"] = "0";
 		res["starts"] = "0";

world/EQW.cpp

@@ -138,7 +138,7 @@ map<string,string> EQW::GetZoneDetails(Const_char *zone_ref) {
 	map<string,string> res;
 	
 	ZoneServer *zs = zoneserver_list.FindByID(atoi(zone_ref));
-	if(zs == NULL) {
+	if(zs == nullptr) {
 		res["error"] = "Invalid zone.";
 		return(res);
 	}
@@ -156,7 +156,7 @@ map<string,string> EQW::GetZoneDetails(Const_char *zone_ref) {
 	res["launcher"] = "";
 	if(zs->GetZoneID() != 0) {
 		LauncherLink *ll = launcher_list.FindByZone(zs->GetLaunchName());
-		if(ll != NULL)
+		if(ll != nullptr)
 			res["launcher"] = ll->GetName();
 	}
 	
@@ -187,7 +187,7 @@ map<string,string> EQW::GetPlayerDetails(Const_char *char_name) {
 	map<string,string> res;
 	
 	ClientListEntry *cle = client_list.FindCharacter(char_name);
-	if(cle == NULL) {
+	if(cle == nullptr) {
 		res["error"] = "1";
 		return(res);
 	}
@@ -270,17 +270,17 @@ void EQW::CreateLauncher(Const_char *launcher_name, int dynamic_count) {
 
 void EQW::LSReconnect() {
 	#ifdef _WINDOWS
-		_beginthread(AutoInitLoginServer, 0, NULL);
+		_beginthread(AutoInitLoginServer, 0, nullptr);
 	#else
 		pthread_t thread;
-		pthread_create(&thread, NULL, &AutoInitLoginServer, NULL);
+		pthread_create(&thread, nullptr, &AutoInitLoginServer, nullptr);
 	#endif
 	RunLoops = true;
 	_log(WORLD__CONSOLE,"Login Server Reconnect manually restarted by Web Tool");
 }
 
 /*EQLConfig * EQW::FindLauncher(Const_char *zone_ref) {
-	return(NULL);
+	return(nullptr);
 }*/
 
 /*
@@ -288,7 +288,7 @@ map<string,string> EQW::GetLaunchersDetails(Const_char *launcher_name) {
 	map<string,string> res;
 	
 	LauncherLink *ll = launcher_list.Get(launcher_name);
-	if(ll == NULL) {
+	if(ll == nullptr) {
 		res["name"] = launcher_name;
 		res["ip"] = "Not Connected";
 		res["id"] = "0";
@@ -309,7 +309,7 @@ map<string,string> EQW::GetLaunchersDetails(Const_char *launcher_name) {
 vector<string> EQW::ListLauncherZones(Const_char *launcher_name) {
 	vector<string> list;
 	LauncherLink *ll = launcher_list.Get(launcher_name);
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->GetZoneList(list);
 	}
 	return(list);
@@ -318,7 +318,7 @@ vector<string> EQW::ListLauncherZones(Const_char *launcher_name) {
 map<string,string> EQW::GetLauncherZoneDetails(Const_char *launcher_name, Const_char *zone_ref) {
 	map<string,string> res;
 	LauncherLink *ll = launcher_list.Get(launcher_name);
-	if(ll != NULL) {
+	if(ll != nullptr) {
 		ll->GetZoneDetails(zone_ref, res);
 	} else {
 		res["error"] = "Launcher Not Found";

world/EQWHTTPHandler.cpp

@@ -29,7 +29,7 @@ using namespace std;
 
 Mime EQWHTTPHandler::s_mime;
 #ifdef EMBPERL
-EQWParser *EQWHTTPHandler::s_parser = NULL;
+EQWParser *EQWHTTPHandler::s_parser = nullptr;
 #endif
 const int EQWHTTPHandler::READ_BUFFER_LEN = 1024;	//for page IO, was a static const member, but VC6 got mad.
 
@@ -45,7 +45,7 @@ EQWHTTPHandler::~EQWHTTPHandler() {
 
 #ifdef EMBPERL
 EQWParser *EQWHTTPHandler::GetParser() {
-	if(s_parser == NULL) {
+	if(s_parser == nullptr) {
 		EQW::Singleton()->ClearOutput();
 		s_parser = new EQWParser();
 		const string &res = EQW::Singleton()->GetOutput();
@@ -158,7 +158,7 @@ void EQWHTTPHandler::SendPage(const std::string &file) {
 	path += file;
 	
 	FILE *f = fopen(path.c_str(), "rb");
-	if(f == NULL) {
+	if(f == nullptr) {
 		SendResponse("404", "Not Found");
 		SendString("Not found.");
 		printf("%s not found.\n", file.c_str());
@@ -203,7 +203,7 @@ void EQWHTTPHandler::SendPage(const std::string &file) {
 		ProcessAndSend(to_process);
 		
 		//clear out the form, just in case (since it gets destroyed next)
-		GetParser()->SetHTTPRequest("testing", NULL);
+		GetParser()->SetHTTPRequest("testing", nullptr);
 	}
 #endif
 }
@@ -315,7 +315,7 @@ bool EQWHTTPServer::Start(uint16 port, const char *mime_file) {
 #ifdef _WINDOWS
 	_beginthread(ThreadProc, 0, this);
 #else
-	pthread_create(&m_thread, NULL, ThreadProc, this);
+	pthread_create(&m_thread, nullptr, ThreadProc, this);
 #endif*/
 	
 	return(true);
@@ -333,7 +333,7 @@ void EQWHTTPServer::Run() {
 
 ThreadReturnType EQWHTTPServer::ThreadProc(void *data) {
 	((EQWHTTPServer *) data)->Run();
-	THREAD_RETURN(NULL);
+	THREAD_RETURN(nullptr);
 }*/
 
 

world/EQWParser.cpp

@@ -76,12 +76,12 @@ EQWParser::EQWParser() {
 void EQWParser::DoInit() {
 	const char *argv_eqemu[] = { "",
 		"-w", "-W",
-		"-e", "0;", NULL };
+		"-e", "0;", nullptr };
 
 	int argc = 5;
 
 	char **argv = (char **)argv_eqemu;
-	char **env = { NULL };
+	char **env = { nullptr };
 
 	PL_perl_destruct_level = 1;
 
@@ -151,7 +151,7 @@ void EQWParser::DoInit() {
 	//make sure the EQW pointer is set up in this package
 	EQW *curc = EQW::Singleton();
 	SV *l = get_sv("world::EQW", true);
-	if(curc != NULL) {
+	if(curc != nullptr) {
 		sv_setref_pv(l, "EQW", curc);
 	} else {
 		//clear out the value, mainly to get rid of blessedness
@@ -162,7 +162,7 @@ void EQWParser::DoInit() {
 	EQDB::SetMySQL(database.getMySQL());
 	EQDB *curc_db = EQDB::Singleton();
 	SV *l_db = get_sv("world::EQDB", true);
-	if(curc_db != NULL) {
+	if(curc_db != nullptr) {
 		sv_setref_pv(l_db, "EQDB", curc_db);
 	} else {
 		//clear out the value, mainly to get rid of blessedness
@@ -272,7 +272,7 @@ void EQWParser::EQW_eval(const char *pkg, const char *code) {
 	snprintf(namebuf, 64, "EQW");
 //	snprintf(namebuf, 64, "%s::EQW", pkg);
 	SV *l = get_sv(namebuf, true);
-	if(curc != NULL) {
+	if(curc != nullptr) {
 		sv_setref_pv(l, "EQW", curc);
 	} else {
 		//clear out the value, mainly to get rid of blessedness
@@ -283,7 +283,7 @@ void EQWParser::EQW_eval(const char *pkg, const char *code) {
 	snprintf(namebuf, 64, "EQDB");
 //	snprintf(namebuf, 64, "%s::EQW", pkg);
 	SV *l_db = get_sv(namebuf, true);
-	if(curc_db != NULL) {
+	if(curc_db != nullptr) {
 		sv_setref_pv(l_db, "EQDB", curc_db);
 	} else {
 		//clear out the value, mainly to get rid of blessedness
@@ -305,7 +305,7 @@ void EQWParser::SetHTTPRequest(const char *pkg, HTTPRequest *it) {
 	snprintf(namebuf, 64, "request");
 //	snprintf(namebuf, 64, "%s::EQW", pkg);
 	SV *l = get_sv(namebuf, true);
-	if(it != NULL) {
+	if(it != nullptr) {
 		sv_setref_pv(l, "HTTPRequest", it);
 	} else {
 		//clear out the value, mainly to get rid of blessedness

world/LauncherLink.cpp

@@ -127,7 +127,7 @@ bool LauncherLink::Process() {
 			m_name = it->name;
 			
 			EQLConfig *config = launcher_list.GetConfig(m_name.c_str());
-			if(config == NULL) {
+			if(config == nullptr) {
 				_log(WORLD__LAUNCH, "Unknown launcher '%s' connected. Disconnecting.", it->name);
 				Disconnect();
 				break;

world/LauncherList.cpp

@@ -108,7 +108,7 @@ LauncherLink *LauncherList::Get(const char *name) {
 	map<string, LauncherLink *>::iterator res;
 	res = m_launchers.find(name);
 	if(res == m_launchers.end())
-		return(NULL);
+		return(nullptr);
 	return(res->second);
 /*	string goal(name);
 	
@@ -119,7 +119,7 @@ LauncherLink *LauncherList::Get(const char *name) {
 		if(goal == (*cur)->GetName())
 			return(*cur);
 	}
-	return(NULL);*/
+	return(nullptr);*/
 }
 
 LauncherLink *LauncherList::FindByZone(const char *short_name) {
@@ -130,7 +130,7 @@ LauncherLink *LauncherList::FindByZone(const char *short_name) {
 		if(cur->second->ContainsZone(short_name))
 			return(cur->second);
 	}
-	return(NULL);
+	return(nullptr);
 }
 
 void LauncherList::Add(EmuTCPConnection *conn) {
@@ -170,7 +170,7 @@ EQLConfig *LauncherList::GetConfig(const char *name) {
 	map<string, EQLConfig *>::iterator res;
 	res = m_configs.find(name);
 	if(res == m_configs.end()) {
-		return(NULL);
+		return(nullptr);
 	}
 	return(res->second);
 }

world/WorldConfig.cpp

@@ -18,7 +18,7 @@
 #include "../common/debug.h"
 #include "WorldConfig.h"
 
-WorldConfig *WorldConfig::_world_config = NULL;
+WorldConfig *WorldConfig::_world_config = nullptr;
 
 
 string WorldConfig::GetByName(const string &var_name) const {

world/WorldConfig.h

@@ -40,14 +40,14 @@ public:
 
 	// Produce a const singleton
 	static const WorldConfig *get() {
-		if (_world_config == NULL) 
+		if (_world_config == nullptr) 
 			LoadConfig();
 		return(_world_config);
 	}
 
 	// Load the config
 	static bool LoadConfig() {
-		if (_world_config != NULL)
+		if (_world_config != nullptr)
 			delete _world_config;
 		_world_config=new WorldConfig;
 		_config=_world_config;

world/client.cpp

@@ -1073,7 +1073,7 @@ void Client::EnterWorld(bool TryBootup) {
 	if (zoneID == 0)
 		return;
 
-	ZoneServer* zs = NULL;
+	ZoneServer* zs = nullptr;
 	if(instanceID > 0)
 	{
 		if(database.VerifyInstanceAlive(instanceID, GetCharID()))
@@ -1085,7 +1085,7 @@ void Client::EnterWorld(bool TryBootup) {
 			else
 			{
 				instanceID = 0;
-				zs = NULL;
+				zs = nullptr;
 				database.MoveCharacterToBind(GetCharID());
 				ZoneUnavail();
 				return;
@@ -1094,7 +1094,7 @@ void Client::EnterWorld(bool TryBootup) {
 		else
 		{
 			instanceID = 0;
-			zs = NULL;
+			zs = nullptr;
 			database.MoveCharacterToBind(GetCharID());
 			ZoneUnavail();
 			return;
@@ -1159,7 +1159,7 @@ void Client::EnterWorld(bool TryBootup) {
 
 void Client::Clearance(int8 response)
 {
-	ZoneServer* zs = NULL;
+	ZoneServer* zs = nullptr;
 	if(instanceID > 0)
 	{
 		zs = zoneserver_list.FindByInstanceID(instanceID);
@@ -1184,21 +1184,21 @@ void Client::Clearance(int8 response)
 
 	EQApplicationPacket* outapp;
 
-    if (zs->GetCAddress() == NULL) {
+    if (zs->GetCAddress() == nullptr) {
         clog(WORLD__CLIENT_ERR, "Unable to do zs->GetCAddress() in Client::Clearance!!");
         ZoneUnavail();
         return;
     }
 
     if (zoneID == 0) {
-        clog(WORLD__CLIENT_ERR, "zoneID is NULL in Client::Clearance!!");
+        clog(WORLD__CLIENT_ERR, "zoneID is nullptr in Client::Clearance!!");
         ZoneUnavail();
         return;
     }
 
 	const char* zonename = database.GetZoneName(zoneID);
     if (zonename == 0) {
-        clog(WORLD__CLIENT_ERR, "zonename is NULL in Client::Clearance!!");
+        clog(WORLD__CLIENT_ERR, "zonename is nullptr in Client::Clearance!!");
         ZoneUnavail();
         return;
     }
@@ -1252,7 +1252,7 @@ void Client::ZoneUnavail() {
 }
 
 bool Client::GenPassKey(char* key) {
-	char* passKey=NULL;
+	char* passKey=nullptr;
 	*passKey += ((char)('A'+((int)MakeRandomInt(0, 25))));
 	*passKey += ((char)('A'+((int)MakeRandomInt(0, 25))));
 	memcpy(key, passKey, strlen(passKey));
@@ -1273,7 +1273,7 @@ void Client::SendGuildList() {
 
 	//ask the guild manager to build us a nice guild list packet
 	outapp->pBuffer = guild_mgr.MakeGuildList("", outapp->size);
-	if(outapp->pBuffer == NULL) {
+	if(outapp->pBuffer == nullptr) {
 		clog(GUILDS__ERROR, "Unable to make guild list!");
 		return;
 	}
@@ -1353,7 +1353,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 	PlayerProfile_Struct pp;
 	ExtendedProfile_Struct ext;
 	Inventory inv;
-	time_t bday = time(NULL);
+	time_t bday = time(nullptr);
 	char startzone[50]={0};
 	uint32 i;
 	struct in_addr	in;

world/clientlist.cpp

@@ -769,14 +769,14 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon
 
 	// FriendsString is a comma delimited list of names.
 
-	char *Seperator = NULL;
+	char *Seperator = nullptr;
 
 	Seperator = strchr(FriendsPointer, ',');
 	if(!Seperator) Seperator = strchr(FriendsPointer, '\0');
 
 	uint32 TotalLength=0;
 
-	while(Seperator != NULL) {
+	while(Seperator != nullptr) {
 
 		if((Seperator - FriendsPointer) > 64) return;
 
@@ -1216,15 +1216,15 @@ bool ClientList::SendPacket(const char* to, ServerPacket* pack) {
 	}
 	else {
 		ClientListEntry* cle = FindCharacter(to);
-		if (cle != NULL) {
-			if (cle->Server() != NULL) {
+		if (cle != nullptr) {
+			if (cle->Server() != nullptr) {
 				cle->Server()->SendPacket(pack);
 				return true;
 			}
 			return false;
 		} else {
 			ZoneServer* zs = zoneserver_list.FindByName(to);
-			if (zs != NULL) {
+			if (zs != nullptr) {
 				zs->SendPacket(pack);
 				return true;
 			}

world/console.cpp

@@ -781,10 +781,10 @@ void Console::ProcessCommand(const char* command) {
 			}
 			else if (strcasecmp(sep.arg[0], "LSReconnect") == 0 && admin >= 100) {
 				#ifdef _WINDOWS
-					_beginthread(AutoInitLoginServer, 0, NULL);
+					_beginthread(AutoInitLoginServer, 0, nullptr);
 				#else
 					pthread_t thread;
-					pthread_create(&thread, NULL, &AutoInitLoginServer, NULL);
+					pthread_create(&thread, nullptr, &AutoInitLoginServer, nullptr);
 				#endif
 				RunLoops = true;
 				SendMessage(1, "  Login Server Reconnect manually restarted by Console");

world/lfplist.cpp

@@ -265,13 +265,13 @@ void GroupLFPList::SendLFPMatches(ServerLFPMatchesRequest_Struct* smrs) {
 	}
 
 	ClientListEntry* CLE = client_list.FindCharacter(smrs->FromName);
-	if (CLE != NULL) {
-		if (CLE->Server() != NULL) 
+	if (CLE != nullptr) {
+		if (CLE->Server() != nullptr) 
 			CLE->Server()->SendPacket(Pack);
 	}
 	else {
 		ZoneServer* zs = zoneserver_list.FindByName(smrs->FromName);
-		if (zs != NULL) 
+		if (zs != nullptr) 
 			zs->SendPacket(Pack);
 	}
 	safe_delete(Pack);

world/net.cpp

@@ -111,7 +111,7 @@ UCSConnection UCSLink;
 QueryServConnection QSLink;
 LauncherList launcher_list;
 AdventureManager adventure_manager;
-DBAsync *dbasync = NULL;
+DBAsync *dbasync = nullptr;
 volatile bool RunLoops = true;
 uint32 numclients = 0;
 uint32 numzones = 0;
@@ -468,10 +468,10 @@ int main(int argc, char** argv) {
 				ReconnectCounter = 0;
 				if (loginserverlist.AllConnected() == false) {
 #ifdef _WINDOWS
-					_beginthread(AutoInitLoginServer, 0, NULL);
+					_beginthread(AutoInitLoginServer, 0, nullptr);
 #else
 					pthread_t thread;
-					pthread_create(&thread, NULL, &AutoInitLoginServer, NULL);
+					pthread_create(&thread, nullptr, &AutoInitLoginServer, nullptr);
 #endif
 				}
 			}

world/perl_EQLConfig.cpp

@@ -58,8 +58,8 @@ XS(XS_EQLConfig_GetName)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetName();
 		sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
@@ -84,8 +84,8 @@ XS(XS_EQLConfig_GetStaticCount)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetStaticCount();
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -109,8 +109,8 @@ XS(XS_EQLConfig_IsConnected)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->IsConnected();
 		ST(0) = boolSV(RETVAL);
@@ -134,8 +134,8 @@ XS(XS_EQLConfig_DeleteLauncher)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->DeleteLauncher();
 	}
@@ -158,8 +158,8 @@ XS(XS_EQLConfig_RestartZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->RestartZone(zone_ref);
 	}
@@ -182,8 +182,8 @@ XS(XS_EQLConfig_StopZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->StopZone(zone_ref);
 	}
@@ -206,8 +206,8 @@ XS(XS_EQLConfig_StartZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->StartZone(zone_ref);
 	}
@@ -232,8 +232,8 @@ XS(XS_EQLConfig_BootStaticZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->BootStaticZone(short_name, port);
 		ST(0) = boolSV(RETVAL);
@@ -260,8 +260,8 @@ XS(XS_EQLConfig_ChangeStaticZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->ChangeStaticZone(short_name, port);
 		ST(0) = boolSV(RETVAL);
@@ -287,8 +287,8 @@ XS(XS_EQLConfig_DeleteStaticZone)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->DeleteStaticZone(short_name);
 		ST(0) = boolSV(RETVAL);
@@ -314,8 +314,8 @@ XS(XS_EQLConfig_SetDynamicCount)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetDynamicCount(count);
 		ST(0) = boolSV(RETVAL);
@@ -341,8 +341,8 @@ XS(XS_EQLConfig_GetDynamicCount)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetDynamicCount();
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -366,8 +366,8 @@ XS(XS_EQLConfig_ListZones)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->ListZones();
 		ST(0) = sv_newmortal();
@@ -407,8 +407,8 @@ XS(XS_EQLConfig_GetZoneDetails)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQLConfig");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetZoneDetails(zone_ref);
 		ST(0) = sv_newmortal();
@@ -425,7 +425,7 @@ XS(XS_EQLConfig_GetZoneDetails)
 				for(; cur != end; cur++) {
 						/* get the element from the hash, creating if needed (will be needed) */
 						SV**ele = hv_fetch(hv, cur->first.c_str(), cur->first.length(), TRUE);
-						if(ele == NULL) {
+						if(ele == nullptr) {
 								Perl_croak(aTHX_ "Unable to create a hash element for RETVAL");
 								break;
 						}

world/perl_EQW.cpp

@@ -59,8 +59,8 @@ XS(XS_EQW_GetConfig)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetConfig(var_name);
 		sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
@@ -83,8 +83,8 @@ XS(XS_EQW_LockWorld)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->LockWorld();
 	}
@@ -106,8 +106,8 @@ XS(XS_EQW_UnlockWorld)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->UnlockWorld();
 	}
@@ -130,8 +130,8 @@ XS(XS_EQW_LSConnected)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->LSConnected();
 		ST(0) = boolSV(RETVAL);
@@ -155,8 +155,8 @@ XS(XS_EQW_LSReconnect)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->LSReconnect();
 	}
@@ -180,8 +180,8 @@ XS(XS_EQW_CountZones)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CountZones();
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -205,8 +205,8 @@ XS(XS_EQW_ListBootedZones)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->ListBootedZones();
 		ST(0) = sv_newmortal();
@@ -246,8 +246,8 @@ XS(XS_EQW_GetZoneDetails)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetZoneDetails(zone_ref);
 		ST(0) = sv_newmortal();
@@ -264,7 +264,7 @@ XS(XS_EQW_GetZoneDetails)
 				for(; cur != end; cur++) {
 						/* get the element from the hash, creating if needed (will be needed) */
 						SV**ele = hv_fetch(hv, cur->first.c_str(), cur->first.length(), TRUE);
-						if(ele == NULL) {
+						if(ele == nullptr) {
 								Perl_croak(aTHX_ "Unable to create a hash element for RETVAL");
 								break;
 						}
@@ -310,8 +310,8 @@ XS(XS_EQW_CountPlayers)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CountPlayers();
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -336,8 +336,8 @@ XS(XS_EQW_ListPlayers)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 2)
 			zone_name = "";
@@ -383,8 +383,8 @@ XS(XS_EQW_GetPlayerDetails)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetPlayerDetails(player_ref);
 		ST(0) = sv_newmortal();
@@ -401,7 +401,7 @@ XS(XS_EQW_GetPlayerDetails)
 				for(; cur != end; cur++) {
 						/* get the element from the hash, creating if needed (will be needed) */
 						SV**ele = hv_fetch(hv, cur->first.c_str(), cur->first.length(), TRUE);
-						if(ele == NULL) {
+						if(ele == nullptr) {
 								Perl_croak(aTHX_ "Unable to create a hash element for RETVAL");
 								break;
 						}
@@ -448,8 +448,8 @@ XS(XS_EQW_CountLaunchers)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CountLaunchers(active_only);
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -473,8 +473,8 @@ XS(XS_EQW_ListLaunchers)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->ListLaunchers();
 		ST(0) = sv_newmortal();
@@ -514,8 +514,8 @@ XS(XS_EQW_GetLauncher)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetLauncher(launcher_name);
 		ST(0) = sv_newmortal();
@@ -541,8 +541,8 @@ XS(XS_EQW_CreateLauncher)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->CreateLauncher(launcher_name, dynamic_count);
 	}
@@ -568,8 +568,8 @@ XS(XS_EQW_CreateGuild)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CreateGuild(name, leader_char_id);
 		XSprePUSH; PUSHu((UV)RETVAL);
@@ -594,8 +594,8 @@ XS(XS_EQW_DeleteGuild)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->DeleteGuild(guild_id);
 		ST(0) = boolSV(RETVAL);
@@ -622,8 +622,8 @@ XS(XS_EQW_RenameGuild)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->RenameGuild(guild_id, name);
 		ST(0) = boolSV(RETVAL);
@@ -651,8 +651,8 @@ XS(XS_EQW_SetGuildMOTD)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetGuildMOTD(guild_id, motd, setter);
 		ST(0) = boolSV(RETVAL);
@@ -679,8 +679,8 @@ XS(XS_EQW_SetGuildLeader)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetGuildLeader(guild_id, leader_char_id);
 		ST(0) = boolSV(RETVAL);
@@ -708,8 +708,8 @@ XS(XS_EQW_SetGuild)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetGuild(charid, guild_id, rank);
 		ST(0) = boolSV(RETVAL);
@@ -736,8 +736,8 @@ XS(XS_EQW_SetGuildRank)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetGuildRank(charid, rank);
 		ST(0) = boolSV(RETVAL);
@@ -764,8 +764,8 @@ XS(XS_EQW_SetBankerFlag)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetBankerFlag(charid, is_banker);
 		ST(0) = boolSV(RETVAL);
@@ -792,8 +792,8 @@ XS(XS_EQW_SetTributeFlag)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetTributeFlag(charid, enabled);
 		ST(0) = boolSV(RETVAL);
@@ -820,8 +820,8 @@ XS(XS_EQW_SetPublicNote)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->SetPublicNote(charid, note);
 		ST(0) = boolSV(RETVAL);
@@ -847,8 +847,8 @@ XS(XS_EQW_CountBugs)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CountBugs();
 		XSprePUSH; PUSHi((IV)RETVAL);
@@ -874,8 +874,8 @@ XS(XS_EQW_ListBugs)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
         
 		RETVAL = THIS->ListBugs(id);
 		ST(0) = sv_newmortal();
@@ -915,8 +915,8 @@ XS(XS_EQW_GetBugDetails)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetBugDetails(bug_ref);
 		ST(0) = sv_newmortal();
@@ -933,7 +933,7 @@ XS(XS_EQW_GetBugDetails)
 				for(; cur != end; cur++) {
 						/* get the element from the hash, creating if needed (will be needed) */
 						SV**ele = hv_fetch(hv, cur->first.c_str(), cur->first.length(), TRUE);
-						if(ele == NULL) {
+						if(ele == nullptr) {
 								Perl_croak(aTHX_ "Unable to create a hash element for RETVAL");
 								break;
 						}
@@ -961,8 +961,8 @@ XS(XS_EQW_ResolveBug)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type EQW");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
         
 		THIS->ResolveBug(id);
 	}

world/perl_HTTPRequest.cpp

@@ -60,8 +60,8 @@ XS(XS_HTTPRequest_get)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 3)
 			default_value = "";
@@ -94,8 +94,8 @@ XS(XS_HTTPRequest_getInt)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 3)
 			default_value = 0;
@@ -128,8 +128,8 @@ XS(XS_HTTPRequest_getFloat)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 3)
 			default_value = 0.0;
@@ -162,8 +162,8 @@ XS(XS_HTTPRequest_getEscaped)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 3)
 			default_value = "";
@@ -193,8 +193,8 @@ XS(XS_HTTPRequest_get_all)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->get_all();
 		ST(0) = sv_newmortal();
@@ -211,7 +211,7 @@ XS(XS_HTTPRequest_get_all)
 				for(; cur != end; cur++) {
 						/* get the element from the hash, creating if needed (will be needed) */
 						SV**ele = hv_fetch(hv, cur->first.c_str(), cur->first.length(), TRUE);
-						if(ele == NULL) {
+						if(ele == nullptr) {
 								Perl_croak(aTHX_ "Unable to create a hash element for RETVAL");
 								break;
 						}
@@ -256,8 +256,8 @@ XS(XS_HTTPRequest_redirect)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->redirect(URL);
 	}
@@ -280,8 +280,8 @@ XS(XS_HTTPRequest_SetResponseCode)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->SetResponseCode(code);
 	}
@@ -305,8 +305,8 @@ XS(XS_HTTPRequest_header)
 		}
 		else
 			Perl_croak(aTHX_ "THIS is not of type HTTPRequest");
-		if(THIS == NULL)
-			Perl_croak(aTHX_ "THIS is NULL, avoiding crash.");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->header(name, value);
 	}

world/worlddb.cpp

@@ -95,7 +95,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct*
 					cs->tutorial[char_num] = 1;
 
 				if(RuleB(World, EnableReturnHomeButton)) {
-					int now = time(NULL);
+					int now = time(nullptr);
 					if((now - pp->lastlogin) >= RuleI(World, MinOfflineTimeToReturnHome))
 						cs->gohome[char_num] = 1;
 				}

world/zonelist.cpp

@@ -656,7 +656,7 @@ uint32 ZSList::TriggerBootup(uint32 iZoneID, uint32 iInstanceID) {
 	/*Old Random boot zones use this if your server is distributed across computers.
 	LinkedListIterator<ZoneServer*> iterator(list);
 
-	srand(time(NULL));
+	srand(time(nullptr));
 	uint32 x = 0;
 	iterator.Reset();
 	while(iterator.MoreElements()) {

world/zoneserver.cpp

@@ -95,7 +95,7 @@ bool ZoneServer::SetZone(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 	if (zn)
 	{
 		strn0cpy(zone_name, zn, sizeof(zone_name));
-		if( database.GetZoneLongName( (char*)zone_name, &longname, NULL, NULL, NULL, NULL, NULL, NULL ) )
+		if( database.GetZoneLongName( (char*)zone_name, &longname, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr ) )
 		{
 			strn0cpy(long_name, longname, sizeof(long_name));
 			safe_delete_array( longname );
@@ -665,7 +665,7 @@ bool ZoneServer::Process() {
 			if(pack->size != sizeof(ZoneToZone_Struct))
 				break;
 			ZoneToZone_Struct* ztz = (ZoneToZone_Struct*) pack->pBuffer;
-			ClientListEntry* client = NULL;
+			ClientListEntry* client = nullptr;
 			if(WorldConfig::get()->UpdateStats)
 				client = client_list.FindCharacter(ztz->name);
 
@@ -688,7 +688,7 @@ bool ZoneServer::Process() {
 					break;
 				}
 
-				ZoneServer *ingress_server = NULL;
+				ZoneServer *ingress_server = nullptr;
 				if(ztz->requested_instance_id > 0)
 				{
 					ingress_server = zoneserver_list.FindByInstanceID(ztz->requested_instance_id);
@@ -731,7 +731,7 @@ bool ZoneServer::Process() {
 			else	// this is response from the ingress server, route it back to the egress server
 			{
 				zlog(WORLD__ZONE,"Processing ZTZ for ingress to zone for client %s\n", ztz->name);
-				ZoneServer *egress_server = NULL;
+				ZoneServer *egress_server = nullptr;
 				if(ztz->current_instance_id > 0)
 				{
 					egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id);