[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.83,2.84

kirben kirben at users.sourceforge.net
Sun May 22 20:45:40 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1004/scumm

Modified Files:
	wiz_he.cpp 
Log Message:

Lock altered or file loaded wizImages, to make sure they aren't expired while in use.
Fixes glitches in mustard.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.83
retrieving revision 2.84
diff -u -d -r2.83 -r2.84
--- wiz_he.cpp	23 May 2005 03:33:08 -0000	2.83
+++ wiz_he.cpp	23 May 2005 03:41:27 -0000	2.84
@@ -1029,6 +1029,7 @@
 		if (dstResNum) {
 			uint8 *dstPtr = _vm->getResourceAddress(rtImage, dstResNum);
 			assert(dstPtr);
+			_vm->res.lock(rtImage, dstResNum);
 			dst = _vm->findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
 			assert(dst);
 
@@ -1270,6 +1271,7 @@
 		if (dstResNum) {
 			uint8 *dstPtr = _vm->getResourceAddress(rtImage, dstResNum);
 			assert(dstPtr);
+			_vm->res.lock(rtImage, dstResNum);
 			dst = _vm->findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
 			assert(dst);
 
@@ -1732,6 +1734,7 @@
 						_vm->VAR(_vm->VAR_GAME_LOADED) = -2;
 						_vm->VAR(119) = -2;
 					} else {
+						_vm->res.lock(rtImage, params->img.resNum);
 						_vm->VAR(_vm->VAR_GAME_LOADED) = 0;
 						_vm->VAR(119) = 0;
 					}





More information about the Scummvm-git-logs mailing list