[Scummvm-cvs-logs] SF.net SVN: scummvm:[51106] scummvm/trunk/engines/sci/engine/kgraphics.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 51106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51106&view=rev
Author:   m_kiewitz
Date:     2010-07-21 20:28:53 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
SCI: r51104 adding #ifdef and check for hires

pq4cd is probably low-res, so adding check for hires and adding #ifdef as well

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-21 20:26:40 UTC (rev 51105)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-21 20:28:53 UTC (rev 51106)
@@ -427,11 +427,15 @@
 
 	celWidth = g_sci->_gfxCache->kernelViewGetCelWidth(viewId, loopNo, celNo);
 
-	if (getSciVersion() == SCI_VERSION_2_1)
-		celWidth = celWidth / 2; // half the width returned here, fixes lsl6 action icon placements
+#ifdef ENABLE_SCI32
+	if (getSciVersion() == SCI_VERSION_2_1) {
+		if (g_sci->_gfxScreen->getWidth() > 320)
+			celWidth = celWidth / 2; // half the width returned here, fixes lsl6 action icon placements
+	}
 	// the scripts work low-res and add the returned value from here to the coordinate
 	// TODO: check, if this is actually right. I'm slightly confused by this, but even GK1CD has some idivs in this
 	//  code, so it seems plausible.
+#endif
 	return make_reg(0, celWidth);
 }
 


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