remove NULL (#2626)

gframe/CGUIImageButton.cpp

@@ -166,7 +166,7 @@ IGUIFont* CGUIImageButton::getOverrideFont( void ) const
 {
 	IGUISkin* skin = Environment->getSkin();
 	if (!skin)
-		return NULL;
+		return nullptr;
 	return skin->getFont();
 }
 
@@ -174,7 +174,7 @@ IGUIFont* CGUIImageButton::getActiveFont() const
 {
 	IGUISkin* skin = Environment->getSkin();
 	if (!skin)
-		return NULL;
+		return nullptr;
 	return skin->getFont();
 }
 

gframe/data_manager.cpp

@@ -88,7 +88,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) {
 #else
 	IReadFile* reader = FileSystem->createAndOpenFile(file);
 #endif
-	if(reader == NULL)
+	if(reader == nullptr)
 		return false;
 	spmemvfs_db_t db;
 	spmembuffer_t* mem = (spmembuffer_t*)calloc(sizeof(spmembuffer_t), 1);

gframe/deck_manager.cpp

@@ -253,7 +253,7 @@ void DeckManager::GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory,
 	wchar_t filepath[256];
 	wchar_t catepath[256];
 	const wchar_t* deckname = cbDeck->getItem(cbDeck->getSelected());
-	if(deckname != NULL) {
+	if(deckname != nullptr) {
 		GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
 		myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
 		BufferIO::CopyWStr(filepath, ret, 256);

gframe/drawing.cpp

@@ -1131,8 +1131,8 @@ void Game::DrawThumb(code_pointer cp, position2di pos, const std::unordered_map<
 	if(lcode == 0)
 		lcode = code;
 	irr::video::ITexture* img = imageManager.GetTextureThumb(code);
-	if(img == NULL)
-		return; //NULL->getSize() will cause a crash
+	if(img == nullptr)
+		return; //nullptr->getSize() will cause a crash
 	dimension2d<u32> size = img->getOriginalSize();
 	recti dragloc = mainGame->Resize(pos.X, pos.Y, pos.X + CARD_THUMB_WIDTH, pos.Y + CARD_THUMB_HEIGHT);
 	recti limitloc = mainGame->Resize(pos.X, pos.Y, pos.X + 20, pos.Y + 20);

gframe/duelclient.cpp

@@ -50,7 +50,7 @@ bool DuelClient::StartClient(unsigned int ip, unsigned short port, bool create_g
 	sin.sin_port = htons(port);
 	client_bev = bufferevent_socket_new(client_base, -1, BEV_OPT_CLOSE_ON_FREE);
 	bufferevent_setwatermark(client_bev, EV_READ, 3, 0);
-	bufferevent_setcb(client_bev, ClientRead, NULL, ClientEvent, (void*)create_game);
+	bufferevent_setcb(client_bev, ClientRead, nullptr, ClientEvent, (void*)create_game);
 	if (bufferevent_socket_connect(client_bev, (sockaddr*)&sin, sizeof(sin)) < 0) {
 		bufferevent_free(client_bev);
 		event_base_free(client_base);

gframe/game.cpp

@@ -1723,7 +1723,7 @@ void Game::ErrorLog(const char* msg) {
 	FILE* fp = fopen("error.log", "at");
 	if(!fp)
 		return;
-	time_t nowtime = time(NULL);
+	time_t nowtime = time(nullptr);
 	tm* localedtime = localtime(&nowtime);
 	char timebuf[40];
 	strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
@@ -2127,7 +2127,7 @@ recti Game::ResizeFit(s32 x, s32 y, s32 x2, s32 y2) {
 }
 void Game::SetWindowsIcon() {
 #ifdef _WIN32
-	HINSTANCE hInstance = (HINSTANCE)GetModuleHandleW(NULL);
+	HINSTANCE hInstance = (HINSTANCE)GetModuleHandleW(nullptr);
 	HICON hSmallIcon = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(1), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	HICON hBigIcon = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(1), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
 	SendMessageW(hWnd, WM_SETICON, ICON_SMALL, (long)hSmallIcon);

gframe/gframe.cpp

@@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
 #endif
 #ifdef __APPLE__
 	CFURLRef bundle_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-	CFURLRef bundle_base_url = CFURLCreateCopyDeletingLastPathComponent(NULL, bundle_url);
+	CFURLRef bundle_base_url = CFURLCreateCopyDeletingLastPathComponent(nullptr, bundle_url);
 	CFRelease(bundle_url);
 	CFStringRef path = CFURLCopyFileSystemPath(bundle_base_url, kCFURLPOSIXPathStyle);
 	CFRelease(bundle_base_url);
@@ -41,7 +41,7 @@ int main(int argc, char* argv[]) {
 	if(argc == 2 && (pstrext = std::strrchr(argv[1], '.'))
 		&& (!mystrncasecmp(pstrext, ".ydk", 4) || !mystrncasecmp(pstrext, ".yrp", 4))) {
 		wchar_t exepath[MAX_PATH];
-		GetModuleFileNameW(NULL, exepath, MAX_PATH);
+		GetModuleFileNameW(nullptr, exepath, MAX_PATH);
 		wchar_t* p = wcsrchr(exepath, '\\');
 		*p = '\0';
 		SetCurrentDirectoryW(exepath);

gframe/image_manager.cpp

@@ -7,17 +7,17 @@ namespace ygo {
 ImageManager imageManager;
 
 bool ImageManager::Initial() {
-	tCover[0] = NULL;
-	tCover[1] = NULL;
+	tCover[0] = nullptr;
+	tCover[1] = nullptr;
 	tCover[2] = GetTextureFromFile("textures/cover.jpg", CARD_IMG_WIDTH, CARD_IMG_HEIGHT);
 	tCover[3] = GetTextureFromFile("textures/cover2.jpg", CARD_IMG_WIDTH, CARD_IMG_HEIGHT);
 	if(!tCover[3])
 		tCover[3] = tCover[2];
-	tUnknown = NULL;
-	tUnknownFit = NULL;
-	tUnknownThumb = NULL;
-	tBigPicture = NULL;
-	tLoading = NULL;
+	tUnknown = nullptr;
+	tUnknownFit = nullptr;
+	tUnknownThumb = nullptr;
+	tBigPicture = nullptr;
+	tLoading = nullptr;
 	tThumbLoadingThreadRunning = false;
 	tAct = driver->getTexture("textures/act.png");
 	tAttack = driver->getTexture("textures/attack.png");
@@ -35,9 +35,9 @@ bool ImageManager::Initial() {
 	tHand[0] = driver->getTexture("textures/f1.jpg");
 	tHand[1] = driver->getTexture("textures/f2.jpg");
 	tHand[2] = driver->getTexture("textures/f3.jpg");
-	tBackGround = NULL;
-	tBackGround_menu = NULL;
-	tBackGround_deck = NULL;
+	tBackGround = nullptr;
+	tBackGround_menu = nullptr;
+	tBackGround_deck = nullptr;
 	tField[0] = driver->getTexture("textures/field2.png");
 	tFieldTransparent[0] = driver->getTexture("textures/field-transparent2.png");
 	tField[1] = driver->getTexture("textures/field3.png");
@@ -62,9 +62,9 @@ void ImageManager::ClearTexture() {
 		if(tit->second && tit->second != tLoading)
 			driver->removeTexture(tit->second);
 	}
-	if(tBigPicture != NULL) {
+	if(tBigPicture != nullptr) {
 		driver->removeTexture(tBigPicture);
-		tBigPicture = NULL;
+		tBigPicture = nullptr;
 	}
 	tMap[0].clear();
 	tMap[1].clear();
@@ -203,8 +203,8 @@ irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, s32 wid
 	if(mainGame->gameConf.use_image_scale) {
 		irr::video::ITexture* texture;
 		irr::video::IImage* srcimg = driver->createImageFromFile(file);
-		if(srcimg == NULL)
-			return NULL;
+		if(srcimg == nullptr)
+			return nullptr;
 		if(srcimg->getDimension() == irr::core::dimension2d<u32>(width, height)) {
 			texture = driver->addTexture(file, srcimg);
 		} else {
@@ -236,16 +236,16 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
 		char file[256];
 		snprintf(file, sizeof file, "expansions/pics/%d.jpg", code);
 		irr::video::ITexture* img = GetTextureFromFile(file, width, height);
-		if(img == NULL) {
+		if(img == nullptr) {
 			snprintf(file, sizeof file, "pics/%d.jpg", code);
 			img = GetTextureFromFile(file, width, height);
 		}
-		if(img == NULL && !mainGame->gameConf.use_image_scale) {
-			tMap[fit ? 1 : 0][code] = NULL;
+		if(img == nullptr && !mainGame->gameConf.use_image_scale) {
+			tMap[fit ? 1 : 0][code] = nullptr;
 			return GetTextureThumb(code);
 		}
 		tMap[fit ? 1 : 0][code] = img;
-		return (img == NULL) ? (fit ? tUnknownFit : tUnknown) : img;
+		return (img == nullptr) ? (fit ? tUnknownFit : tUnknown) : img;
 	}
 	if(tit->second)
 		return tit->second;
@@ -255,19 +255,19 @@ irr::video::ITexture* ImageManager::GetTexture(int code, bool fit) {
 irr::video::ITexture* ImageManager::GetBigPicture(int code, float zoom) {
 	if(code == 0)
 		return tUnknown;
-	if(tBigPicture != NULL) {
+	if(tBigPicture != nullptr) {
 		driver->removeTexture(tBigPicture);
-		tBigPicture = NULL;
+		tBigPicture = nullptr;
 	}
 	irr::video::ITexture* texture;
 	char file[256];
 	snprintf(file, sizeof file, "expansions/pics/%d.jpg", code);
 	irr::video::IImage* srcimg = driver->createImageFromFile(file);
-	if(srcimg == NULL) {
+	if(srcimg == nullptr) {
 		snprintf(file, sizeof file, "pics/%d.jpg", code);
 		srcimg = driver->createImageFromFile(file);
 	}
-	if(srcimg == NULL) {
+	if(srcimg == nullptr) {
 		return tUnknown;
 	}
 	if(zoom == 1) {
@@ -292,19 +292,19 @@ int ImageManager::LoadThumbThread() {
 		char file[256];
 		snprintf(file, sizeof file, "expansions/pics/thumbnail/%d.jpg", code);
 		irr::video::IImage* img = imageManager.driver->createImageFromFile(file);
-		if(img == NULL) {
+		if(img == nullptr) {
 			snprintf(file, sizeof file, "pics/thumbnail/%d.jpg", code);
 			img = imageManager.driver->createImageFromFile(file);
 		}
-		if(img == NULL && mainGame->gameConf.use_image_scale) {
+		if(img == nullptr && mainGame->gameConf.use_image_scale) {
 			snprintf(file, sizeof file, "expansions/pics/%d.jpg", code);
 			img = imageManager.driver->createImageFromFile(file);
 		}
-		if(img == NULL && mainGame->gameConf.use_image_scale) {
+		if(img == nullptr && mainGame->gameConf.use_image_scale) {
 			snprintf(file, sizeof file, "pics/%d.jpg", code);
 			img = imageManager.driver->createImageFromFile(file);
 		}
-		if(img != NULL) {
+		if(img != nullptr) {
 			int width = CARD_THUMB_WIDTH * mainGame->xScale;
 			int height = CARD_THUMB_HEIGHT * mainGame->yScale;
 			if(img->getDimension() == irr::core::dimension2d<u32>(width, height)) {
@@ -326,7 +326,7 @@ int ImageManager::LoadThumbThread() {
 		} else {
 			imageManager.tThumbLoadingMutex.lock();
 			if(imageManager.tThumbLoadingThreadRunning)
-				imageManager.tThumbLoading[code] = NULL;
+				imageManager.tThumbLoading[code] = nullptr;
 			imageManager.tThumbLoadingMutex.unlock();
 		}
 		imageManager.tThumbLoadingMutex.lock();
@@ -344,14 +344,14 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 	imageManager.tThumbLoadingMutex.lock();
 	auto lit = tThumbLoading.find(code);
 	if(lit != tThumbLoading.end()) {
-		if(lit->second != NULL) {
+		if(lit->second != nullptr) {
 			char file[256];
 			snprintf(file, sizeof file, "pics/thumbnail/%d.jpg", code);
 			irr::video::ITexture* texture = driver->addTexture(file, lit->second); // textures must be added in the main thread due to OpenGL
 			lit->second->drop();
 			tThumb[code] = texture;
 		} else {
-			tThumb[code] = NULL;
+			tThumb[code] = nullptr;
 		}
 		tThumbLoading.erase(lit);
 	}
@@ -375,26 +375,26 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 }
 irr::video::ITexture* ImageManager::GetTextureField(int code) {
 	if(code == 0)
-		return NULL;
+		return nullptr;
 	auto tit = tFields.find(code);
 	if(tit == tFields.end()) {
 		char file[256];
 		snprintf(file, sizeof file, "expansions/pics/field/%d.png", code);
 		irr::video::ITexture* img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
-		if(img == NULL) {
+		if(img == nullptr) {
 			snprintf(file, sizeof file, "expansions/pics/field/%d.jpg", code);
 			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		}
-		if(img == NULL) {
+		if(img == nullptr) {
 			snprintf(file, sizeof file, "pics/field/%d.png", code);
 			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
 		}
-		if(img == NULL) {
+		if(img == nullptr) {
 			snprintf(file, sizeof file, "pics/field/%d.jpg", code);
 			img = GetTextureFromFile(file, 512 * mainGame->xScale, 512 * mainGame->yScale);
-			if(img == NULL) {
-				tFields[code] = NULL;
-				return NULL;
+			if(img == nullptr) {
+				tFields[code] = nullptr;
+				return nullptr;
 			} else {
 				tFields[code] = img;
 				return img;
@@ -407,6 +407,6 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
 	if(tit->second)
 		return tit->second;
 	else
-		return NULL;
+		return nullptr;
 }
 }

gframe/menu_handler.cpp

@@ -78,7 +78,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					BufferIO::EncodeUTF8(pstr, hostname);
 					BufferIO::EncodeUTF8(portstr, port);
 					struct evutil_addrinfo hints;
-					struct evutil_addrinfo *answer = NULL;
+					struct evutil_addrinfo *answer = nullptr;
 					std::memset(&hints, 0, sizeof hints);
 					hints.ai_family = AF_INET;
 					hints.ai_socktype = SOCK_STREAM;
@@ -375,7 +375,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				int flag = 0;
 				flag += (mainGame->chkBotHand->isChecked() ? 0x1 : 0);
 				myswprintf(cmd, L"Bot.exe \"%ls\" %d %d", arg1, flag, mainGame->gameConf.serverport);
-				if(!CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+				if(!CreateProcessW(nullptr, cmd, nullptr, nullptr, FALSE, 0, nullptr, nullptr, &si, &pi))
 				{
 					NetServer::StopServer();
 					break;
@@ -399,7 +399,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					snprintf(arg2, sizeof arg2, "%d", flag);
 					char arg3[8];
 					snprintf(arg3, sizeof arg3, "%d", mainGame->gameConf.serverport);
-					execl("./bot", "bot", arg1, arg2, arg3, NULL);
+					execl("./bot", "bot", arg1, arg2, arg3, nullptr);
 					exit(0);
 				} else {
 					if(!NetServer::StartServer(mainGame->gameConf.serverport)) {

gframe/myfilesystem.h

@@ -47,7 +47,7 @@ public:
 	}
 
 	static bool MakeDir(const wchar_t* wdir) {
-		return CreateDirectoryW(wdir, NULL);
+		return CreateDirectoryW(wdir, nullptr);
 	}
 
 	static bool MakeDir(const char* dir) {
@@ -72,7 +72,7 @@ public:
 		wchar_t pdir[256];
 		BufferIO::CopyWideString(wdir, pdir);
 		SHFILEOPSTRUCTW lpFileOp{};
-		lpFileOp.hwnd = NULL;
+		lpFileOp.hwnd = nullptr;
 		lpFileOp.wFunc = FO_DELETE;
 		lpFileOp.pFrom = pdir;
 		lpFileOp.pTo = 0;

gframe/netserver.cpp

@@ -25,7 +25,7 @@ bool NetServer::StartServer(unsigned short port) {
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = htonl(INADDR_ANY);
 	sin.sin_port = htons(port);
-	listener = evconnlistener_new_bind(net_evbase, ServerAccept, NULL,
+	listener = evconnlistener_new_bind(net_evbase, ServerAccept, nullptr,
 	                                   LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1, (sockaddr*)&sin, sizeof(sin));
 	if(!listener) {
 		event_base_free(net_evbase);
@@ -52,8 +52,8 @@ bool NetServer::StartBroadcast() {
 		closesocket(udp);
 		return false;
 	}
-	broadcast_ev = event_new(net_evbase, udp, EV_READ | EV_PERSIST, BroadcastEvent, NULL);
-	event_add(broadcast_ev, NULL);
+	broadcast_ev = event_new(net_evbase, udp, EV_READ | EV_PERSIST, BroadcastEvent, nullptr);
+	event_add(broadcast_ev, nullptr);
 	return true;
 }
 void NetServer::StopServer() {
@@ -109,7 +109,7 @@ void NetServer::ServerAccept(evconnlistener* listener, evutil_socket_t fd, socka
 	dp.bev = bev;
 	users[bev] = dp;
 	bufferevent_setwatermark(bev, EV_READ, 3, 0);
-	bufferevent_setcb(bev, ServerEchoRead, NULL, ServerEchoEvent, NULL);
+	bufferevent_setcb(bev, ServerEchoRead, nullptr, ServerEchoEvent, nullptr);
 	bufferevent_enable(bev, EV_READ);
 }
 void NetServer::ServerAcceptError(evconnlistener* listener, void* ctx) {

gframe/replay.cpp

@@ -18,7 +18,7 @@ void Replay::BeginRecord() {
 #ifdef _WIN32
 	if(is_recording)
 		CloseHandle(recording_fp);
-	recording_fp = CreateFileW(L"./replay/_LastReplay.yrp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
+	recording_fp = CreateFileW(L"./replay/_LastReplay.yrp", GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, nullptr);
 	if(recording_fp == INVALID_HANDLE_VALUE)
 		return;
 #else
@@ -38,7 +38,7 @@ void Replay::WriteHeader(ReplayHeader& header) {
 	pheader = header;
 #ifdef _WIN32
 	DWORD size;
-	WriteFile(recording_fp, &header, sizeof(header), &size, NULL);
+	WriteFile(recording_fp, &header, sizeof(header), &size, nullptr);
 #else
 	fwrite(&header, sizeof(header), 1, fp);
 	fflush(fp);
@@ -53,7 +53,7 @@ void Replay::WriteData(const void* data, int length, bool flush) {
 	pwrite += length;
 #ifdef _WIN32
 	DWORD size;
-	WriteFile(recording_fp, data, length, &size, NULL);
+	WriteFile(recording_fp, data, length, &size, nullptr);
 #else
 	fwrite(data, length, 1, fp);
 	if(flush)

gframe/single_mode.cpp

@@ -135,7 +135,7 @@ int SingleMode::SinglePlayThread() {
 	}
 	last_replay.EndRecord();
 	mainGame->gMutex.lock();
-	time_t nowtime = time(NULL);
+	time_t nowtime = time(nullptr);
 	tm* localedtime = localtime(&nowtime);
 	wchar_t timetext[40];
 	wcsftime(timetext, 40, L"%Y-%m-%d %H-%M-%S", localedtime);