diff options
Diffstat (limited to 'engines/dreamweb')
-rw-r--r-- | engines/dreamweb/backdrop.cpp | 5 | ||||
-rw-r--r-- | engines/dreamweb/sprite.cpp | 6 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 8 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 5 |
5 files changed, 13 insertions, 12 deletions
diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp index 94963f40ef..cba1f14c5e 100644 --- a/engines/dreamweb/backdrop.cpp +++ b/engines/dreamweb/backdrop.cpp @@ -166,8 +166,7 @@ void DreamGenContext::showallobs() { if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) { x += data.word(kMapadx); y += data.word(kMapady); - uint8 width, height; - showframe(frames, x, y, data.word(kCurrentframe), 0, &width, &height); + showframe(frames, x, y, data.word(kCurrentframe), 0); } else makebackob(setEntry); @@ -266,7 +265,7 @@ void DreamGenContext::showallfree() { if ((width != 0) || (height != 0)) { x += data.word(kMapadx); y += data.word(kMapady); - showframe((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x, y, data.word(kCurrentframe) & 0xff, 0, &width, &height); + showframe((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x, y, data.word(kCurrentframe) & 0xff, 0); ObjPos *objPos = (ObjPos *)segRef(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos)); objPos->xMin = data.byte(kSavex); objPos->yMin = data.byte(kSavey); diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 2f7bfa76cc..c1a47ae5fc 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -66,8 +66,7 @@ void DreamGenContext::printasprite(const Sprite *sprite) { c = 8; else c = 0; - uint8 width, height; - showframe((const Frame *)segRef(sprite->frameData()).ptr(0, 0), x, y, sprite->b15, c, &width, &height); + showframe((const Frame *)segRef(sprite->frameData()).ptr(0, 0), x, y, sprite->b15, c); } void DreamGenContext::clearsprites() { @@ -546,8 +545,7 @@ void DreamGenContext::showreelframe(Reel *reel) { data.word(kCurrentframe) = reel->frame(); Frame *source = findsourceCPP(); uint16 frame = data.word(kCurrentframe) - data.word(kTakeoff); - uint8 width, height; - showframe(source, x, y, frame, 8, &width, &height); + showframe(source, x, y, frame, 8); } void DreamGenContext::showgamereel() { diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 67811f91f9..1439a24de0 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -894,8 +894,7 @@ void DreamGenContext::crosshair() { frame = 29; } const Frame *src = (const Frame *)segRef(data.word(kIcons1)).ptr(0, 0); - uint8 width, height; - showframe(src, kZoomx + 24, kZoomy + 19, frame, 0, &width, &height); + showframe(src, kZoomx + 24, kZoomy + 19, frame, 0); } void DreamGenContext::deltextline() { @@ -1022,9 +1021,8 @@ void DreamGenContext::commandwithob(uint8 command, uint8 type, uint8 index) { void DreamGenContext::showpanel() { Frame *frame = (Frame *)segRef(data.word(kIcons1)).ptr(0, sizeof(Frame)); - uint8 width, height; - showframe(frame, 72, 0, 19, 0, &width, &height); - showframe(frame, 192, 0, 19, 0, &width, &height); + showframe(frame, 72, 0, 19, 0); + showframe(frame, 192, 0, 19, 0); } void DreamGenContext::blocknametext() { diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index d2d3e4a80a..37b7befe6e 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -69,6 +69,7 @@ Sprite *spritetable(); void showframe(); void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height); + void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag); void printasprite(const Sprite *sprite); void width160(); void multiput(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height); diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index 5e0e35e8ab..3c92640768 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -312,6 +312,11 @@ void DreamGenContext::frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint } } +void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) { + uint8 width, height; + showframe(frameData, x, y, frameNumber, effectsFlag, &width, &height); +} + void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) { const Frame *frame = frameData + frameNumber; if ((frame->width == 0) && (frame->height == 0)) { |