aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 00:45:27 +0000
committerSven Hesse2010-08-08 00:45:27 +0000
commitf956f059e3fcdbf4da29f6f5ecec2339f5b89e78 (patch)
treee9ffb549970cb0867e2a7a13dd2c0e1598aacff9 /engines
parent61739bc180731c22ee8008d7f47bf3f399fed358 (diff)
downloadscummvm-rg350-f956f059e3fcdbf4da29f6f5ecec2339f5b89e78.tar.gz
scummvm-rg350-f956f059e3fcdbf4da29f6f5ecec2339f5b89e78.tar.bz2
scummvm-rg350-f956f059e3fcdbf4da29f6f5ecec2339f5b89e78.zip
GOB: Minor cleanup
svn-id: r51873
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/videoplayer.cpp24
-rw-r--r--engines/gob/videoplayer.h1
2 files changed, 2 insertions, 23 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 30a22398da..4dcf49fb86 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -289,8 +289,6 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) {
WRITE_VAR(11, video->decoder->getCurFrame());
- // blitFrame(video->surface, *surface);
-
if (_woodruffCohCottWorkaround && (properties.startFrame == 31)) {
// WORKAROUND: This frame mistakenly masks Coh Cott, making her vanish
// To prevent that, we'll never draw that part
@@ -384,24 +382,6 @@ void VideoPlayer::checkAbort(Video &video, Properties &properties) {
}
}
-void VideoPlayer::blitFrame(SurfaceDescPtr dst, const Graphics::Surface &src) {
- if (!dst || !src.pixels)
- return;
-
- uint32 w = MIN<uint32>(dst->getWidth() , src.w);
- uint32 h = MIN<uint32>(dst->getHeight(), src.h);
-
- byte *d = dst->getVidMem();
- const byte *s = (const byte *) src.pixels;
-
- while (h-- > 0) {
- memcpy(d, s, w);
-
- d += dst->getWidth();
- s += src.pitch;
- }
-}
-
bool VideoPlayer::slotIsOpen(int slot) const {
return getVideoBySlot(slot) != 0;
}
@@ -489,8 +469,8 @@ void VideoPlayer::writeVideoInfo(const Common::String &file, int16 varX, int16 v
int16 x = -1, y = -1, width = -1, height = -1;
- // x = video.decoder->getX();
- // y = video.decoder->getY();
+ x = video.decoder->getDefaultX();
+ y = video.decoder->getDefaultY();
width = video.decoder->getWidth();
width = video.decoder->getHeight();
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 1b60e7ffd6..04c55f84cd 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -181,7 +181,6 @@ private:
Graphics::CoktelDecoder *openVideo(const Common::String &file, Properties &properties);
bool playFrame(int slot, Properties &properties);
- void blitFrame(SurfaceDescPtr dst, const Graphics::Surface &src);
void checkAbort(Video &video, Properties &properties);
void evalBgShading(Video &video);