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

[thebluegr at users.sourceforge.net]

Revision: 29275
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29275&view=rev
Author:   thebluegr
Date:     2007-10-27 21:16:48 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
Cleanup

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

Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp	2007-10-28 04:14:52 UTC (rev 29274)
+++ scummvm/trunk/engines/saga/rscfile.cpp	2007-10-28 04:16:48 UTC (rev 29275)
@@ -443,9 +443,6 @@
 #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 {
@@ -455,9 +452,6 @@
 #else
 			} 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 {
@@ -465,6 +459,10 @@
 					_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.