aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-06 13:26:53 +0000
committerMartin Kiewitz2010-01-06 13:26:53 +0000
commit9272822486e00db030b335c1ad2c5cceac231908 (patch)
tree1cc7b654629b772f17f4f0765bffd6b30210ab1b /engines/sci
parent07ce38db5fbc4dd54e1d88e35ecf005efe325920 (diff)
downloadscummvm-rg350-9272822486e00db030b335c1ad2c5cceac231908.tar.gz
scummvm-rg350-9272822486e00db030b335c1ad2c5cceac231908.tar.bz2
scummvm-rg350-9272822486e00db030b335c1ad2c5cceac231908.zip
SCI: initPriorityBands() now aborts when getting called and screen size is not 320x200
svn-id: r47078
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/gfx.cpp4
-rw-r--r--engines/sci/graphics/gui.cpp5
2 files changed, 5 insertions, 4 deletions
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() {