[Scummvm-cvs-logs] SF.net SVN: scummvm:[40390] scummvm/trunk/engines/sci/engine/message.cpp

waltervn at users.sourceforge.net waltervn at users.sourceforge.net
Fri May 8 18:21:51 CEST 2009


Revision: 40390
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40390&view=rev
Author:   waltervn
Date:     2009-05-08 16:21:51 +0000 (Fri, 08 May 2009)

Log Message:
-----------
SCI: GetMessage: lock resource.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/message.cpp

Modified: scummvm/trunk/engines/sci/engine/message.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/message.cpp	2009-05-08 16:03:55 UTC (rev 40389)
+++ scummvm/trunk/engines/sci/engine/message.cpp	2009-05-08 16:21:51 UTC (rev 40390)
@@ -148,11 +148,16 @@
 	if (_module == module)
 		return 1;
 
+	// Unlock old resource
+	if (_module != -1)
+		resmgr->unlockResource(current_res, _module, kResourceTypeMessage);
+
 	_module = module;
-	current_res = resmgr->findResource(kResourceTypeMessage, module, 0);
+	current_res = resmgr->findResource(kResourceTypeMessage, module, 1);
 
 	if (current_res == NULL || current_res->data == NULL) {
 		sciprintf("Message subsystem: Failed to load %d.MSG\n", module);
+		_module = -1;
 		return 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