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

[drmccoy at users.sourceforge.net]

Revision: 35389
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35389&view=rev
Author:   drmccoy
Date:     2008-12-16 02:57:48 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
First step at getting the magnifier and memory view corrected

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

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-15 23:11:24 UTC (rev 35388)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-16 02:57:48 UTC (rev 35389)
@@ -1522,6 +1522,7 @@
 
 void Vmd::blit16(byte *dest, uint16 *src, int16 width, int16 height) {
 	int16 vWidth = _width >> 1;
+	width >>= 1;
 
 	assert(_palLUT);
 

Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp	2008-12-15 23:11:24 UTC (rev 35388)
+++ scummvm/trunk/engines/gob/videoplayer.cpp	2008-12-16 02:57:48 UTC (rev 35389)
@@ -247,10 +247,25 @@
 		}
 
 		if (!(flags & kFlagNoVideo)) {
-			_backSurf = ((flags & kFlagFrontSurface) == 0);
-			SurfaceDesc::Ptr surf = _vm->_draw->_spritesArray[_backSurf ? 21 : 20];
+			SurfaceDesc::Ptr surf;
+
+			if (flags & kFlagOtherSurface) {
+				_backSurf = false;
+
+				surf = _vm->_video->initSurfDesc(_vm->_global->_videoMode,
+						_primaryVideo->getVideo()->getWidth(),
+						_primaryVideo->getVideo()->getHeight(), 0);
+				_vm->_draw->_spritesArray[x] = surf;
+
+				x = 0;
+			} else {
+				_backSurf = ((flags & kFlagFrontSurface) == 0);
+				surf = _vm->_draw->_spritesArray[_backSurf ? 21 : 20];
+			}
+
 			_primaryVideo->getVideo()->setVideoMemory(surf->getVidMem(),
 					surf->getWidth(), surf->getHeight());
+
 		} else
 			_primaryVideo->getVideo()->setVideoMemory();
 

Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h	2008-12-15 23:11:24 UTC (rev 35388)
+++ scummvm/trunk/engines/gob/videoplayer.h	2008-12-16 02:57:48 UTC (rev 35389)
@@ -41,7 +41,8 @@
 		kFlagNone = 0,
 		kFlagUseBackSurfaceContent = 0x40,
 		kFlagFrontSurface = 0x80,
-		kFlagNoVideo = 0x100
+		kFlagNoVideo = 0x100,
+		kFlagOtherSurface = 0x800
 	};
 
 	enum Type {


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