[Scummvm-cvs-logs] SF.net SVN: scummvm:[47221] scummvm/trunk/engines/sci/graphics/gui.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47221
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47221&view=rev
Author:   m_kiewitz
Date:     2010-01-10 11:21:55 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
SCI: ignore hiresMode when not being upscaledHires for kDrawCel and updateBox on kGraph - fixes kq6 dos

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/gui.cpp

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-10 11:01:36 UTC (rev 47220)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-10 11:21:55 UTC (rev 47221)
@@ -369,7 +369,8 @@
 }
 
 void SciGui::drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode, reg_t upscaledHiresHandle) {
-	if (!hiresMode) {
+	// some calls are hiresMode even under kq6 DOS, that's why we check for upscaled hires here
+	if ((!hiresMode) || (!_screen->getUpscaledHires())) {
 		_gfx->drawCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo);
 	} else {
 		_gfx->drawHiresCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, upscaledHiresHandle);
@@ -517,7 +518,8 @@
 }
 
 void SciGui::graphUpdateBox(Common::Rect rect, bool hiresMode) {
-	if (!hiresMode)
+	// some calls are hiresMode even under kq6 DOS, that's why we check for upscaled hires here
+	if ((!hiresMode) || (!_screen->getUpscaledHires()))
 		_gfx->BitsShow(rect);
 	else
 		_gfx->BitsShowHires(rect);


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