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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Fri Jun 2 12:54:57 CEST 2006


Revision: 22830
Author:   drmccoy
Date:     2006-06-02 03:54:53 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22830&view=rev

Log Message:
-----------
- Fixed IMD transparency
- Fixed SegFault due to uninitialized _multData2
- Removed left-over debug comment

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.cpp
    scummvm/trunk/engines/gob/mult_v2.cpp
Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2006-06-02 08:06:50 UTC (rev 22829)
+++ scummvm/trunk/engines/gob/game.cpp	2006-06-02 10:54:53 UTC (rev 22830)
@@ -2389,7 +2389,7 @@
 				retVal |= *_imdFrameData;
 				if (imdPtr->surfDesc == 0)
 					continue;
-				if (!(_vm->_video->_extraMode && (imdPtr->surfDesc->vidMode == 0x13))) // MODIFIED... NOT!
+				if (!(_vm->_video->_extraMode && (imdPtr->surfDesc->vidMode == 0x13)))
 					imdRenderFrame(imdPtr);
 				else
 					warning("GOB2 Stub! viedImd, sub_2C69A(imdPtr);");
@@ -2431,7 +2431,7 @@
 				y + imdPtr->stdY, 1);
 	else
 		_vm->_video->drawSprite(imdPtr->surfDesc, _vm->_draw->_frontSurface, 0, 0,
-				imdPtr->width - 1, imdPtr->height - 1, x, y, 1);
+				imdPtr->width - 1, imdPtr->height - 1, x, y, 0);
 }
 
 void Game::imdRenderFrame(Imd *imdPtr) {

Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp	2006-06-02 08:06:50 UTC (rev 22829)
+++ scummvm/trunk/engines/gob/mult_v2.cpp	2006-06-02 10:54:53 UTC (rev 22830)
@@ -41,6 +41,7 @@
 Mult_v2::Mult_v2(GobEngine *vm) : Mult_v1(vm) {
 	int i;
 
+	_multData2 = 0;
 	for (i = 0; i < 8; i++) _multDatas[i] = 0;
 }
 


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