diff options
author | Johannes Schickel | 2011-12-26 17:54:38 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-12-26 17:56:50 +0100 |
commit | 6ca8d9ffe33cea03c4f8371cc3f1aef349f6f380 (patch) | |
tree | 9520b82b20721bbeb6db18009c9fd23b4e5c3062 /engines | |
parent | 12370047567e5b1404aafe4c0f37d44bdba8c0b0 (diff) | |
download | scummvm-rg350-6ca8d9ffe33cea03c4f8371cc3f1aef349f6f380.tar.gz scummvm-rg350-6ca8d9ffe33cea03c4f8371cc3f1aef349f6f380.tar.bz2 scummvm-rg350-6ca8d9ffe33cea03c4f8371cc3f1aef349f6f380.zip |
KYRA: Remove unused/obsolete function.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/screen.cpp | 52 | ||||
-rw-r--r-- | engines/kyra/screen.h | 2 |
2 files changed, 0 insertions, 54 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 8dc53baa2f..3d94189fc9 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -978,58 +978,6 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, } } -void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) { - if (srcPage > 13 || dstPage > 13) - error("Screen::crossFadeRegion: attempting to use temp page as source or dest page."); - - hideMouse(); - - uint16 *wB = (uint16*)_pagePtrs[14]; - uint8 *hB = _pagePtrs[14] + 640; - - for (int i = 0; i < w; i++) - wB[i] = i; - - for (int i = 0; i < h; i++) - hB[i] = i; - - for (int i = 0; i < w; i++) - SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]); - - for (int i = 0; i < h; i++) - SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]); - - uint8 *s = _pagePtrs[srcPage]; - uint8 *d = _pagePtrs[dstPage]; - - for (int i = 0; i < h; i++) { - int iH = i; - uint32 end = _system->getMillis() + 1; - for (int ii = 0; ii < w; ii++) { - int sX = x1 + wB[ii]; - int sY = y1 + hB[iH]; - int dX = x2 + wB[ii]; - int dY = y2 + hB[iH]; - - if (++iH >= h) - iH = 0; - - d[dY * 320 + dX] = s[sY * 320 + sX]; - addDirtyRect(dX, dY, 1, 1); - } - - // This tries to speed things up, to get similiar speeds as in DOSBox etc. - if ((i & 5) == 5) - updateScreen(); - - uint32 cur = _system->getMillis(); - if (end > cur) - _system->delayMillis(end - cur); - } - - showMouse(); -} - void Screen::drawBox(int x1, int y1, int x2, int y2, int color) { drawClippedLine(x1, y1, x2, y1, color); drawClippedLine(x1, y1, x1, y2, color); diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index 7912e59973..1118c97d93 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -400,8 +400,6 @@ public: void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent); void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false); - void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage); - void clearPage(int pageNum); uint8 getPagePixel(int pageNum, int x, int y); |