(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

2007-01-10 18:56:51 +00:00
parent a332d10fd9
commit f35ed4bbc2
190 changed files with 2825 additions and 2208 deletions
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -27,7 +27,7 @@ static void NullVideoMainLoop(void)

 	for (i = 0; i < 1000; i++) {
 		GameLoop();
-		_screen.dst_ptr = _null_video_mem;
+		_screen.dst_ptr = (Pixel*)_null_video_mem;
 		UpdateWindows();
 	}
 }