[Scummvm-cvs-logs] SF.net SVN: scummvm:[41182] scummvm/branches/gsoc2009-16bit/engines/scumm/ resource.cpp

[Kirben at users.sourceforge.net]

Revision: 41182
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41182&view=rev
Author:   Kirben
Date:     2009-06-05 00:21:10 +0000 (Fri, 05 Jun 2009)

Log Message:
-----------
Sound resource 1 is used for queued speech in HE60+ games, and should never be nuked, when expiring resources.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/resource.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/resource.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/resource.cpp	2009-06-04 23:55:08 UTC (rev 41181)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/resource.cpp	2009-06-05 00:21:10 UTC (rev 41182)
@@ -922,7 +922,11 @@
 	case rtCostume:
 		return isCostumeInUse(i);
 	case rtSound:
-		return _sound->isSoundInUse(i);
+		// Sound resource 1 is used for queued speech
+		if (_game.heversion >= 60 && i == 1)
+			return true;
+		else
+			return _sound->isSoundInUse(i);
 	case rtCharset:
 		return _charset->getCurID() == i;
 	case rtImage:


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