diff options
| author | Martin Kiewitz | 2010-05-13 20:19:54 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-13 20:19:54 +0000 |
| commit | 070b2e14fe3fa1c89aba4e1e5410a52a5315fbfc (patch) | |
| tree | 1e2bf93f32e61299906d2925e784347924ac2171 /engines | |
| parent | faffc57136b98e6a38c27317814f8f9627bbafec (diff) | |
| download | scummvm-rg350-070b2e14fe3fa1c89aba4e1e5410a52a5315fbfc.tar.gz scummvm-rg350-070b2e14fe3fa1c89aba4e1e5410a52a5315fbfc.tar.bz2 scummvm-rg350-070b2e14fe3fa1c89aba4e1e5410a52a5315fbfc.zip | |
SCI: don't adjust new windows to _wmgrPort for oldGfxFunctions() games (till kq4 .502), fixes all window positions for those especially sq3old speech bubble windows
svn-id: r49025
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/ports.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp index 64734c3d2a..f20aa8f38c 100644 --- a/engines/sci/graphics/ports.cpp +++ b/engines/sci/graphics/ports.cpp @@ -26,6 +26,7 @@ #include "common/util.h" #include "sci/sci.h" +#include "sci/engine/features.h" #include "sci/engine/state.h" #include "sci/graphics/screen.h" #include "sci/graphics/paint16.h" @@ -98,7 +99,10 @@ void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, openPort(_wmgrPort); setPort(_wmgrPort); - setOrigin(0, offTop); + // SCI0 games till kq4 (.502 - not including) did not adjust against _wmgrPort in kNewWindow + // We leave _wmgrPort top at 0, so the adjustment wont get done + if (!g_sci->_features->usesOldGfxFunctions()) + setOrigin(0, offTop); _wmgrPort->rect.bottom = _screen->getHeight() - offTop; _wmgrPort->rect.right = _screen->getWidth(); _wmgrPort->rect.moveTo(0, 0); @@ -107,6 +111,10 @@ void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, _windowList.push_front(_wmgrPort); _picWind = newWindow(Common::Rect(0, offTop, _screen->getWidth(), _screen->getHeight()), 0, 0, SCI_WINDOWMGR_STYLE_TRANSPARENT | SCI_WINDOWMGR_STYLE_NOFRAME, 0, true); + // For SCI0 games till kq4 (.502 - not including) we set _picWind top to offTop instead + // Because of the menu/status bar + if (g_sci->_features->usesOldGfxFunctions()) + _picWind->top = offTop; priorityBandsMemoryActive = false; @@ -278,6 +286,7 @@ Window *GfxPorts::newWindow(const Common::Rect &dims, const Common::Rect *restor if (draw) drawWindow(pwnd); setPort((Port *)pwnd); + // All SCI0 games till kq4 .502 (not including) did not adjust against _wmgrPort, we set _wmgrPort->top to 0 in that case setOrigin(pwnd->rect.left, pwnd->rect.top + _wmgrPort->top); pwnd->rect.moveTo(0, 0); return pwnd; |