[Scummvm-cvs-logs] SF.net SVN: scummvm:[51873] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Aug 8 02:45:27 CEST 2010


Revision: 51873
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51873&view=rev
Author:   drmccoy
Date:     2010-08-08 00:45:27 +0000 (Sun, 08 Aug 2010)

Log Message:
-----------
GOB: Minor cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/gob/videoplayer.cpp
    scummvm/trunk/engines/gob/videoplayer.h

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:44:56 UTC (rev 51872)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2010-08-08 00:45:27 UTC (rev 51873)
@@ -289,8 +289,6 @@
 
 	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::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 @@
 
 		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();
 

Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h	2010-08-08 00:44:56 UTC (rev 51872)
+++ scummvm/trunk/engines/gob/videoplayer.h	2010-08-08 00:45:27 UTC (rev 51873)
@@ -181,7 +181,6 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list