patch 1891492 for the CreateKyradat tool (.dlg and .tim file support)

svn-id: r30881

6 files changed, 23 insertions, 8 deletions

diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 76e852fd92..02d7d6c32d 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 20,
+	kKyraDatVersion = 21,
 	kIndexSize = 12
 };
 
@@ -212,11 +212,13 @@ const ExtractFilename extractFilenames[] = {
 
 	// Ingame
 	{ k2IngamePakFiles, kTypeStringList, "I_PAKFILES.TXT" },
-	{ k2IngameSfxFiles, kTypeStringList, "I_SFXFILES.TXT" },
-	{ k2IngameSfxIndex, kTypeRawData, "I_SFXINDEX.TRA" },
+	{ k2IngameSfxFiles, kTypeStringList, "I_SFXFILES.TRA" },
+	{ k2IngameSfxIndex, kTypeRawData, "I_SFXINDEX.MAP" },
 	{ k2IngameTracks, kTypeStringList, "I_TRACKS.TRA" },
 	{ k2IngameCDA, kTypeRawData, "I_TRACKS.CDA" },
-
+	{ k2IngameTalkObjIndex, kTypeRawData, "I_TALKOBJECTS.MAP" },
+	{ k2IngameTimJpStrings, kTypeStringList, "I_TIMJPSTR.TXT" },
+	
 	{ -1, 0, 0 }
 };
 
@@ -254,7 +256,7 @@ bool getFilename(char *dstFilename, const Game *g, const int id) {
 void createFilename(char *dstFilename, const int gid, const int lang, const int special, const char *filename) {
 	strcpy(dstFilename, filename);
 
-	static const char *gidExtensions[] = { "", ".K2", ".K3" };
+	static const char *gidExtensions[] = { "", ".K2", ".K3" };	
 	strcat(dstFilename, gidExtensions[gid]);
 
 	for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -277,7 +279,7 @@ void createLangFilename(char *dstFilename, const int gid, const int lang, const
 		}
 	}
 
-	static const char *gidExtensions[] = { "", ".K2", ".K3" };
+	static const char *gidExtensions[] = { "", ".K2", ".K3" };	
 	strcat(dstFilename, gidExtensions[gid]);
 
 	for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -1158,3 +1160,4 @@ const Game *findGame(const byte *buffer, const uint32 size) {
 }
 
 
+
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index 063c05abfe..4a1f64ba7c 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -159,6 +159,8 @@ enum kExtractID {
 	k2IngameSfxIndex,
 	k2IngameTracks,
 	k2IngameCDA,
+	k2IngameTalkObjIndex,
+	k2IngameTimJpStrings,
 
 	kMaxResIDs
 };
@@ -207,8 +209,8 @@ struct SpecialExtension {
 
 enum kGame {
 	kKyra1 = 0,
-	kKyra2 = 1,
-	kKyra3 = 2
+	kKyra2,
+	kKyra3
 };
 
 struct Game {
diff --git a/tools/create_kyradat/hof_cd.h b/tools/create_kyradat/hof_cd.h
index 910bacb474..e42ef0deed 100644
--- a/tools/create_kyradat/hof_cd.h
+++ b/tools/create_kyradat/hof_cd.h
@@ -27,6 +27,7 @@ const ExtractEntry kyra2File2CDE[] = {
 	{ k2IngameSfxFiles, 0x0002CB30, 0x0002D221 },
 	{ k2IngameSfxIndex, 0x000294F0, 0x00029848 },
 	{ k2IngameTracks, 0x0002F2FE, 0x0002F37E },
+	{ k2IngameTalkObjIndex, 0x0002BAC2, 0x0002BB46 },
 	{ -1, 0, 0 }
 };
 
diff --git a/tools/create_kyradat/hof_floppy.h b/tools/create_kyradat/hof_floppy.h
index a4aee16ced..6d9f7fc1ec 100644
--- a/tools/create_kyradat/hof_floppy.h
+++ b/tools/create_kyradat/hof_floppy.h
@@ -34,6 +34,7 @@ const ExtractEntry kyra2File2E[] = {
 	{ k2IngameSfxFiles, 0x00034700, 0x00034DF1 },
 	{ k2IngameSfxIndex, 0x0002A710, 0x0002AA68 },
 	{ k2IngameTracks, 0x0003B2F2, 0x0003B370 },
+	{ k2IngameTalkObjIndex, 0x00033EB2, 0x00033F2A },
 	{ -1, 0, 0 }
 };
 
@@ -42,6 +43,7 @@ const ExtractEntry kyra2File2F[] = {
 	{ k2IngameSfxFiles, 0x00033E24, 0x00034515 },
 	{ k2IngameSfxIndex, 0x000288B0, 0x00028C08 },
 	{ k2IngameTracks, 0x0003B2F2, 0x0003B370 },
+	{ k2IngameTalkObjIndex, 0x0003328E, 0x00033306 },
 	{ -1, 0, 0 }
 };
 
@@ -50,6 +52,7 @@ const ExtractEntry kyra2File2G[] = {
 	{ k2IngameSfxFiles, 0x00033ED8, 0x000345C9 },
 	{ k2IngameSfxIndex, 0x000288E0, 0x00028C38 },
 	{ k2IngameTracks, 0x0003AA8C, 0x0003AB0A },
+	{ k2IngameTalkObjIndex, 0x000332BE, 0x00033336 },
 	{ -1, 0, 0 }
 };
 
diff --git a/tools/create_kyradat/hof_towns.h b/tools/create_kyradat/hof_towns.h
index e6f3d11197..4c79dfa64a 100644
--- a/tools/create_kyradat/hof_towns.h
+++ b/tools/create_kyradat/hof_towns.h
@@ -18,6 +18,8 @@ const ExtractEntry kyra2File2FMTownsE[] = {
 	{ k2IngameSfxFiles, 0x00003E3C, 0x000047A3 },
 	{ k2IngameSfxIndex, 0x00013980, 0x00013CD8 },
 	{ k2IngameCDA, 0x0001808C, 0x000181BC },
+	{ k2IngameTalkObjIndex, 0x000199B6, 0x00019A30 },
+	{ k2IngameTimJpStrings, 0x0000677C, 0x000067A9 },
 	{ -1, 0, 0 }
 };
 
diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h
index 8a7f23c4a1..53ac9567d5 100644
--- a/tools/create_kyradat/misc.h
+++ b/tools/create_kyradat/misc.h
@@ -382,6 +382,7 @@ const int kyra2CDFile2EngNeed[] = {
 	k2IngameSfxFiles,
 	k2IngameSfxIndex,
 	k2IngameTracks,
+	k2IngameTalkObjIndex,
 	-1
 };
 
@@ -408,6 +409,7 @@ const int kyra2FloppyFile2Need[] = {
 	k2IngameSfxFiles,
 	k2IngameSfxIndex,
 	k2IngameTracks,
+	k2IngameTalkObjIndex,
 	-1
 };
 
@@ -431,6 +433,8 @@ const int kyra2TownsFile2EngNeed[] = {
 	k2IngameSfxFiles,
 	k2IngameSfxIndex,
 	k2IngameCDA,
+	k2IngameTalkObjIndex,
+	k2IngameTimJpStrings,
 	-1
 };