[Scummvm-cvs-logs] SF.net SVN: scummvm: [25644] scummvm/trunk/engines/scumm/sound.cpp

[kirben at users.sourceforge.net]

Revision: 25644
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25644&view=rev
Author:   kirben
Date:     2007-02-16 17:23:52 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
Reduce amount of attempts to open various speech filenames.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2007-02-17 01:21:00 UTC (rev 25643)
+++ scummvm/trunk/engines/scumm/sound.cpp	2007-02-17 01:23:52 UTC (rev 25644)
@@ -924,17 +924,7 @@
 	}
 	basename[1] = "monster.";
 
-	for (uint j = 0; j < 2 && !file->isOpen(); ++j) {
-		for (int i = 0; extensions[i].ext; ++i) {
-			tmp = basename[j] + extensions[i].ext;
-			if (_vm->openFile(*file, tmp)) {
-				_soundMode = extensions[i].mode;
-				break;
-			}
-		}
-	}
-
-	if (!file->isOpen()) {
+	if (_vm->_game.heversion >= 60) {
 		if ((_vm->_game.heversion <= 61 && _vm->_game.platform == Common::kPlatformMacintosh) || (_vm->_game.heversion >= 70)) {
 			tmp = _vm->generateFilename(-2);
 		} else {
@@ -944,6 +934,16 @@
 		if (file->open(tmp) && _vm->_game.heversion <= 73)
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;
+	} else if (_vm->_game.version >= 5 && _vm->_game.version <= 7) {
+		for (uint j = 0; j < 2 && !file->isOpen(); ++j) {
+			for (int i = 0; extensions[i].ext; ++i) {
+				tmp = basename[j] + extensions[i].ext;
+				if (_vm->openFile(*file, tmp)) {
+					_soundMode = extensions[i].mode;
+					break;
+				}
+			}
+		}
 	}
 
 	if (_soundMode != kVOCMode) {


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