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

[m_kiewitz at users.sourceforge.net]

Revision: 47078
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47078&view=rev
Author:   m_kiewitz
Date:     2010-01-06 13:26:53 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
SCI: initPriorityBands() now aborts when getting called and screen size is not 320x200

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

Modified: scummvm/trunk/engines/sci/graphics/gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.cpp	2010-01-06 13:22:36 UTC (rev 47077)
+++ scummvm/trunk/engines/sci/graphics/gfx.cpp	2010-01-06 13:26:53 UTC (rev 47078)
@@ -405,6 +405,10 @@
 	int16 y;
 	int32 bandSize;
 
+	// This code is for 320x200 games only
+	if (_screen->getHeight() != 200)
+		return;
+
 	if (bandCount != -1)
 		_priorityBandCount = bandCount;
 

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-06 13:22:36 UTC (rev 47077)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-06 13:26:53 UTC (rev 47078)
@@ -80,10 +80,7 @@
 
 	_gfx->init(_text);
 	_windowMgr->init(_s->_gameId);
-	// Init priority bands for SCI0-SCI11. SCI2+ games don't
-	// use priority bands anymore
-	if (getSciVersion() <= SCI_VERSION_1_1)
-		initPriorityBands();
+	initPriorityBands();
 }
 
 void SciGui::initPriorityBands() {


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