[Scummvm-cvs-logs] SF.net SVN: scummvm: [32075] scummvm/trunk

[athrxx at users.sourceforge.net]

Revision: 32075
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32075&view=rev
Author:   athrxx
Date:     2008-05-12 14:52:44 -0700 (Mon, 12 May 2008)

Log Message:
-----------
fix valgrind warning and some cleanup

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/kyra.dat
    scummvm/trunk/engines/kyra/sequences_hof.cpp
    scummvm/trunk/engines/kyra/sound_towns.cpp
    scummvm/trunk/engines/kyra/staticres.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.h
    scummvm/trunk/tools/create_kyradat/hof_towns.h
    scummvm/trunk/tools/create_kyradat/misc.h

Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp	2008-05-12 21:52:44 UTC (rev 32075)
@@ -284,8 +284,10 @@
 		seq_sequenceCommand(cseq.finalCommand);
 		seq_resetAllTextEntries();
 
-		if (_abortIntroFlag || skipFlag())
+		if (_abortIntroFlag || skipFlag()) {
 			_sound->haltTrack();
+			_sound->voiceStop();
+		}
 
 		if (_flags.isDemo && !_flags.isTalkie) {
 			if (seqNum == kSequenceDemoFisher) {

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2008-05-12 21:52:44 UTC (rev 32075)
@@ -1443,10 +1443,7 @@
 	}
 
 	char filename [13];
-	if (scumm_stricmp(file + strlen(file) - 4, ".PCM"))
-		sprintf(filename, "%s.PCM", file);
-	else
-		strcpy(filename, file);
+	sprintf(filename, "%s.PCM", file);
 
 	uint8 * data = _vm->resource()->fileData(filename, 0);
 	uint8 * src = data;

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-05-12 21:52:44 UTC (rev 32075)
@@ -44,7 +44,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 26
+#define RESFILE_VERSION 27
 
 bool StaticResource::checkKyraDat() {
 	Common::File kyraDat;
@@ -1226,10 +1226,12 @@
 		tmpSndLst[i] = new char[len + 1];
 		tmpSndLst[i][0] = 0;
 
-		if (tlkfiles) {
+		if (tlkfiles && strlen(seqSoundList[i])) {
 			for (int ii = 0; ii < tmpSize; ii++) {
-				if (!scumm_stricmp(&seqSoundList[i][1], &tlkfiles[ii][1]))
-					strcpy(tmpSndLst[i], tlkfiles[ii]);
+				if (strlen(seqSoundList[i])) {
+					if (!scumm_stricmp(&seqSoundList[i][1], &tlkfiles[ii][1]))
+						strcpy(tmpSndLst[i], tlkfiles[ii]);
+				}
 			}
 		}
 

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-05-12 21:52:44 UTC (rev 32075)
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 26,
+	kKyraDatVersion = 27,
 	kIndexSize = 12
 };
 
@@ -87,8 +87,8 @@
 	{ k2TypeSeqData, extractHofSeqData, createFilename },
 	{ k2TypeShpDataV1, extractHofShapeAnimDataV1, createFilename },
 	{ k2TypeShpDataV2, extractHofShapeAnimDataV2, createFilename },
-
 	{ k2TypeSoundList, extractStringsWoSuffix, createFilename },
+	{ k2TypeLangSoundList, extractStringsWoSuffix, createLangFilename },	
 	{ k2TypeSfxList, extractPaddedStrings, createFilename },
 	{ k3TypeRaw16to8, extractRaw16to8, createFilename },
 	{ k3TypeShpData, extractMrShapeAnimData, createFilename },
@@ -219,7 +219,7 @@
 	{ k2SeqplayCreditsSpecial, kTypeStringList, "S_CREDITS2.TXT" },
 	{ k2SeqplayStrings, kTypeLanguageList, "S_STRINGS" },
 	{ k2SeqplaySfxFiles, k2TypeSoundList, "S_SFXFILES.TXT" },
-	{ k2SeqplayTlkFiles, kTypeLanguageList, "S_TLKFILES" },
+	{ k2SeqplayTlkFiles, k2TypeLangSoundList, "S_TLKFILES" },
 	{ k2SeqplaySeqData, k2TypeSeqData, "S_DATA.SEQ" },
 	{ k2SeqplayIntroTracks, kTypeStringList, "S_INTRO.TRA" },
 	{ k2SeqplayFinaleTracks, kTypeStringList, "S_FINALE.TRA" },
@@ -230,6 +230,7 @@
 	// Ingame
 	{ k2IngamePakFiles, kTypeStringList, "I_PAKFILES.TXT" },
 	{ k2IngameSfxFiles, kTypeStringList, "I_SFXFILES.TRA" },
+	{ k2IngameSfxFilesTns, k2TypeSoundList, "I_SFXFILES.TRA" },
 	{ k2IngameSfxIndex, kTypeRawData, "I_SFXINDEX.MAP" },
 	{ k2IngameTracks, kTypeStringList, "I_TRACKS.TRA" },
 	{ k2IngameCDA, kTypeRawData, "I_TRACKS.CDA" },

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.h	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.h	2008-05-12 21:52:44 UTC (rev 32075)
@@ -156,6 +156,7 @@
 
 	k2IngamePakFiles,
 	k2IngameSfxFiles,
+	k2IngameSfxFilesTns,
 	k2IngameSfxIndex,
 	k2IngameTracks,
 	k2IngameCDA,
@@ -257,6 +258,7 @@
 	k2TypeShpDataV1,
 	k2TypeShpDataV2,
 	k2TypeSoundList,
+	k2TypeLangSoundList,
 	k2TypeSfxList,
 
 	k3TypeRaw16to8,

Modified: scummvm/trunk/tools/create_kyradat/hof_towns.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/hof_towns.h	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/tools/create_kyradat/hof_towns.h	2008-05-12 21:52:44 UTC (rev 32075)
@@ -15,7 +15,7 @@
 
 const ExtractEntry kyra2File2FMTownsE[] = {
 	{ k2IngamePakFiles, 0x00000540, 0x0000065C },
-	{ k2IngameSfxFiles, 0x00003E3C, 0x000047A3 },
+	{ k2IngameSfxFilesTns, 0x00003E3C, 0x000047A3 },
 	{ k2IngameSfxIndex, 0x00013980, 0x00013CD8 },
 	{ k2IngameCDA, 0x0001808C, 0x000181BC },
 	{ k2IngameTalkObjIndex, 0x000199B6, 0x00019A30 },

Modified: scummvm/trunk/tools/create_kyradat/misc.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/misc.h	2008-05-12 21:47:38 UTC (rev 32074)
+++ scummvm/trunk/tools/create_kyradat/misc.h	2008-05-12 21:52:44 UTC (rev 32075)
@@ -433,7 +433,7 @@
 
 const int kyra2TownsFile2EngNeed[] = {
 	k2IngamePakFiles,
-	k2IngameSfxFiles,
+	k2IngameSfxFilesTns,
 	k2IngameSfxIndex,
 	k2IngameCDA,
 	k2IngameTalkObjIndex,


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