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

[fingolfin at users.sourceforge.net]

Revision: 25643
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25643&view=rev
Author:   fingolfin
Date:     2007-02-16 17:21:00 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
SCUMM: Fix opening of *.tlk files

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:20:41 UTC (rev 25642)
+++ scummvm/trunk/engines/scumm/sound.cpp	2007-02-17 01:21:00 UTC (rev 25643)
@@ -905,7 +905,6 @@
 		{ 0, kVOCMode }
 	};
 
-	char buf[256];
 	ScummFile *file = new ScummFile();
 	_offsetTable = NULL;
 
@@ -914,6 +913,7 @@
 	 * same directory */
 
 	Common::String basename[2];
+	Common::String tmp;
 	
 	const char *ptr = strchr(_vm->_filenamePattern.pattern, '.');
 	if (ptr) {
@@ -926,8 +926,7 @@
 
 	for (uint j = 0; j < 2 && !file->isOpen(); ++j) {
 		for (int i = 0; extensions[i].ext; ++i) {
-			Common::String tmp(basename[j]);
-			tmp += extensions[i].ext;
+			tmp = basename[j] + extensions[i].ext;
 			if (_vm->openFile(*file, tmp)) {
 				_soundMode = extensions[i].mode;
 				break;
@@ -937,12 +936,12 @@
 
 	if (!file->isOpen()) {
 		if ((_vm->_game.heversion <= 61 && _vm->_game.platform == Common::kPlatformMacintosh) || (_vm->_game.heversion >= 70)) {
-			strncpy(buf, _vm->generateFilename(-2).c_str(), sizeof(buf));
+			tmp = _vm->generateFilename(-2);
 		} else {
-			sprintf(buf, "%s.tlk", _vm->_filenamePattern.pattern);
+			tmp = basename[0] + "tlk";
 		}
 
-		if (file->open(buf) && _vm->_game.heversion <= 73)
+		if (file->open(tmp) && _vm->_game.heversion <= 73)
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;
 	}


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