diff options
| author | Eugene Sandulenko | 2010-06-15 10:22:19 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-06-15 10:22:19 +0000 |
| commit | f53211fbadb6c88161f8830baee476a91a0cc547 (patch) | |
| tree | 03a84c27efbc67b9f2b593252a83e65f4cc6f2e3 /engines | |
| parent | 1850d53793388f81b3c058ba02c314994a6e6ec9 (diff) | |
| download | scummvm-rg350-f53211fbadb6c88161f8830baee476a91a0cc547.tar.gz scummvm-rg350-f53211fbadb6c88161f8830baee476a91a0cc547.tar.bz2 scummvm-rg350-f53211fbadb6c88161f8830baee476a91a0cc547.zip | |
Drascula: Move more cursor-related blits to cursorSurface.
svn-id: r49715
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/drascula/drascula.cpp | 21 | ||||
| -rw-r--r-- | engines/drascula/graphics.cpp | 3 | ||||
| -rw-r--r-- | engines/drascula/interface.cpp | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index bc6f57ea12..0b2ddc6799 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -279,6 +279,7 @@ Common::Error DrasculaEngine::run() { loadPic(974, tableSurface); if (currentChapter != 2) { + loadPic(99, cursorSurface); loadPic(99, backSurface); loadPic(97, extraSurface); } @@ -507,10 +508,13 @@ bool DrasculaEngine::runCurrentChapter() { if (rightMouseButton == 1 && _menuScreen) { #endif delay(100); - if (currentChapter == 2) + if (currentChapter == 2) { + loadPic(menuBackground, cursorSurface); loadPic(menuBackground, backSurface); - else + } else { + loadPic(99, cursorSurface); loadPic(99, backSurface); + } setPalette((byte *)&gamePalette); _menuScreen = false; #ifndef _WIN32_WCE @@ -535,14 +539,19 @@ bool DrasculaEngine::runCurrentChapter() { characterMoved = 0; if (trackProtagonist == 2) trackProtagonist = 1; - if (currentChapter == 4) + if (currentChapter == 4) { loadPic("icons2.alg", backSurface); - else if (currentChapter == 5) + loadPic("icons2.alg", cursorSurface); + } else if (currentChapter == 5) { loadPic("icons3.alg", backSurface); - else if (currentChapter == 6) + loadPic("icons3.alg", cursorSurface); + } else if (currentChapter == 6) { loadPic("iconsp.alg", backSurface); - else + loadPic("iconsp.alg", cursorSurface); + } else { loadPic("icons.alg", backSurface); + loadPic("icons.alg", cursorSurface); + } _menuScreen = true; #ifndef _WIN32_WCE updateEvents(); diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 088e1e1da9..70085b99af 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -151,8 +151,7 @@ void DrasculaEngine::showFrame(Common::SeekableReadStream *stream, bool firstFra free(prevFrame); } -void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width, - int height, byte *src, byte *dest) { +void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *src, byte *dest) { dest += xdes + ydes * 320; src += xorg + yorg * 320; /* Unoptimized code diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp index 38be3c6d5c..1495694a1b 100644 --- a/engines/drascula/interface.cpp +++ b/engines/drascula/interface.cpp @@ -128,7 +128,7 @@ void DrasculaEngine::showMenu() { OBJWIDTH, OBJHEIGHT, srcSurface, screenSurface); } copyRect(_x1d_menu[h], _y1d_menu[h], _itemLocations[n].x, _itemLocations[n].y, - OBJWIDTH, OBJHEIGHT, backSurface, screenSurface); + OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface); } if (x < 7) @@ -142,7 +142,7 @@ void DrasculaEngine::clearMenu() { if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1]) verbActivated = 0; copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, _verbBarX[n], 2, - OBJWIDTH, OBJHEIGHT, backSurface, screenSurface); + OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface); verbActivated = 1; } } |