diff options
| author | Johannes Schickel | 2008-08-16 21:51:56 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-08-16 21:51:56 +0000 |
| commit | 08b4cf127bf2b810fbe284ea4f424ca342b27c6b (patch) | |
| tree | 44ec24b87d962d63403c0d55b82aae62635f032c | |
| parent | cc80af14485304b97f0b329438fcf89c427d8bfb (diff) | |
| download | scummvm-rg350-08b4cf127bf2b810fbe284ea4f424ca342b27c6b.tar.gz scummvm-rg350-08b4cf127bf2b810fbe284ea4f424ca342b27c6b.tar.bz2 scummvm-rg350-08b4cf127bf2b810fbe284ea4f424ca342b27c6b.zip | |
Cleanup.
svn-id: r33948
| -rw-r--r-- | engines/kyra/screen.cpp | 9 | ||||
| -rw-r--r-- | engines/kyra/screen.h | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 0cde066cc0..68faaf6177 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -554,19 +554,16 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag copyOverlayRegion(x1, y1, x2, y2, w, h, srcPage, dstPage); - if (flags & CR_X_FLIPPED) { + if (flags & CR_NO_P_CHECK) { while (h--) { - for (int i = 0; i < w; ++i) { - if (src[i] || (flags & CR_NO_P_CHECK)) - dst[w-i] = src[i]; - } + memcpy(dst, src, w); src += SCREEN_W; dst += SCREEN_W; } } else { while (h--) { for (int i = 0; i < w; ++i) { - if (src[i] || (flags & CR_NO_P_CHECK)) + if (src[i]) dst[i] = src[i]; } src += SCREEN_W; diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index 99ba2d7c5f..8623856878 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -74,8 +74,7 @@ public: }; enum CopyRegionFlags { - CR_X_FLIPPED = 0x01, - CR_NO_P_CHECK = 0x02 + CR_NO_P_CHECK = 0x01 }; enum DrawShapeFlags { |