aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2014-01-18 03:18:40 +0100
committerJohannes Schickel2014-01-18 03:18:40 +0100
commit19cb3499f587630f2429c3e99b4fcadf491836cb (patch)
tree827a1a06d51bc3310a9703f8703731b119573d02 /engines/kyra/screen.cpp
parentc9b2c16680faf67bf98cfe5d146f0826a4526c7a (diff)
downloadscummvm-rg350-19cb3499f587630f2429c3e99b4fcadf491836cb.tar.gz
scummvm-rg350-19cb3499f587630f2429c3e99b4fcadf491836cb.tar.bz2
scummvm-rg350-19cb3499f587630f2429c3e99b4fcadf491836cb.zip
KYRA: Rewrite the VQA decoder, using the VideoDecoder classes
There isn't really a lot of benefit to this, but I think it's nicer if all our video decoders at least try to use the same infrastructure.
Diffstat (limited to 'engines/kyra/screen.cpp')
-rw-r--r--engines/kyra/screen.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 8c97e46a8f..d172045302 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -977,6 +977,10 @@ void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
}
void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint8 *src) {
+ copyBlockToPage(pageNum, w, x, y, w, h, src);
+}
+
+void Screen::copyBlockToPage(int pageNum, int pitch, int x, int y, int w, int h, const uint8 *src) {
if (y < 0) {
src += (-y) * w;
h += y;
@@ -1006,7 +1010,7 @@ void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint
while (h--) {
memcpy(dst, src, w);
dst += SCREEN_W;
- src += w;
+ src += pitch;
}
}