[Scummvm-cvs-logs] SF.net SVN: scummvm: [28372] scummvm/trunk/engines/saga/rscfile.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jul 31 23:57:33 CEST 2007


Revision: 28372
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28372&view=rev
Author:   thebluegr
Date:     2007-07-31 14:57:32 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Fixed incorrect file assignment for the ITE Windows demo

Modified Paths:
--------------
    scummvm/trunk/engines/saga/rscfile.cpp

Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp	2007-07-31 21:19:45 UTC (rev 28371)
+++ scummvm/trunk/engines/saga/rscfile.cpp	2007-07-31 21:57:32 UTC (rev 28372)
@@ -435,7 +435,7 @@
 		} else if (Common::File::exists("musicd.rsc") || Common::File::exists("musicd.cmp")) {
 			_contextsCount++;
 			digitalMusic = true;
-			if (Common::File::exists("musicd.rsc"))
+			if (Common::File::exists("musicd.cmp"))
 				sprintf(musicFileName, "musicd.cmp");
 			else
 				sprintf(musicFileName, "musicd.rsc");
@@ -452,22 +452,13 @@
 
 		// For ITE, add the digital music file and sfx file information here
 		if (_vm->getGameType() == GType_ITE && digitalMusic && i == _contextsCount - 1) {
-			if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
-				context->fileName = musicFileName;
-			else
-				context->fileName = musicFileName;
+			context->fileName = musicFileName;
 			context->fileType = GAME_MUSICFILE;
 		} else if (_vm->getGameType() == GType_ITE && !soundFileInArray && i == soundFileIndex) {
-			if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
-				context->fileName = soundFileName;
-			else
-				context->fileName = soundFileName;
+			context->fileName = soundFileName;
 			context->fileType = GAME_SOUNDFILE;	
 		} else if (_vm->getGameType() == GType_ITE && !voicesFileInArray && i == voicesFileIndex) {
-			if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
-				context->fileName = voicesFileName;
-			else
-				context->fileName = voicesFileName;
+			context->fileName = voicesFileName;
 			// can be GAME_VOICEFILE or GAME_SOUNDFILE | GAME_VOICEFILE or GAME_VOICEFILE | GAME_SWAPENDIAN
 			context->fileType = voiceFileType;
 		} else {


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