[Scummvm-cvs-logs] CVS: scummvm/saga rscfile.cpp,1.42,1.43 sndres.cpp,1.53,1.54

[Eugene Sandulenko]

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

Modified Files:
	rscfile.cpp sndres.cpp 
Log Message:
Fix SFX loading in IHNM. Now they're played.


Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- rscfile.cpp	23 Sep 2005 14:29:26 -0000	1.42
+++ rscfile.cpp	29 Sep 2005 15:27:10 -0000	1.43
@@ -440,12 +440,18 @@
 	// TODO: close chapter context, or rather reassign it in our case
 
 	ResourceContext *resourceContext;
+	ResourceContext *soundContext;
 
 	resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
 	if (resourceContext == NULL) {
 		error("Resource::loadGlobalResources() resource context not found");
 	}
 
+	soundContext = _vm->_resource->getContext(GAME_SOUNDFILE);
+	if (soundContext == NULL) {
+		error("Resource::loadGlobalResources() sound context not found");
+	}
+
 	byte *resourcePointer;
 	size_t resourceLength;
 
@@ -490,7 +496,7 @@
 	}
 
 	debug(0, "Going to read %d of %d", chapter, _vm->_sndRes->_fxTableIDs[chapter]);
-	_vm->_resource->loadResource(resourceContext, _vm->_sndRes->_fxTableIDs[chapter],
+	_vm->_resource->loadResource(soundContext, _vm->_sndRes->_fxTableIDs[chapter],
 								 resourcePointer, resourceLength);
 
 	if (resourceLength == 0) {

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sndres.cpp	11 Aug 2005 15:04:12 -0000	1.53
+++ sndres.cpp	29 Sep 2005 15:27:10 -0000	1.54
@@ -58,7 +58,7 @@
 	} else {
 		ResourceContext *resourceContext;
 
-		resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
+		resourceContext = _vm->_resource->getContext(GAME_SOUNDFILE);
 		if (resourceContext == NULL) {
 			error("Resource::loadGlobalResources() resource context not found");
 		}