From 9272822486e00db030b335c1ad2c5cceac231908 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 6 Jan 2010 13:26:53 +0000
Subject: SCI: initPriorityBands() now aborts when getting called and screen
 size is not 320x200

svn-id: r47078
---
 engines/sci/graphics/gfx.cpp | 4 ++++
 engines/sci/graphics/gui.cpp | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/graphics/gfx.cpp b/engines/sci/graphics/gfx.cpp
index 9b27eab557..96a6327066 100644
--- a/engines/sci/graphics/gfx.cpp
+++ b/engines/sci/graphics/gfx.cpp
@@ -405,6 +405,10 @@ void Gfx::PriorityBandsInit(int16 bandCount, int16 top, int16 bottom) {
 	int16 y;
 	int32 bandSize;
 
+	// This code is for 320x200 games only
+	if (_screen->getHeight() != 200)
+		return;
+
 	if (bandCount != -1)
 		_priorityBandCount = bandCount;
 
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index fb397031c8..c4a974f18a 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -80,10 +80,7 @@ void SciGui::init(bool usesOldGfxFunctions) {
 
 	_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() {
-- 
cgit v1.2.3