[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.322,1.323

kirben kirben at users.sourceforge.net
Fri May 13 03:27:25 CEST 2005


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

Modified Files:
	resource.cpp 
Log Message:

Check if charset is been used, before expiring the resource.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- resource.cpp	10 May 2005 22:56:08 -0000	1.322
+++ resource.cpp	13 May 2005 10:23:56 -0000	1.323
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "common/str.h"
 
+#include "scumm/charset.h"
 #include "scumm/dialogs.h"
 #include "scumm/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
@@ -890,6 +891,8 @@
 		return isCostumeInUse(i);
 	case rtSound:
 		return _sound->isSoundInUse(i);
+	case rtCharset:
+		return _charset->getCurID() == i;
 	default:
 		return false;
 	}





More information about the Scummvm-git-logs mailing list