aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/vgagrafx.cpp
diff options
context:
space:
mode:
authorBertrand Augereau2011-07-30 14:32:19 +0200
committerBertrand Augereau2011-07-30 14:32:19 +0200
commit2d0dfffe00628125da8aa43ebe188377ab9331f7 (patch)
treed1dbbefee1bf1b193562ded226f411857ac21620 /engines/dreamweb/vgagrafx.cpp
parent8b0ac65f68e4fd2829b6c0205f72ef53d7a888b0 (diff)
downloadscummvm-rg350-2d0dfffe00628125da8aa43ebe188377ab9331f7.tar.gz
scummvm-rg350-2d0dfffe00628125da8aa43ebe188377ab9331f7.tar.bz2
scummvm-rg350-2d0dfffe00628125da8aa43ebe188377ab9331f7.zip
DREAMWEB: Introduced the Frame struct
Diffstat (limited to 'engines/dreamweb/vgagrafx.cpp')
-rw-r--r--engines/dreamweb/vgagrafx.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 25e5a93ebf..b10ef811b3 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -321,8 +321,8 @@ void DreamGenContext::showframe(uint16 src, uint16 x, uint16 y, uint16 frameNumb
ds = src;
ah = effectsFlag;
- si = frameNumber * 6;
- if (ds.word(si) == 0) {
+ const Frame *frame = (const Frame *)ds.ptr(frameNumber * sizeof(Frame), 6);
+ if ((frame->width == 0) && (frame->height == 0)) {
*width = 0;
*height = 0;
return;
@@ -330,14 +330,14 @@ void DreamGenContext::showframe(uint16 src, uint16 x, uint16 y, uint16 frameNumb
//notblankshow:
if ((effectsFlag & 128) == 0) {
- x += ds.byte(si + 4);
- y += ds.byte(si + 5);
+ x += frame->x;
+ y += frame->y;
}
//skipoffsets:
- *width = ds.byte(si + 0);
- *height = ds.byte(si + 1);
- si = ds.word(si+2) + 2080;
+ *width = frame->width;
+ *height = frame->height;
+ si = frame->ptr() + 2080;
const uint8 *pSrc = ds.ptr(si, *width * *height);
if (effectsFlag) {