aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-07 22:41:38 +0000
committerJohannes Schickel2009-06-07 22:41:38 +0000
commit897c0104c9523eb4ab73fa612b8fd090c87c45e8 (patch)
tree8753a11b2520a4bb95d979cfc3639bca39a4af49
parentec38b77b004c8affefb6b1218833b56ad166d653 (diff)
downloadscummvm-rg350-897c0104c9523eb4ab73fa612b8fd090c87c45e8.tar.gz
scummvm-rg350-897c0104c9523eb4ab73fa612b8fd090c87c45e8.tar.bz2
scummvm-rg350-897c0104c9523eb4ab73fa612b8fd090c87c45e8.zip
Remove unneeded functionality from Screen.
svn-id: r41357
-rw-r--r--engines/kyra/screen.cpp25
-rw-r--r--engines/kyra/screen.h4
2 files changed, 0 insertions, 29 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 08b05a8da3..2b3a9366e6 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2560,31 +2560,6 @@ void Screen::setMouseCursor(int x, int y, const byte *shape) {
_system->updateScreen();
}
-void Screen::copyScreenFromRect(int x, int y, int w, int h, const uint8 *ptr) {
- x <<= 3; w <<= 3;
- const uint8 *src = ptr;
- uint8 *dst = &_pagePtrs[0][y * SCREEN_W + x];
- for (int i = 0; i < h; ++i) {
- memcpy(dst, src, w);
- src += w;
- dst += SCREEN_W;
- }
-
- addDirtyRect(x, y, w, h);
- clearOverlayRect(0, x, y, w, h);
-}
-
-void Screen::copyScreenToRect(int x, int y, int w, int h, uint8 *ptr) {
- x <<= 3; w <<= 3;
- const uint8 *src = &_pagePtrs[0][y * SCREEN_W + x];
- uint8 *dst = ptr;
- for (int i = 0; i < h; ++i) {
- memcpy(dst, src, w);
- dst += w;
- src += SCREEN_W;
- }
-}
-
uint8 *Screen::getPalette(int num) {
assert(num >= 0 && num < (_vm->gameFlags().platform == Common::kPlatformAmiga ? 6 : 4));
if (num == 0)
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index a6e3ef9e9a..1691c73a90 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -258,10 +258,6 @@ protected:
};
int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size);
- void restoreMouseRect();
- void copyMouseToScreen();
- void copyScreenFromRect(int x, int y, int w, int h, const uint8 *ptr);
- void copyScreenToRect(int x, int y, int w, int h, uint8 *ptr);
template<bool noXor> static void wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src);
template<bool noXor> static void wrapped_decodeFrameDeltaPage(uint8 *dst, const uint8 *src, const int pitch);