[Scummvm-cvs-logs] SF.net SVN: scummvm: [21454] scummvm/trunk/engines/scumm

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sat Mar 25 12:16:04 CET 2006


Revision: 21454
Author:   cyx
Date:     2006-03-25 12:15:41 -0800 (Sat, 25 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21454&view=rev

Log Message:
-----------
fixed wrong computation of decflag in AkosRenderer::drawLimb (HE specific, bug #1416186).

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/akos.cpp
    scummvm/trunk/engines/scumm/debugger.cpp
Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp	2006-03-25 19:46:58 UTC (rev 21453)
+++ scummvm/trunk/engines/scumm/akos.cpp	2006-03-25 20:15:41 UTC (rev 21454)
@@ -483,7 +483,7 @@
 					if (_vm->_game.heversion >= 90 && cond == 0) {
 						decflag = 1;
 					} else if (type == 0x40000000) { // restored_bit
-						decflag = (a->_heCondMask & cond) ? 1 : 0;
+						decflag = (a->_heCondMask & cond) == cond ? 1 : 0;
 					} else if (type == 0x80000000) { // dirty_bit
 						decflag = (a->_heCondMask & cond) ? 0 : 1;
 					} else {

Modified: scummvm/trunk/engines/scumm/debugger.cpp
===================================================================
--- scummvm/trunk/engines/scumm/debugger.cpp	2006-03-25 19:46:58 UTC (rev 21453)
+++ scummvm/trunk/engines/scumm/debugger.cpp	2006-03-25 20:15:41 UTC (rev 21454)
@@ -418,6 +418,11 @@
 		}
 	} else if (!strcmp(argv[2], "name")) {
 		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getObjOrActorName(actnum));
+	} else if (!strcmp(argv[2], "condmask")) {
+		if (argc > 3) {
+			a->_heCondMask = value;
+		}
+		DebugPrintf("Actor[%d]._heCondMask = 0x%X\n", actnum, a->_heCondMask);
 	} else {
 		DebugPrintf("Unknown actor command '%s'\nUse <ignoreboxes |costume> as command\n", argv[2]);
 	}


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