diff options
| author | Travis Howell | 2006-04-07 13:39:59 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-07 13:39:59 +0000 |
| commit | 3b1710c7f5956a6aebd9863421da5e41392b19b6 (patch) | |
| tree | c5e3d2726ef417f646808c6426d8a5dedf572d3b /engines | |
| parent | f51575563e22966f98c1f07d7bcba7ebab51e4d2 (diff) | |
| download | scummvm-rg350-3b1710c7f5956a6aebd9863421da5e41392b19b6.tar.gz scummvm-rg350-3b1710c7f5956a6aebd9863421da5e41392b19b6.tar.bz2 scummvm-rg350-3b1710c7f5956a6aebd9863421da5e41392b19b6.zip | |
Add scrolling adjustments when drawing overlay in FF
svn-id: r21669
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/simon/oracle.cpp | 12 | ||||
| -rw-r--r-- | engines/simon/vga.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/simon/oracle.cpp b/engines/simon/oracle.cpp index f5e0df9c80..1c15cd60d2 100644 --- a/engines/simon/oracle.cpp +++ b/engines/simon/oracle.cpp @@ -91,18 +91,18 @@ void SimonEngine::oracleTextUp() { changeWindow(3); _noOracleScroll = 0; - if(_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while(1) { - if(_textWindow->scrollY == _oracleMaxScrollY) + if (_textWindow->scrollY == _oracleMaxScrollY) break; _textWindow->textRow = 105; for (i = 0; i < 5; i++) { _newLines = 0; _textWindow->textColumn = 0; _textWindow->textRow -= 3; - if(i == 2) { + if (i == 2) { _textWindow->scrollY += 1; _textWindow->textRow += 15; linksUp(); @@ -126,17 +126,17 @@ void SimonEngine::oracleTextDown() { changeWindow(3); _noOracleScroll = 0; - if(_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while(1) { - if(_textWindow->scrollY == 0) + if (_textWindow->scrollY == 0) break; for (i = 0; i < 5; i++) { _newLines = 0; _textWindow->textColumn = 0; _textWindow->textRow = (i + 1) * 3; - if(i == 4) { + if (i == 4) { _textWindow->scrollY -= 1; _textWindow->textRow = 0; linksDown(); diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index 101e137fc3..d3528ad480 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -908,7 +908,7 @@ void SimonEngine::drawImages_Feeble(VC10_state *state) { } else if (state->flags & kDFOverlayed) { state->surf_addr = getScaleBuf(); state->surf_pitch = _dxSurfacePitch; - state->surf_addr += state->x + state->y * state->surf_pitch; + state->surf_addr += (state->x + _scrollX) + (state->y + _scrollY) * state->surf_pitch; uint w, h; byte *src, *dst, *dst_org; |