[Scummvm-cvs-logs] SF.net SVN: scummvm:[34070] scummvm/branches/branch-0-12-0/tools/ create_kyradat
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Wed Aug 20 23:17:31 CEST 2008
Revision: 34070
http://scummvm.svn.sourceforge.net/scummvm/?rev=34070&view=rev
Author: athrxx
Date: 2008-08-20 21:17:30 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
backport updated kyradat tool
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.cpp
scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.h
scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_cd.h
scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_demo.h
scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_floppy.h
scummvm/branches/branch-0-12-0/tools/create_kyradat/misc.h
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.cpp 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.cpp 2008-08-20 21:17:30 UTC (rev 34070)
@@ -31,7 +31,7 @@
#include "md5.h"
enum {
- kKyraDatVersion = 28,
+ kKyraDatVersion = 32,
kIndexSize = 12
};
@@ -53,6 +53,8 @@
#include "malcolm.h"
+#include "lol_demo.h"
+
const Game kyra1FanTranslations[] = {
{ kKyra1, IT_ITA, kTalkieVersion, "d0f1752098236083d81b9497bd2b6989", kyra1FreCD },
GAME_DUMMY_ENTRY
@@ -251,6 +253,11 @@
{ k3ItemMagicTable, k3TypeRaw16to8, "ITEMMAGIC.MAP" },
{ k3ItemStringMap, kTypeRawData, "ITEMSTRINGS.MAP" },
+ // LANDS OF LORE
+
+ // Demo Sequence Player
+ { lSeqplayIntroTracks, k2TypeSoundList, "S_INTRO.TRA" },
+
{ -1, 0, 0 }
};
@@ -288,7 +295,7 @@
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", 0, ".LOL" };
strcat(dstFilename, gidExtensions[gid]);
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -311,7 +318,7 @@
}
}
- static const char *gidExtensions[] = { "", ".K2", ".K3" };
+ static const char *gidExtensions[] = { "", ".K2", ".K3", 0, ".LOL" };
strcat(dstFilename, gidExtensions[gid]);
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
@@ -723,11 +730,11 @@
controlOffs = 0;
WRITE_BE_UINT16(output, controlOffs);
- if (g->special != k2DemoVersion)
+ if (g->special != k2DemoVersion && g->special != k2DemoLol)
ptr += 4;
output += 2;
- if (g->special != k2DemoVersion) {
+ if (g->special != k2DemoVersion && g->special != k2DemoLol) {
for (int w = 0; w < 2; w++) { //startupCommand, finalCommand
WRITE_BE_UINT16(output, READ_LE_UINT16(ptr));
ptr += 2;
@@ -1063,9 +1070,9 @@
uint32 getFeatures(const Game *g) {
uint32 features = 0;
- if (g->special == kTalkieVersion || g->special == k2CDFile1E || g->special == k2CDFile1F || g->special == k2CDFile1G || g->special == k2CDFile2E || g->special == k2CDFile2F || g->special == k2CDFile2G || g->game == kKyra3)
+ if (g->special == kTalkieVersion || g->special == k2CDFile1E || g->special == k2CDFile1F || g->special == k2CDFile1G || g->special == k2CDFile1I || g->special == k2CDFile2E || g->special == k2CDFile2F || g->special == k2CDFile2G || g->game == kKyra3)
features |= GF_TALKIE;
- else if (g->special == kDemoVersion || g->special == k2DemoVersion)
+ else if (g->special == kDemoVersion || g->special == k2DemoVersion || g->special == k2DemoLol)
features |= GF_DEMO;
else if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ ||
g->special == k2TownsFile1E || g->special == k2TownsFile1J ||
@@ -1344,6 +1351,8 @@
kyra3Games,
+ lolDemos,
+
0
};
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.h
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.h 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/create_kyradat.h 2008-08-20 21:17:30 UTC (rev 34070)
@@ -174,6 +174,8 @@
k3ItemMagicTable,
k3ItemStringMap,
+ lSeqplayIntroTracks,
+
kMaxResIDs
};
@@ -202,20 +204,22 @@
k2CDFile2E = 8,
k2CDFile2F = 9,
k2CDFile2G = 10,
+ // Italian fan translation
+ k2CDFile1I = 11,
- k2TownsFile1E = 11,
- k2TownsFile1J = 12,
- k2TownsFile2E = 13,
- k2TownsFile2J = 14,
+ k2TownsFile1E = 12,
+ k2TownsFile1J = 13,
+ k2TownsFile2E = 14,
+ k2TownsFile2J = 15,
- k2FloppyFile1 = 15,
- k2FloppyFile2 = 16,
+ k2FloppyFile1 = 16,
+ k2FloppyFile2 = 17,
- k2DemoVersion = 17,
-
- k2DemoVersionTlkE = 18,
- k2DemoVersionTlkF = 19,
- k2DemoVersionTlkG = 20
+ k2DemoVersion = 18,
+ k2DemoVersionTlkE = 19,
+ k2DemoVersionTlkF = 20,
+ k2DemoVersionTlkG = 21,
+ k2DemoLol = 22
};
struct SpecialExtension {
@@ -225,8 +229,9 @@
enum kGame {
kKyra1 = 0,
- kKyra2,
- kKyra3
+ kKyra2 = 1,
+ kKyra3 = 2,
+ kLol = 4
};
struct Game {
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_cd.h
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_cd.h 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_cd.h 2008-08-20 21:17:30 UTC (rev 34070)
@@ -23,6 +23,12 @@
{ -1, 0, 0 }
};
+const ExtractEntry kyra2File1CDI[] = {
+ { k2SeqplayStrings, 0x0002C566, 0x0002CE7C },
+ { k2SeqplayTlkFiles, 0x0002A2AC, 0x0002A349 },
+ { -1, 0, 0 }
+};
+
const ExtractEntry kyra2File2CDE[] = {
{ k2IngameSfxFiles, 0x0002CB30, 0x0002D221 },
{ k2IngameSfxIndex, 0x000294F0, 0x00029848 },
@@ -47,5 +53,10 @@
{ kKyra2, EN_ANY, k2CDFile2E, "e20d0d2e500f01e399ec588247a7e213", kyra2File2CDE},
{ kKyra2, FR_FRA, k2CDFile2F, "e20d0d2e500f01e399ec588247a7e213", kyra2File2CDF},
{ kKyra2, DE_DEU, k2CDFile2G, "e20d0d2e500f01e399ec588247a7e213", kyra2File2CDG},
+
+ // Italian Fan Translation (using same offsets as English)
+ { kKyra2, IT_ITA, k2CDFile1I, "130795aa8f2333250c895dae9028b9bb", kyra2File1CDI},
+
GAME_DUMMY_ENTRY
};
+
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_demo.h
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_demo.h 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_demo.h 2008-08-20 21:17:30 UTC (rev 34070)
@@ -26,7 +26,8 @@
{ kKyra2, EN_ANY, k2DemoVersion, "a620a37579dd44ab0403482285e3897f", kyra2Demo},
{ kKyra2, EN_ANY, k2CDFile2E, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDE},
{ kKyra2, FR_FRA, k2CDFile2F, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDF},
- { kKyra2, DE_DEU, k2CDFile2G, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDG},
-
+ { kKyra2, DE_DEU, k2CDFile2G, "fa54d8abfe05f9186c05f7de7eaf1480", kyra2DemoCDG},
GAME_DUMMY_ENTRY
};
+
+
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_floppy.h
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_floppy.h 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/hof_floppy.h 2008-08-20 21:17:30 UTC (rev 34070)
@@ -28,6 +28,16 @@
{ -1, 0, 0 }
};
+const ExtractEntry kyra2File1I[] = {
+ { k2SeqplayPakFiles, 0x00021189, 0x000211B7 },
+ { k2SeqplayStrings, 0x00022C62, 0x0002352A },
+ { k2SeqplaySfxFiles, 0x0002352A, 0x0002369D },
+ { k2SeqplayIntroTracks, 0x000236AA, 0x000236AA },
+ { k2SeqplayFinaleTracks, 0x000236C7, 0x000236D9 },
+ { k2SeqplaySeqData, 0x00022250, 0x00022944 },
+ { -1, 0, 0 }
+};
+
const ExtractEntry kyra2File2E[] = {
{ k2IngamePakFiles, 0x0035E4E, 0x00362ED },
{ k2IngameSfxFiles, 0x00034700, 0x00034DF1 },
@@ -58,12 +68,24 @@
{ -1, 0, 0 }
};
+const ExtractEntry kyra2File2I[] = {
+ { k2IngamePakFiles, 0x00036816, 0x00036CB5 },
+ { k2IngameSfxFiles, 0x000350C6, 0x000357B7 },
+ { k2IngameSfxIndex, 0x0002AB80, 0x0002AED8 },
+ { k2IngameTracks, 0x0003BE78, 0x0003BEF6 },
+ { k2IngameTalkObjIndex, 0x00034872, 0x000348EA },
+ { k2IngameItemAnimData, 0x0003C4E2, 0x0003C82A },
+ { -1, 0, 0 }
+};
+
const Game kyra2FloppyGames[] = {
{ kKyra2, EN_ANY, k2FloppyFile1, "9b0f5e57b5a2ed88b5b989cbb402b6c7", kyra2File1E},
{ kKyra2, FR_FRA, k2FloppyFile1, "df31cc9e37e1cf68df2fdc75ddf2d87b", kyra2File1F},
{ kKyra2, DE_DEU, k2FloppyFile1, "0ca4f9a1438264a4c63c3218e064ed3b", kyra2File1G},
+ { kKyra2, IT_ITA, k2FloppyFile1, "178d3ab913f61bfba21d2fb196405e8c", kyra2File1I},
{ kKyra2, EN_ANY, k2FloppyFile2, "7c3eadbe5122722cf2e5e1611e19dfb9", kyra2File2E},
{ kKyra2, FR_FRA, k2FloppyFile2, "fc2c6782778e6c6d5a553d1cb73c98ad", kyra2File2F},
{ kKyra2, DE_DEU, k2FloppyFile2, "0d9b0eb7b0ad889ec942d74d80dde1bf", kyra2File2G},
+ { kKyra2, IT_ITA, k2FloppyFile2, "3a61ed6b7c00ddae383a0361799e2ba6", kyra2File2I},
GAME_DUMMY_ENTRY
};
Modified: scummvm/branches/branch-0-12-0/tools/create_kyradat/misc.h
===================================================================
--- scummvm/branches/branch-0-12-0/tools/create_kyradat/misc.h 2008-08-20 21:10:21 UTC (rev 34069)
+++ scummvm/branches/branch-0-12-0/tools/create_kyradat/misc.h 2008-08-20 21:17:30 UTC (rev 34070)
@@ -363,6 +363,7 @@
k2SeqplayCreditsSpecial,
k2SeqplayStrings,
k2SeqplaySfxFiles,
+ k2SeqplayTlkFiles,
k2SeqplaySeqData,
k2SeqplayIntroTracks,
k2SeqplayFinaleTracks,
@@ -371,14 +372,22 @@
const int kyra2CDFile1FreNeed[] = {
k2SeqplayStrings,
+ k2SeqplayTlkFiles,
-1
};
const int kyra2CDFile1GerNeed[] = {
k2SeqplayStrings,
+ k2SeqplayTlkFiles,
-1
};
+const int kyra2CDFile1ItaNeed[] = {
+ k2SeqplayStrings,
+ k2SeqplayTlkFiles,
+ -1
+};
+
const int kyra2CDFile2EngNeed[] = {
k2IngameSfxFiles,
k2IngameSfxIndex,
@@ -472,6 +481,15 @@
-1
};
+const int lolDemoNeed[] = {
+ k2SeqplayPakFiles,
+ k2SeqplayStrings,
+ k2SeqplaySeqData,
+ k2SeqplaySfxFiles,
+ lSeqplayIntroTracks,
+ -1
+};
+
const GameNeed gameNeedTable[] = {
{ kKyra1, -1, kyra1FloppyNeed },
{ kKyra1, kTalkieVersion, kyra1CDNeed },
@@ -485,6 +503,7 @@
{ kKyra2, k2CDFile1E, kyra2CDFile1EngNeed },
{ kKyra2, k2CDFile1F, kyra2CDFile1FreNeed },
{ kKyra2, k2CDFile1G, kyra2CDFile1GerNeed },
+ { kKyra2, k2CDFile1I, kyra2CDFile1ItaNeed }, // Italian fan translation
{ kKyra2, k2CDFile2E, kyra2CDFile2EngNeed },
{ kKyra2, k2CDFile2F, kyra2CDFile2FreNeed },
{ kKyra2, k2CDFile2G, kyra2CDFile2GerNeed },
@@ -496,6 +515,7 @@
{ kKyra2, k2DemoVersionTlkE, kyra2TlkDemoNeed},
{ kKyra2, k2DemoVersionTlkF, kyra2TlkDemoNeed},
{ kKyra2, k2DemoVersionTlkG, kyra2TlkDemoNeed},
+ { kLol, k2DemoLol, lolDemoNeed},
{ kKyra3, -1, kyra3Need },
@@ -512,14 +532,17 @@
{ k2CDFile1E, "CD" },
{ k2CDFile1F, "CD" },
{ k2CDFile1G, "CD" },
+ { k2CDFile1I, "CD" },
{ k2CDFile2E, "CD" },
{ k2CDFile2F, "CD" },
{ k2CDFile2G, "CD" },
+
{ k2TownsFile1E, "TNS" },
{ k2TownsFile1J, "TNS" },
{ k2TownsFile2E, "TNS" },
{ k2TownsFile2J, "TNS" },
{ k2DemoVersion, "DEM" },
+ { k2DemoLol, "DEM" },
{ -1, 0 }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list