From 6a74374d36ab79b3d5e721acb65a322818557057 Mon Sep 17 00:00:00 2001 From: Florian Kagerer Date: Fri, 18 Apr 2008 19:14:44 +0000 Subject: [PATCH] update kyradat tool svn-id: r31562 --- tools/create_kyradat/create_kyradat.cpp | 3 ++- tools/create_kyradat/create_kyradat.h | 7 ++++++- tools/create_kyradat/hof_demo.h | 19 +++++++++++++++++++ tools/create_kyradat/misc.h | 8 ++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index d57b603e07a..1e6b779c7d2 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -31,7 +31,7 @@ #include "md5.h" enum { - kKyraDatVersion = 23, + kKyraDatVersion = 24, kIndexSize = 12 }; @@ -224,6 +224,7 @@ const ExtractFilename extractFilenames[] = { { k2IngameTalkObjIndex, kTypeRawData, "I_TALKOBJECTS.MAP" }, { k2IngameTimJpStrings, kTypeStringList, "I_TIMJPSTR.TXT" }, { k2IngameItemAnimData, k2TypeShpDataV2, "I_INVANIM.SHP" }, + { k2IngameTlkDemoStrings, kTypeLanguageList, "I_TLKDEMO.TXT" }, { -1, 0, 0 } }; diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h index 7cc78244e2b..5127f16b5db 100644 --- a/tools/create_kyradat/create_kyradat.h +++ b/tools/create_kyradat/create_kyradat.h @@ -162,6 +162,7 @@ enum kExtractID { k2IngameTalkObjIndex, k2IngameTimJpStrings, k2IngameItemAnimData, + k2IngameTlkDemoStrings, kMaxResIDs }; @@ -200,7 +201,11 @@ enum kSpecial { k2FloppyFile1 = 15, k2FloppyFile2 = 16, - k2DemoVersion = 17 + k2DemoVersion = 17, + + k2DemoVersionTlkE = 18, + k2DemoVersionTlkF = 19, + k2DemoVersionTlkG = 20 }; struct SpecialExtension { diff --git a/tools/create_kyradat/hof_demo.h b/tools/create_kyradat/hof_demo.h index b4bb1b98450..f7b15ffa3da 100644 --- a/tools/create_kyradat/hof_demo.h +++ b/tools/create_kyradat/hof_demo.h @@ -7,7 +7,26 @@ const ExtractEntry kyra2Demo[] = { { -1, 0, 0 } }; +const ExtractEntry kyra2DemoCDE[] = { + { k2IngameTlkDemoStrings, 0x0002F367, 0x0002F432 }, + { -1, 0, 0 } +}; + +const ExtractEntry kyra2DemoCDF[] = { + { k2IngameTlkDemoStrings, 0x0002F432, 0x0002F4F0 }, + { -1, 0, 0 } +}; + +const ExtractEntry kyra2DemoCDG[] = { + { k2IngameTlkDemoStrings, 0x0002F4F0, 0x0002F5CC }, + { -1, 0, 0 } +}; + const Game kyra2Demos[] = { { kKyra2, EN_ANY, k2DemoVersion, "a620a37579dd44ab0403482285e3897f", kyra2Demo}, + { kKyra2, EN_ANY, k2CDFile2E, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDE}, + { kKyra2, FR_FRA, k2CDFile2F, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDF}, + { kKyra2, DE_DEU, k2CDFile2G, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDG}, + GAME_DUMMY_ENTRY }; diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h index a7cce228f83..bd2421ebabd 100644 --- a/tools/create_kyradat/misc.h +++ b/tools/create_kyradat/misc.h @@ -455,6 +455,11 @@ const int kyra2DemoNeed[] = { -1 }; +const int kyra2TlkDemoNeed[] = { + k2IngameTlkDemoStrings, + -1 +}; + const GameNeed gameNeedTable[] = { { kKyra1, -1, kyra1FloppyNeed }, { kKyra1, kTalkieVersion, kyra1CDNeed }, @@ -476,6 +481,9 @@ const GameNeed gameNeedTable[] = { { kKyra2, k2TownsFile2E , kyra2TownsFile2EngNeed }, { kKyra2, k2TownsFile2J, kyra2TownsFile2JapNeed }, { kKyra2, k2DemoVersion, kyra2DemoNeed}, + { kKyra2, k2DemoVersionTlkE, kyra2TlkDemoNeed}, + { kKyra2, k2DemoVersionTlkF, kyra2TlkDemoNeed}, + { kKyra2, k2DemoVersionTlkG, kyra2TlkDemoNeed}, { -1, -1, 0 } };