From bb7463638ef3c54098ad6f179bdc0cd435bb06f3 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 17 Sep 2009 19:51:16 +0000 Subject: - Add preliminary support for Lands of Lore PC98 in create_kyradat - Increase kyra.dat version - Rebuilt kyra.dat svn-id: r44177 --- tools/create_kyradat/create_kyradat.cpp | 12 +++-- tools/create_kyradat/games.cpp | 83 +++++++++++++++++++++++++++++++++ tools/create_kyradat/tables.cpp | 5 ++ 3 files changed, 97 insertions(+), 3 deletions(-) (limited to 'tools/create_kyradat') diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index ee3c45b58a..73e4aa9bc2 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -37,7 +37,7 @@ #include "md5.h" enum { - kKyraDatVersion = 56, + kKyraDatVersion = 57, kIndexSize = 12 }; @@ -340,6 +340,7 @@ const Language languageTable[] = { const PlatformExtension platformTable[] = { { kPlatformAmiga, "AMG" }, { kPlatformFMTowns, "TNS" }, + { kPlatformPC98, "TNS" }, // HACK { -1, 0 } }; @@ -372,7 +373,7 @@ uint32 getFeatures(const Game *g) { features |= GF_DEMO; else if (g->special == kDemoCDVersion) features |= (GF_DEMO | GF_TALKIE); - else if (g->platform == kPlatformFMTowns) + else if (g->platform == kPlatformFMTowns || g->platform == kPlatformPC98) // HACK features |= GF_FMTOWNS; else if (g->platform == kPlatformAmiga) features |= GF_AMIGA; @@ -994,6 +995,8 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) { return false; } + bool breakProcess = false; + // Compare against need list for (const int *entry = needList; *entry != -1; ++entry) { if (ids.find(*entry) != ids.end()) @@ -1008,12 +1011,15 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) { // If the data wasn't found already, we need to break the extraction here if (!list || !list->findEntry(filename)) { fprintf(stderr, "Couldn't find id %d/%s in executable file\n", *entry, getIdString(*entry)); - return false; + breakProcess = true; } else { warning("Id %d/%s is present in kyra.dat but could not be found in the executable", *entry, getIdString(*entry)); } } + if (breakProcess) + return false; + for (IdMap::const_iterator i = ids.begin(); i != ids.end(); ++i) { const int id = i->first; diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp index 317efcf052..a23041b902 100644 --- a/tools/create_kyradat/games.cpp +++ b/tools/create_kyradat/games.cpp @@ -103,6 +103,9 @@ const Game lolGames[] = { // DOS floppy (no language specifc strings) { kLol, DE_DEU, kPlatformPC, -1, "6b843869772c1b779e1386be868c15dd" }, + // PC98 (no language specifc strings) + { kLol, JA_JPN, kPlatformPC98, -1, "6d5bd4a2f5ce433365734ca6b7a8d984" }, + // DOS CD (multi language version, with no language specific strings) { kLol, UNK_LANG, kPlatformPC, kTalkieFile1, "9d1778314de80598c0b0d032e2a1a1cf" }, { kLol, UNK_LANG, kPlatformPC, kTalkieFile2, "263998ec600afca1cc7b935c473df670" }, @@ -656,6 +659,85 @@ const int lolFloppyNeed[] = { -1 }; +const int lolPC98Need[] = { + kLolIngamePakFiles, + + kLolCharacterDefs, + kLolIngameSfxFiles, + kLolIngameSfxIndex, + kLolSpellProperties, + kLolGameShapeMap, + kLolSceneItemOffs, + kLolCharInvIndex, + kLolCharInvDefs, + kLolCharDefsMan, + kLolCharDefsWoman, + kLolCharDefsKieran, + kLolCharDefsAkshel, + kLolExpRequirements, + kLolMonsterModifiers, + kLolMonsterLevelOffsets, + kLolMonsterDirFlags, + kLolMonsterScaleY, + kLolMonsterScaleX, + kLolMonsterScaleWH, + kLolFlyingItemShp, + kLolInventoryDesc, + + kLolLevelShpList, + kLolLevelDatList, + kLolCompassDefs, + kLolStashSetup, + kLolDscUnk1, + kLolDscShapeIndex1, + kLolDscShapeIndex2, + kLolDscScaleWidthData, + kLolDscScaleHeightData, + kLolDscX, + kLolDscY, + kLolDscTileIndex, + kLolDscUnk2, + kLolDscDoorShapeIndex, + kLolDscDimData1, + kLolDscDimData2, + kLolDscBlockMap, + kLolDscDimMap, + kLolDscShapeOvlIndex, + kLolDscBlockIndex, + kLolDscDoor1, + kLolDscDoorScale, + kLolDscDoor4, + kLolDscDoorX, + kLolDscDoorY, + + kLolScrollXTop, + kLolScrollYTop, + kLolScrollXBottom, + kLolScrollYBottom, + + kLolButtonDefs, + kLolButtonList1, + kLolButtonList1, + kLolButtonList2, + kLolButtonList3, + kLolButtonList4, + kLolButtonList5, + kLolButtonList6, + kLolButtonList7, + kLolButtonList8, + + kLolLegendData, + kLolMapStringId, + + kLolSpellbookAnim, + kLolSpellbookCoords, + kLolHealShapeFrames, + kLolLightningDefs, + kLolFireballCoords, + + -1 +}; + const int lolCDFile1Need[] = { kLolHistory, -1 @@ -792,6 +874,7 @@ const GameNeed gameNeedTable[] = { { kKyra3, kPlatformPC, -1, kyra3Need }, { kLol, kPlatformPC, -1, lolFloppyNeed }, + { kLol, kPlatformPC98, -1, lolPC98Need }, { kLol, kPlatformPC, kTalkieFile1, lolCDFile1Need }, { kLol, kPlatformPC, kTalkieFile2, lolCDFile2Need }, diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp index 9e8a38858a..69314d3d3b 100644 --- a/tools/create_kyradat/tables.cpp +++ b/tools/create_kyradat/tables.cpp @@ -1204,6 +1204,7 @@ const ExtractEntrySearchData kLolSeqplayIntroTracksProvider[] = { const ExtractEntrySearchData kLolIngamePakFilesProvider[] = { { UNK_LANG, kPlatformPC, { 0x00000088, 0x0000224F, { { 0xDA, 0x24, 0x18, 0xA3, 0xEF, 0x16, 0x70, 0x8F, 0xA8, 0xC2, 0x2E, 0xC2, 0xED, 0x39, 0x03, 0xD1 } } } }, + { UNK_LANG, kPlatformPC98, { 0x00000084, 0x00002125, { { 0x7A, 0x89, 0xE2, 0x36, 0xEC, 0x6F, 0x52, 0x2B, 0xEF, 0xBA, 0x3D, 0x28, 0x54, 0xDA, 0xFB, 0x72 } } } }, EXTRACT_END_ENTRY }; @@ -1211,6 +1212,7 @@ const ExtractEntrySearchData kLolIngamePakFilesProvider[] = { const ExtractEntrySearchData kLolCharacterDefsProvider[] = { { UNK_LANG, kPlatformPC, { 0x00000492, 0x000047FD, { { 0x8C, 0x0B, 0x8B, 0xCE, 0xE0, 0xB0, 0x8F, 0xA9, 0x06, 0xC3, 0x98, 0xE6, 0x2E, 0x09, 0xB6, 0x93 } } } }, // floppy { UNK_LANG, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { UNK_LANG, kPlatformPC98, { 0x00000492, 0x00005893, { { 0x7C, 0x7E, 0xFB, 0x80, 0xD9, 0xB6, 0x16, 0x87, 0x80, 0xB7, 0x46, 0x9B, 0x96, 0x1A, 0x6A, 0xBE } } } }, EXTRACT_END_ENTRY }; @@ -1218,6 +1220,7 @@ const ExtractEntrySearchData kLolCharacterDefsProvider[] = { const ExtractEntrySearchData kLolIngameSfxFilesProvider[] = { { UNK_LANG, kPlatformPC, { 0x000008F2, 0x0001E5B6, { { 0x63, 0x5E, 0x37, 0xAA, 0x27, 0x80, 0x4C, 0x85, 0xB1, 0x9D, 0x7B, 0x1D, 0x64, 0xA3, 0xEB, 0x97 } } } }, // floppy { UNK_LANG, kPlatformPC, { 0x000008F2, 0x0001E5B7, { { 0x9E, 0xC8, 0xE8, 0x19, 0x2F, 0x58, 0x0B, 0xC7, 0x2D, 0x41, 0x72, 0xE7, 0xF4, 0x80, 0x03, 0xCB } } } }, // CD + { UNK_LANG, kPlatformPC98, { 0x000008EF, 0x0001E585, { { 0x85, 0x81, 0x5C, 0xA4, 0x34, 0x44, 0xF4, 0x58, 0xF9, 0x82, 0xEE, 0x0F, 0x6A, 0x0D, 0xA2, 0x7F } } } }, EXTRACT_END_ENTRY }; @@ -1334,6 +1337,7 @@ const ExtractEntrySearchData kLolMonsterScaleYProvider[] = { const ExtractEntrySearchData kLolMonsterScaleXProvider[] = { { UNK_LANG, kPlatformPC, { 0x00000020, 0x00000918, { { 0xF6, 0x14, 0xE6, 0x48, 0x4E, 0x5B, 0x43, 0xCC, 0xCE, 0x4E, 0x98, 0x71, 0x5A, 0xC2, 0x00, 0x1E } } } }, + { UNK_LANG, kPlatformPC98, { 0x0000001D, 0x000008D2, { { 0x1C, 0x25, 0x38, 0xE2, 0xBB, 0xB2, 0xDB, 0x93, 0x1B, 0x25, 0xB6, 0x89, 0xA9, 0x9B, 0x0A, 0xFE } } } }, EXTRACT_END_ENTRY }; @@ -1540,6 +1544,7 @@ const ExtractEntrySearchData kLolScrollYBottomProvider[] = { const ExtractEntrySearchData kLolButtonDefsProvider[] = { { UNK_LANG, kPlatformPC, { 0x0000082A, 0x0000C34E, { { 0x7F, 0x9A, 0x0F, 0x28, 0x1A, 0x8F, 0x03, 0x46, 0x48, 0xEB, 0xC9, 0xB9, 0x23, 0x29, 0x5E, 0x50 } } } }, // floppy { UNK_LANG, kPlatformPC, { 0x0000082A, 0x0000C47B, { { 0xDF, 0x1A, 0x18, 0x1F, 0x58, 0x05, 0x1F, 0x56, 0xD8, 0x6D, 0xBB, 0x93, 0xEC, 0x35, 0x9D, 0xA5 } } } }, // CD + { UNK_LANG, kPlatformPC98, { 0x0000082A, 0x0000AB58, { { 0xDD, 0x2B, 0xA9, 0x54, 0x60, 0x25, 0x2C, 0x74, 0xF8, 0x5D, 0xC6, 0xD2, 0x2C, 0x1A, 0x24, 0x44 } } } }, EXTRACT_END_ENTRY }; -- cgit v1.2.3