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

[thebluegr at users.sourceforge.net]

Revision: 29331
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29331&view=rev
Author:   thebluegr
Date:     2007-10-30 15:20:02 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
The cause for bug #1804403 - "IHNM/ITE: Error loading Game resources (fs-node regression)" was fixed with commits #29327, #29328, #29329. Removed unneeded Amiga-specific code, which should finally fix this bug

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

Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp	2007-10-30 21:57:41 UTC (rev 29330)
+++ scummvm/trunk/engines/saga/rscfile.cpp	2007-10-30 22:20:02 UTC (rev 29331)
@@ -440,29 +440,17 @@
 					sprintf(voicesFileName, "voicesd.cmp");
 					_vm->_gf_compressed_sounds = true;
 				}
-#ifndef __amigaos4__
 			} else if (Common::File::exists("inherit the earth voices") || 
 					   Common::File::exists("inherit the earth voices.cmp")) {
+				_contextsCount++;
+				voicesFileIndex = _contextsCount - 1;
 				if (Common::File::exists("inherit the earth voices")) {
 					sprintf(voicesFileName, "inherit the earth voices");
 				} else {
 					sprintf(voicesFileName, "inherit the earth voices.cmp");
 					_vm->_gf_compressed_sounds = true;
 				}
-#else
-			} else if (Common::File::exists("\"inherit the earth voices\"") || 
-					   Common::File::exists("\"inherit the earth voices.cmp\"")) {
-				if (Common::File::exists("\"inherit the earth voices\"")) {
-					sprintf(voicesFileName, "\"inherit the earth voices\"");
-				} else {
-					sprintf(voicesFileName, "\"inherit the earth voices.cmp\"");
-					_vm->_gf_compressed_sounds = true;
-				}
-#endif
 
-				_contextsCount++;
-				voicesFileIndex = _contextsCount - 1;
-
 				// The resources in the Wyrmkeep combined Windows/Mac/Linux CD version are little endian, but
 				// the voice file is big endian. If we got such a version with mixed files, mark this voice file
 				// as big endian


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