aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-19 15:20:29 +0000
committerMartin Kiewitz2010-01-19 15:20:29 +0000
commitd17e80f2147fcf9f70ac4ac6bf223abfbae0b306 (patch)
treedf8d3c8df450c3176d058ed5e492e8e78b4d330b
parent136ae389d8858e8514052fd501ad502735c2fb4f (diff)
downloadscummvm-rg350-d17e80f2147fcf9f70ac4ac6bf223abfbae0b306.tar.gz
scummvm-rg350-d17e80f2147fcf9f70ac4ac6bf223abfbae0b306.tar.bz2
scummvm-rg350-d17e80f2147fcf9f70ac4ac6bf223abfbae0b306.zip
SCI: Still limit lower boundary in SCI1.1, moved upper priority boundary limit removal for SCI1.1 into init
svn-id: r47382
-rw-r--r--engines/sci/graphics/gfx.cpp2
-rw-r--r--engines/sci/graphics/gui.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/graphics/gfx.cpp b/engines/sci/graphics/gfx.cpp
index a61ab7adda..3a3d39bc7d 100644
--- a/engines/sci/graphics/gfx.cpp
+++ b/engines/sci/graphics/gfx.cpp
@@ -536,8 +536,6 @@ void Gfx::PriorityBandsRecall() {
if (priorityBandsMemoryActive) {
PriorityBandsInit((byte *)&priorityBandsMemory);
priorityBandsMemoryActive = false;
- // Don't limit priority bands in SCI1.1
- _priorityTop = 0; _priorityBottom = 200;
}
}
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index ad31b7e7c0..e0cb16965a 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -90,7 +90,10 @@ void SciGui::initPriorityBands() {
if (_usesOldGfxFunctions) {
_gfx->PriorityBandsInit(15, 42, 200);
} else {
- _gfx->PriorityBandsInit(14, 42, 190);
+ if (getSciVersion() >= SCI_VERSION_1_1)
+ _gfx->PriorityBandsInit(14, 0, 190);
+ else
+ _gfx->PriorityBandsInit(14, 42, 190);
}
}