[Scummvm-cvs-logs] SF.net SVN: scummvm:[41159] scummvm/branches/gsoc2009-16bit/engines/scumm/ gfx.cpp

[Kirben at users.sourceforge.net]

Revision: 41159
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41159&view=rev
Author:   Kirben
Date:     2009-06-04 09:36:13 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Update drawBMAPObject for 16bit color.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/gfx.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/gfx.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/gfx.cpp	2009-06-04 09:32:36 UTC (rev 41158)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/gfx.cpp	2009-06-04 09:36:13 UTC (rev 41159)
@@ -1956,13 +1956,11 @@
 }
 
 void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h) {
-	assert(_vm->_bitDepth == 1);
-
 	const byte *bmap_ptr = _vm->findResourceData(MKID_BE('BMAP'), ptr);
 	assert(bmap_ptr);
 
 	byte code = *bmap_ptr++;
-	int scrX = _vm->_screenStartStrip * 8;
+	int scrX = _vm->_screenStartStrip * 8 * _vm->_bitDepth;
 
 	if (code == 8 || code == 9) {
 		Common::Rect rScreen(0, 0, vs->w, vs->h);


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