Update to 1.10.0-beta1

2019-10-31 22:24:28 +03:00
parent b84a475e14
commit 599ccf0c2b
1470 changed files with 354219 additions and 16795 deletions
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -29,13 +29,13 @@ const char *VideoDriver_Null::Start(const char * const *parm)
 	this->ticks = GetDriverParamInt(parm, "ticks", 1000);
 	_screen.width  = _screen.pitch = _cur_resolution.width;
 	_screen.height = _cur_resolution.height;
-	_screen.dst_ptr = NULL;
+	_screen.dst_ptr = nullptr;
 	ScreenSizeChanged();

 	/* Do not render, nor blit */
 	DEBUG(misc, 1, "Forcing blitter 'null'...");
 	BlitterFactory::SelectBlitter("null");
-	return NULL;
+	return nullptr;
 }

 void VideoDriver_Null::Stop() { }