[Scummvm-cvs-logs] SF.net SVN: scummvm: [27730] scummvm/trunk/engines/agi

[buddha_ at users.sourceforge.net]

Revision: 27730
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27730&view=rev
Author:   buddha_
Date:     2007-06-26 09:06:58 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Fix saving & restoring with AGI256 and AGI256-2 games.
(Should save, restore and use decodePicture's agi256-parameter correctly now).

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/picture.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2007-06-26 13:38:24 UTC (rev 27729)
+++ scummvm/trunk/engines/agi/agi.cpp	2007-06-26 16:06:58 UTC (rev 27730)
@@ -334,7 +334,10 @@
 	case ADD_PIC:
 		debugC(8, kDebugLevelMain, "--- decoding picture %d ---", p1);
 		agiLoadResource(rPICTURE, p1);
-		_picture->decodePicture(p1, p2);
+		// Not using simply p3 or (bool) p3 for decodePicture's third
+		// parameter because they give a warning C4800 with MSVC8:
+		// 'int16' : forcing value to bool 'true' or 'false' (performance warning)
+		_picture->decodePicture(p1, p2, p3 ? true : false);
 		break;
 	case ADD_VIEW:
 		agiLoadResource(rVIEW, p1);

Modified: scummvm/trunk/engines/agi/picture.cpp
===================================================================
--- scummvm/trunk/engines/agi/picture.cpp	2007-06-26 13:38:24 UTC (rev 27729)
+++ scummvm/trunk/engines/agi/picture.cpp	2007-06-26 16:06:58 UTC (rev 27730)
@@ -652,7 +652,7 @@
 
 	if (clear)
 		_vm->clearImageStack();
-	_vm->recordImageStackCall(ADD_PIC, n, clear, 0, 0, 0, 0, 0);
+	_vm->recordImageStackCall(ADD_PIC, n, clear, agi256, 0, 0, 0, 0);
 
 	return errOK;
 }


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