aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-10 11:21:55 +0000
committerMartin Kiewitz2010-01-10 11:21:55 +0000
commit7a5c119930f28f6a41c418cbe88b85f16ab13464 (patch)
tree81cd24b11852c522496abef6e8a71b537e918ae0
parentc371c395681b932535f40e1ebe768b14d77255f3 (diff)
downloadscummvm-rg350-7a5c119930f28f6a41c418cbe88b85f16ab13464.tar.gz
scummvm-rg350-7a5c119930f28f6a41c418cbe88b85f16ab13464.tar.bz2
scummvm-rg350-7a5c119930f28f6a41c418cbe88b85f16ab13464.zip
SCI: ignore hiresMode when not being upscaledHires for kDrawCel and updateBox on kGraph - fixes kq6 dos
svn-id: r47221
-rw-r--r--engines/sci/graphics/gui.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index 826630a1a4..5f8b86204d 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -369,7 +369,8 @@ void SciGui::drawPicture(GuiResourceId pictureId, int16 animationNr, bool animat
}
void SciGui::drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode, reg_t upscaledHiresHandle) {
- if (!hiresMode) {
+ // some calls are hiresMode even under kq6 DOS, that's why we check for upscaled hires here
+ if ((!hiresMode) || (!_screen->getUpscaledHires())) {
_gfx->drawCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo);
} else {
_gfx->drawHiresCelAndShow(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo, upscaledHiresHandle);
@@ -517,7 +518,8 @@ void SciGui::graphRestoreBox(reg_t handle) {
}
void SciGui::graphUpdateBox(Common::Rect rect, bool hiresMode) {
- if (!hiresMode)
+ // some calls are hiresMode even under kq6 DOS, that's why we check for upscaled hires here
+ if ((!hiresMode) || (!_screen->getUpscaledHires()))
_gfx->BitsShow(rect);
else
_gfx->BitsShowHires(rect);