[Scummvm-cvs-logs] SF.net SVN: scummvm: [31742] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31742
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31742&view=rev
Author:   lordhoto
Date:     2008-04-26 15:53:00 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
- load new tlk file on chapter change
- added warning when trying to play non-existent soundfile

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp
    scummvm/trunk/engines/kyra/scene_v3.cpp
    scummvm/trunk/engines/kyra/sound_digital.cpp

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-04-26 22:33:07 UTC (rev 31741)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-04-26 22:53:00 UTC (rev 31742)
@@ -716,7 +716,6 @@
 		char realFilename[20];
 		snprintf(realFilename, 20, "%u.AUD", resFilename);
 
-
 		uint32 curOffset = stream.pos();
 		stream.seek(resOffset, SEEK_SET);
 		entry.size = stream.readUint32LE();

Modified: scummvm/trunk/engines/kyra/scene_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-26 22:33:07 UTC (rev 31741)
+++ scummvm/trunk/engines/kyra/scene_v3.cpp	2008-04-26 22:53:00 UTC (rev 31742)
@@ -42,7 +42,10 @@
 	}
 
 	musicUpdate(0);
-	//XXX
+	if (_curChapter != _currentTalkFile) {
+		_currentTalkFile = _curChapter;
+		openTalkFile(_currentTalkFile);
+	}
 	musicUpdate(0);
 
 	if (!unk3) {
@@ -445,7 +448,7 @@
 	_res->exists(filename, true);
 	_scriptInterpreter->loadScript(filename, &_sceneScriptData, &_opcodes);
 
-	strcpy(filename, scene.filename1);
+	strcpy(filename, scene.filename2);
 	strcat(filename, ".");
 	loadLanguageFile(filename, _sceneStrings);
 	musicUpdate(0);

Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp	2008-04-26 22:33:07 UTC (rev 31741)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp	2008-04-26 22:53:00 UTC (rev 31742)
@@ -366,8 +366,10 @@
 	}
 
 	Common::SeekableReadStream *stream = _vm->resource()->getFileStream(filename);
-	if (!stream)
+	if (!stream) {
+		warning("Couldn't find soundfile '%s'", filename);
 		return -1;
+	}
 
 	strncpy(use->filename, filename, sizeof(use->filename));
 	use->priority = priority;


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