[Scummvm-cvs-logs] SF.net SVN: scummvm:[41546] scummvm/branches/gsoc2009-16bit/engines/sci/gfx

[wjpalenstijn at users.sourceforge.net]

Revision: 41546
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41546&view=rev
Author:   wjpalenstijn
Date:     2009-06-15 13:50:41 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Fix compilation of SCI engine

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_driver.cpp
    scummvm/branches/gsoc2009-16bit/engines/sci/gfx/res_pic.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_driver.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_driver.cpp	2009-06-15 13:49:39 UTC (rev 41545)
+++ scummvm/branches/gsoc2009-16bit/engines/sci/gfx/gfx_driver.cpp	2009-06-15 13:50:41 UTC (rev 41546)
@@ -36,7 +36,7 @@
 GfxDriver::GfxDriver(int xfact, int yfact, int bytespp) {
 	int i;
 
-	Graphics::PixelFormat format = { bytespp, 0, 0, 0, 0, 0, 0, 0, 0 };
+	Graphics::PixelFormat format(bytespp, 0, 0, 0, 0, 0, 0, 0, 0);
 	_mode = gfx_new_mode(xfact, yfact, format, new Palette(256), 0);
 	_mode->xsize = xfact * 320;
 	_mode->ysize = yfact * 200;

Modified: scummvm/branches/gsoc2009-16bit/engines/sci/gfx/res_pic.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/sci/gfx/res_pic.cpp	2009-06-15 13:49:39 UTC (rev 41545)
+++ scummvm/branches/gsoc2009-16bit/engines/sci/gfx/res_pic.cpp	2009-06-15 13:50:41 UTC (rev 41546)
@@ -1548,7 +1548,7 @@
 				view->index_height = CLIP<int>(view->index_height, 0, portBounds.height());
 
 				// Set up mode structure for resizing the view
-				Graphics::PixelFormat format = { 1, 0, 0, 0, 0, 0, 0, 0, 0 }; // 1byte/p, which handles masks and the rest for us
+				Graphics::PixelFormat format(1, 0, 0, 0, 0, 0, 0, 0, 0); // 1byte/p, which handles masks and the rest for us
 				gfx_mode_t *mode = gfx_new_mode(pic->visual_map->index_width / 320,
 				           pic->visual_map->index_height / 200, format, view->palette, 0);
 
@@ -1654,7 +1654,7 @@
 		view->palette = pic->visual_map->palette->getref();
 
 		// Set up mode structure for resizing the view
-		Graphics::PixelFormat format = { 1, 0, 0, 0, 0, 0, 0, 0, 0 }; // 1 byte/p, which handles masks and the rest for us
+		Graphics::PixelFormat format(1, 0, 0, 0, 0, 0, 0, 0, 0); // 1 byte/p, which handles masks and the rest for us
 		gfx_mode_t *mode = gfx_new_mode(pic->visual_map->index_width / 320, pic->visual_map->index_height / 200, format, view->palette, 0);
 
 		gfx_xlate_pixmap(view, mode, GFX_XLATE_FILTER_NONE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.