diff options
Diffstat (limited to 'devtools')
51 files changed, 626 insertions, 250 deletions
diff --git a/devtools/create_hugo/README b/devtools/create_hugo/README index 42bdd22c36..0d57d5eae5 100644 --- a/devtools/create_hugo/README +++ b/devtools/create_hugo/README @@ -4,4 +4,3 @@ is used by the engine depending on the version of the game started. In order to work properly, the content of the DATA sub-directory has to be copy next to the executable. - diff --git a/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj index eae5fbc55c..1bc98740a0 100644 --- a/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj +++ b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj @@ -110,4 +110,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h index 582d5aaa8e..612e044982 100644 --- a/devtools/create_hugo/staticdata.h +++ b/devtools/create_hugo/staticdata.h @@ -11682,4 +11682,3 @@ int16 def_tunes_2d[] = {-1}; int16 def_tunes_3d[] = {-1}; #endif - diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index e4686cc66c..627b517c62 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include <map> enum { - kKyraDatVersion = 74 + kKyraDatVersion = 78 }; const ExtractFilename extractFilenames[] = { @@ -119,6 +119,7 @@ const ExtractFilename extractFilenames[] = { // AUDIO filename table { k1AudioTracks, kTypeStringList, false }, + { k1AudioTracks2, kTypeStringList, false }, { k1AudioTracksIntro, kTypeStringList, false }, // AMULET anim @@ -219,7 +220,7 @@ const ExtractFilename extractFilenames[] = { // Ingame { kLolIngamePakFiles, kTypeStringList, false }, - { kLolCharacterDefs, kLolTypeCharData, false }, + { kLolCharacterDefs, kLolTypeCharData, true }, { kLolIngameSfxFiles, k2TypeSfxList, false }, { kLolIngameSfxIndex, kTypeRawData, false }, { kLolMusicTrackMap, kTypeRawData, false }, @@ -330,7 +331,7 @@ const TypeTable gameTable[] = { }; byte getGameID(int game) { - return std::find(gameTable, gameTable + ARRAYSIZE(gameTable) - 1, game)->value; + return std::find(gameTable, ARRAYEND(gameTable) - 1, game)->value; } const TypeTable languageTable[] = { @@ -341,11 +342,12 @@ const TypeTable languageTable[] = { { ES_ESP, 4 }, { IT_ITA, 5 }, { JA_JPN, 6 }, + { RU_RUS, 7 }, { -1, -1 } }; byte getLanguageID(int lang) { - return std::find(languageTable, languageTable + ARRAYSIZE(languageTable) - 1, lang)->value; + return std::find(languageTable, ARRAYEND(languageTable) - 1, lang)->value; } const TypeTable platformTable[] = { @@ -358,7 +360,7 @@ const TypeTable platformTable[] = { }; byte getPlatformID(int platform) { - return std::find(platformTable, platformTable + ARRAYSIZE(platformTable) - 1, platform)->value; + return std::find(platformTable, ARRAYEND(platformTable) - 1, platform)->value; } const TypeTable specialTable[] = { @@ -366,11 +368,12 @@ const TypeTable specialTable[] = { { kTalkieVersion, 1 }, { kDemoVersion, 2 }, { kTalkieDemoVersion, 3 }, + { kOldFloppy, 4 }, { -1, -1 } }; byte getSpecialID(int special) { - return std::find(specialTable, specialTable + ARRAYSIZE(specialTable) - 1, special)->value; + return std::find(specialTable, ARRAYEND(specialTable) - 1, special)->value; } // filename processing @@ -767,6 +770,8 @@ const char *getIdString(const int id) { return "k1CharacterImageFilenames"; case k1AudioTracks: return "k1AudioTracks"; + case k1AudioTracks2: + return "k1AudioTracks2"; case k1AudioTracksIntro: return "k1AudioTracksIntro"; case k1ItemNames: @@ -1433,4 +1438,3 @@ bool getExtractionData(const Game *g, Search &search, ExtractMap &map) { return result; } - diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index 22a6db4b39..983ba3c228 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -131,6 +131,7 @@ enum kExtractID { k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, k1CreditsStrings, @@ -275,7 +276,8 @@ enum kSpecial { kNoSpecial = 0, kTalkieVersion, kDemoVersion, - kTalkieDemoVersion + kTalkieDemoVersion, + kOldFloppy, }; enum kGame { diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 5581dacec0..371f2f4e2b 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -127,7 +127,7 @@ const ExtractType *findExtractType(const int type) { } byte getTypeID(int type) { - return std::find(typeTable, typeTable + ARRAYSIZE(typeTable) - 1, type)->value; + return std::find(typeTable, ARRAYEND(typeTable) - 1, type)->value; } // Extractor implementation @@ -142,19 +142,56 @@ bool extractRaw(PAKFile &out, const ExtractInformation *info, const byte *data, } bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *data, const uint32 size, const char *filename, int id) { - int fmtPatch = 0; + // Skip tables for skipping English string left-overs in the hacky Russian fan translations + static const uint8 rusFanSkip_k2SeqplayStrings[] = { 1, 3, 5, 8, 10, 11, 13, 15, 17, 20, 22, 25, 26, 30, 33, 38, 40, 41, 44, 49, 51, 55, 104, 119, 121, 123 }; + static const uint8 rusFanSkip_k1IntroStrings[] = { 3, 5, 9, 11, 13, 16, 18, 21, 24, 32, 34, 36, 38, 41, 44, 49, 52, 55, 57, 59, 61, 64, 66, 69, 72, 75 }; + static const uint8 rusFanSkip_k1ThePoisonStrings[] = { 1, 4 }; + static const uint8 rusFanSkip_k1FullFlaskStrings[] = { 1, 2, 4, 5, 7 }; + static const uint8 rusFanSkip_k1WispJewelStrings[] = { 2 }; + static const uint8 rusFanSkip_k1GUIStrings[] = { 1, 3, 6, 8, 11, 13, 18 }; + uint32 rusFanSkipIdLen = 0; + const uint8 *rusFanSkipId = 0; + int rusFanEmptyId = 10000; + uint32 skipCount = 0; + + int patch = 0; // FM Towns files that need addional patches if (info->platform == kPlatformFMTowns) { if (id == k1TakenStrings || id == k1NoDropStrings || id == k1PoisonGoneString || id == k1ThePoisonStrings || id == k1FluteStrings || id == k1WispJewelStrings) - fmtPatch = 1; + patch = 1; else if (id == k1IntroStrings) - fmtPatch = 2; + patch = 2; else if (id == k2SeqplayStrings) - fmtPatch = 3; + patch = 3; } else if (info->platform == kPlatformPC) { if (id == k2IngamePakFiles) - fmtPatch = 4; + patch = 4; + + if (info->lang == Common::RU_RUS) { + patch = 5; + if (id == k2SeqplayStrings) { + rusFanSkipId = rusFanSkip_k2SeqplayStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k2SeqplayStrings); + rusFanEmptyId = 81; + } else if (id == k1IntroStrings) { + rusFanSkipId = rusFanSkip_k1IntroStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1IntroStrings); + rusFanEmptyId = 30; + } else if (id == k1ThePoisonStrings) { + rusFanSkipId = rusFanSkip_k1ThePoisonStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1ThePoisonStrings); + } else if (id == k1FullFlaskString) { + rusFanSkipId = rusFanSkip_k1FullFlaskStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1FullFlaskStrings); + } else if (id == k1GUIStrings) { + rusFanSkipId = rusFanSkip_k1GUIStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1GUIStrings); + } else if (id == k1WispJewelStrings) { + rusFanSkipId = rusFanSkip_k1WispJewelStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1WispJewelStrings); + } + } // HACK if (id == k2SeqplayIntroTracks && info->game == kLol) @@ -183,7 +220,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da break; targetsize--; } - if (fmtPatch == 1) { + if (patch == 1) { // Here is the first step of the extra treatment for all FM-TOWNS string arrays that // contain more than one string and which the original code // addresses via stringname[boolJapanese]. @@ -201,11 +238,38 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da targetsize--; } } + } else if (patch == 5) { + ++skipCount; + while (!data[i + 1]) { + if (skipCount == rusFanEmptyId) { + ++skipCount; + ++entries; + break; + } + if (++i == size) + break; + targetsize--; + } + + // Skip English string left-overs in the hacky Russian fan translation + for (uint32 ii = 0; ii < rusFanSkipIdLen; ++ii) { + if (skipCount == rusFanSkipId[ii]) { + ++skipCount; + uint32 len = strlen((const char*) data + i); + i += len; + targetsize = targetsize - 1 - len; + while (!data[i + 1]) { + if (++i == len) + break; + targetsize--; + } + } + } } } } - if (fmtPatch == 2) { + if (patch == 2) { if (info->lang == EN_ANY) { targetsize--; entries += 1; @@ -215,12 +279,12 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da } } - if (fmtPatch == 3) { + if (patch == 3) { entries++; targetsize++; } - if (fmtPatch == 4) { + if (patch == 4) { targetsize -= 9; } @@ -229,12 +293,13 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da memset(buffer, 0, targetsize); uint8 *output = buffer; const uint8 *input = (const uint8*) data; + skipCount = 0; WRITE_BE_UINT32(output, entries); output += 4; if (info->platform == kPlatformFMTowns) { const byte *c = data + size; do { - if (fmtPatch == 2 && input - data == 0x3C0 && input[0x10] == 0x32) { + if (patch == 2 && input - data == 0x3C0 && input[0x10] == 0x32) { memcpy(output, input, 0x0F); input += 0x11; output += 0x0F; } @@ -245,14 +310,14 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da // skip empty entries while (!*input) { // Write one empty string into intro strings file - if (fmtPatch == 2) { + if (patch == 2) { if ((info->lang == EN_ANY && input - data == 0x260) || (info->lang == JA_JPN && (input - data == 0x2BD || input - data == 0x2BE))) *output++ = *input; } // insert one dummy string at hof sequence strings position 59 - if (fmtPatch == 3) { + if (patch == 3) { if ((info->lang == EN_ANY && input - data == 0x695) || (info->lang == JA_JPN && input - data == 0x598)) *output++ = *input; @@ -262,7 +327,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da break; } - if (fmtPatch == 1) { + if (patch == 1) { // Here is the extra treatment for all FM-TOWNS string arrays that // contain more than one string and which the original code // addresses via stringname[boolJapanese]. @@ -292,9 +357,38 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da ++dstPos; } targetsize = dstPos + 4; + } else if (patch == 5) { + const byte *c = data + size; + do { + strcpy((char*) output, (const char*) input); + uint32 stringsize = strlen((const char*)output) + 1; + input += stringsize; output += stringsize; + + ++skipCount; + while (!*input) { + if (skipCount == rusFanEmptyId) { + *output++ = *input; + ++skipCount; + } + if (++input == c) + break; + } + // Skip English string left-overs in the hacky Russian fan translation + for (uint32 ii = 0; ii < rusFanSkipIdLen; ++ii) { + if (skipCount == rusFanSkipId[ii]) { + ++skipCount; + input += strlen((const char*)input); + while (!*input) { + if (++input == c) + break; + } + } + } + + } while (input < c); } else { uint32 copySize = size; - if (fmtPatch == 4) { + if (patch == 4) { memcpy(output, data, 44); output += 44; data += 44; @@ -981,4 +1075,3 @@ bool extractMrShapeAnimData(PAKFile &out, const ExtractInformation *info, const } } // end of anonymous namespace - diff --git a/devtools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h index fc473b33d1..a44927427f 100644 --- a/devtools/create_kyradat/extract.h +++ b/devtools/create_kyradat/extract.h @@ -72,4 +72,3 @@ const ExtractType *findExtractType(const int type); byte getTypeID(int type); #endif - diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 76d5d70186..86f3535f10 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -44,6 +44,7 @@ const Game kyra1Games[] = { { kKyra1, { FR_FRA, -1, -1 }, kPlatformPC, kNoSpecial, { "aa9d6d78d8b199deaf48efeca6d19af2", 0 } }, { kKyra1, { IT_ITA, -1, -1 }, kPlatformPC, kNoSpecial, { "5d7550306b369a3492f9f3402702477c", 0 } }, { kKyra1, { ES_ESP, -1, -1 }, kPlatformPC, kNoSpecial, { "9ff130d2558bcd674d4074849d93c362", 0 } }, + { kKyra1, { RU_RUS, -1, -1 }, kPlatformPC, kOldFloppy, { "3b4719e1f8a4d67813b7ada29774aead", 0 } }, // Talkie { kKyra1, { EN_ANY, -1, -1 }, kPlatformPC, kTalkieVersion, { "1ebc18f3e7fbb72474a55cb0fa089ed4", 0 } }, @@ -71,6 +72,7 @@ const Game kyra2Games[] = { { kKyra2, { FR_FRA, -1, -1 }, kPlatformPC, kNoSpecial, { "df31cc9e37e1cf68df2fdc75ddf2d87b", "fc2c6782778e6c6d5a553d1cb73c98ad" } }, { kKyra2, { DE_DEU, -1, -1 }, kPlatformPC, kNoSpecial, { "0ca4f9a1438264a4c63c3218e064ed3b", "0d9b0eb7b0ad889ec942d74d80dde1bf" } }, { kKyra2, { IT_ITA, -1, -1 }, kPlatformPC, kNoSpecial, { "178d3ab913f61bfba21d2fb196405e8c", "3a61ed6b7c00ddae383a0361799e2ba6" } }, + { kKyra2, { RU_RUS, -1, -1 }, kPlatformPC, kNoSpecial, { "fd6a388c01de9a578e24e3bbeacd8012", "3a61ed6b7c00ddae383a0361799e2ba6" } }, // talkie games { kKyra2, { EN_ANY, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "85bbc1cc6c4cef6ad31fc6ee79518efb", "e20d0d2e500f01e399ec588247a7e213" } }, @@ -98,8 +100,9 @@ const Game lolGames[] = { // DOS demo { kLol, { EN_ANY, -1, -1 }, kPlatformPC, kDemoVersion, { "30bb5af87d38adb47d3e6ce06b1cb042", 0 } }, - // DOS floppy (no language specifc strings) + // DOS floppy (no language specifc strings except character presets) { kLol, { EN_ANY, -1, -1 }, kPlatformPC, kNoSpecial, { "0cc764a204f7ba8cefe1a5f14c479619", 0 } }, + { kLol, { RU_RUS, -1, -1 }, kPlatformPC, kNoSpecial, { "80a9f9bf243bc6ed36d98584fc6988c4", 0 } }, { kLol, { DE_DEU, -1, -1 }, kPlatformPC, kNoSpecial, { "6b843869772c1b779e1386be868c15dd", 0 } }, // PC98 (no language specifc strings) @@ -108,6 +111,7 @@ const Game lolGames[] = { // DOS CD (multi language version, with no language specific strings) { kLol, { EN_ANY, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "263998ec600afca1cc7b935c473df670" } }, { kLol, { IT_ITA, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "f2af366e00f79dbf832fa19701d71ed9" } }, // Italian fan translation + { kLol, { EN_ANY, FR_FRA, RU_RUS }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "5b33478718968676343803911dd5e3e4" } }, // Russian fan translation GAME_DUMMY_ENTRY }; @@ -208,6 +212,93 @@ const int kyra1FloppyNeed[] = { k1NewGameString, k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, + k1AudioTracksIntro, + -1 +}; + +const int kyra1FloppyOldNeed[] = { + k1KallakWritingSeq, + k1MalcolmTreeSeq, + k1WestwoodLogoSeq, + k1KyrandiaLogoSeq, + k1KallakMalcolmSeq, + k1ForestSeq, + k1IntroCPSStrings, + k1IntroCOLStrings, + k1IntroWSAStrings, + k1IntroStrings, + k1RoomList, + k1RoomFilenames, + k1CharacterImageFilenames, + k1DefaultShapes, + k1ItemNames, + k1TakenStrings, + k1PlacedStrings, + k1DroppedStrings, + k1AmuleteAnimSeq, + k1SpecialPalette1, + k1SpecialPalette2, + k1SpecialPalette3, + k1SpecialPalette4, + k1SpecialPalette5, + k1SpecialPalette6, + k1SpecialPalette7, + k1SpecialPalette8, + k1SpecialPalette9, + k1SpecialPalette10, + k1SpecialPalette11, + k1SpecialPalette12, + k1SpecialPalette13, + k1SpecialPalette14, + k1SpecialPalette15, + k1SpecialPalette16, + k1SpecialPalette17, + k1SpecialPalette18, + k1SpecialPalette19, + k1SpecialPalette20, + k1SpecialPalette21, + k1SpecialPalette22, + k1SpecialPalette23, + k1SpecialPalette24, + k1SpecialPalette25, + k1SpecialPalette26, + k1SpecialPalette27, + k1SpecialPalette28, + k1SpecialPalette29, + k1SpecialPalette30, + k1SpecialPalette31, + k1SpecialPalette32, + k1PutDownString, + k1WaitAmuletString, + k1BlackJewelString, + k1HealingTipString, + k1PoisonGoneString, + k1Healing1Shapes, + k1Healing2Shapes, + k1ThePoisonStrings, + k1FluteStrings, + k1PoisonDeathShapes, + k1FluteShapes, + k1Winter1Shapes, + k1Winter2Shapes, + k1Winter3Shapes, + k1DrinkShapes, + k1WispShapes, + k1MagicAnimShapes, + k1BranStoneShapes, + k1WispJewelStrings, + k1MagicJewelStrings, + k1FlaskFullString, + k1FullFlaskString, + k1OutroReunionSeq, + k1OutroHomeString, + k1VeryCleverString, + k1GUIStrings, + k1NewGameString, + k1ConfigStrings, + k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, -1 }; @@ -295,6 +386,7 @@ const int kyra1CDNeed[] = { k1NewGameString, k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, -1 }; @@ -938,6 +1030,7 @@ struct GameNeed { const GameNeed gameNeedTable[] = { { kKyra1, kPlatformPC, kNoSpecial, kyra1FloppyNeed }, + { kKyra1, kPlatformPC, kOldFloppy, kyra1FloppyOldNeed }, { kKyra1, kPlatformAmiga, kNoSpecial, kyra1AmigaNeed }, { kKyra1, kPlatformPC, kTalkieVersion, kyra1CDNeed }, @@ -984,4 +1077,3 @@ const int *getNeedList(const Game *g) { return 0; } - diff --git a/devtools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp index 36b59d948c..b861ff0f5a 100644 --- a/devtools/create_kyradat/search.cpp +++ b/devtools/create_kyradat/search.cpp @@ -213,4 +213,3 @@ bool Search::search(ResultList &res) { return !res.empty(); } - diff --git a/devtools/create_kyradat/search.h b/devtools/create_kyradat/search.h index bd6aa0355b..a9e8ee2726 100644 --- a/devtools/create_kyradat/search.h +++ b/devtools/create_kyradat/search.h @@ -114,4 +114,3 @@ private: }; #endif - diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 090b32debc..8042dcac71 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -68,6 +68,7 @@ const ExtractEntrySearchData k1KyrandiaLogoSeqProvider[] = { const ExtractEntrySearchData k1KallakMalcolmSeqProvider[] = { { UNK_LANG, kPlatformPC, { 0x0000026B, 0x00002132, { { 0x51, 0x07, 0x32, 0xA2, 0x09, 0x47, 0x97, 0x02, 0x85, 0x31, 0x39, 0x93, 0x3A, 0x53, 0x47, 0xA5 } } } }, // floppy + { UNK_LANG, kPlatformPC, { 0x00000267, 0x00002100, { { 0xD9, 0x5E, 0x59, 0xF0, 0x7B, 0xC8, 0xF1, 0x40, 0x4F, 0x68, 0x6F, 0xEC, 0xB5, 0xE8, 0x88, 0xE2 } } } }, // floppy { UNK_LANG, kPlatformUnknown, { 0x0000027B, 0x0000220A, { { 0xB7, 0xC1, 0x57, 0x04, 0x9B, 0x67, 0x82, 0x7B, 0x6E, 0xFD, 0x59, 0xF2, 0x10, 0x93, 0x89, 0x12 } } } }, // CD + Amiga { UNK_LANG, kPlatformUnknown, { 0x000002B8, 0x0000280B, { { 0x98, 0xC8, 0x36, 0x8C, 0xF8, 0x92, 0xC2, 0xB9, 0x1B, 0x71, 0x6B, 0x4C, 0xA4, 0x6C, 0xF6, 0x30 } } } }, // Amiga + CD demo @@ -134,8 +135,9 @@ const ExtractEntrySearchData k1AmuleteAnimSeqProvider[] = { const ExtractEntrySearchData k1OutroReunionSeqProvider[] = { { UNK_LANG, kPlatformPC, { 0x00000547, 0x0000781C, { { 0xCF, 0xD6, 0x1D, 0x3D, 0x14, 0x40, 0x88, 0x35, 0x36, 0x4F, 0x0B, 0x1F, 0x9A, 0x1C, 0x3D, 0xAC } } } }, // floppy + { UNK_LANG, kPlatformPC, { 0x00000547, 0x000077E0, { { 0x80, 0xC4, 0xFC, 0xD5, 0xEB, 0xAA, 0xA5, 0x87, 0x58, 0x5E, 0xAA, 0xE7, 0x01, 0x8F, 0x59, 0x3F } } } }, // floppy { UNK_LANG, kPlatformPC, { 0x000005E5, 0x00008918, { { 0x6A, 0x33, 0x8C, 0xB0, 0x16, 0x57, 0x2D, 0xEB, 0xB2, 0xE1, 0x64, 0x80, 0x98, 0x99, 0x98, 0x19 } } } }, // CD - + { UNK_LANG, kPlatformAmiga, { 0x0000054A, 0x0000785F, { { 0x55, 0xEA, 0xB8, 0x7F, 0x3A, 0x86, 0xCD, 0xA6, 0xBC, 0xA7, 0x9A, 0x39, 0xED, 0xF5, 0x30, 0x0A } } } }, { UNK_LANG, kPlatformUnknown, { 0x00000547, 0x00007876, { { 0x7A, 0xC7, 0x80, 0x34, 0x7A, 0x1B, 0xAB, 0xF8, 0xA7, 0x2F, 0x63, 0x3C, 0xDA, 0x89, 0x3F, 0x82 } } } }, // some floppy DOS + FM-TOWNS @@ -150,6 +152,7 @@ const ExtractEntrySearchData k1IntroCPSStringsProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x00000014, 0x0000071D, { { 0xBA, 0xB6, 0x58, 0xB3, 0x28, 0x5E, 0x9F, 0x77, 0x69, 0x9D, 0x77, 0x53, 0x9D, 0x0D, 0xB0, 0x29 } } } }, // floppy + PC98 { UNK_LANG, kPlatformPC, { 0x00000015, 0x00000786, { { 0xCF, 0x09, 0xE1, 0xD9, 0x8E, 0x34, 0x5D, 0xEA, 0xBC, 0xAC, 0xC4, 0xF4, 0x4A, 0xEC, 0xFF, 0xC1 } } } }, // CD + { UNK_LANG, kPlatformPC, { 0x00000019, 0x000008DB, { { 0x3A, 0xDC, 0x1D, 0xAD, 0xF4, 0x5E, 0xC9, 0x19, 0xE9, 0x84, 0xD1, 0x31, 0x89, 0x6B, 0x6C, 0xF7 } } } }, // Old floppy { UNK_LANG, kPlatformPC, { 0x0000000C, 0x00000413, { { 0xA1, 0xE3, 0x06, 0x53, 0x23, 0x9A, 0xE0, 0xF1, 0xE4, 0xFD, 0xD9, 0x05, 0x22, 0xA6, 0x28, 0x46 } } } }, // demo { UNK_LANG, kPlatformAmiga, { 0x00000016, 0x0000070A, { { 0xD9, 0xDB, 0x91, 0xCD, 0x93, 0x81, 0xC4, 0x3F, 0x14, 0xF1, 0xC5, 0x02, 0xE7, 0x3F, 0x3A, 0x6C } } } }, @@ -194,6 +197,8 @@ const ExtractEntrySearchData k1IntroStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x000005CF, 0x00020415, { { 0xCC, 0xE5, 0x9F, 0xB8, 0xCA, 0xFA, 0x2D, 0x05, 0xB8, 0xAF, 0x9F, 0x1F, 0x8A, 0xA8, 0x56, 0xDE } } } }, + { RU_RUS, kPlatformPC, { 0x000004F6, 0x000131C6, { { 0x77, 0x76, 0x12, 0xB1, 0xDA, 0x9C, 0xA9, 0xB5, 0x21, 0x1E, 0x49, 0x08, 0x46, 0xB3, 0xE4, 0x61 } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000050A, 0x0001A7B1, { { 0x1B, 0x74, 0x71, 0x4C, 0xAB, 0x81, 0x10, 0x59, 0x8A, 0x21, 0x50, 0xBB, 0xFE, 0x6F, 0xD0, 0xE8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000626, 0x00021319, { { 0x80, 0x55, 0x54, 0x14, 0x5D, 0x6F, 0x49, 0x04, 0x4A, 0xEF, 0x92, 0xB8, 0x5B, 0x01, 0x0F, 0x97 } } } }, @@ -219,6 +224,8 @@ const ExtractEntrySearchData k1OutroHomeStringProvider[] = { { IT_ITA, kPlatformPC, { 0x00000007, 0x000001B8, { { 0x17, 0x95, 0x5B, 0x4F, 0xE2, 0x07, 0x5A, 0x49, 0xFA, 0xCE, 0x53, 0x8B, 0xE7, 0x46, 0x69, 0xC7 } } } }, // (fan) CD + { RU_RUS, kPlatformPC, { 0x00000005, 0x000000EF, { { 0xA0, 0xB4, 0xF2, 0x11, 0x16, 0x92, 0xC8, 0xEB, 0xF2, 0x0C, 0xFE, 0x43, 0xFE, 0x18, 0xF6, 0xBB } } } }, + EXTRACT_END_ENTRY }; @@ -235,6 +242,7 @@ const ExtractEntrySearchData k1RoomListProvider[] = { { UNK_LANG, kPlatformFMTowns, { 0x000064E8, 0x0010312B, { { 0x94, 0x5C, 0x87, 0x35, 0x35, 0x6B, 0x3E, 0xBF, 0x55, 0x3D, 0xDB, 0xD9, 0xFB, 0x97, 0x27, 0x5D } } } }, { UNK_LANG, kPlatformUnknown, { 0x00004DD6, 0x0010312B, { { 0xC6, 0xF0, 0xC4, 0x2C, 0x5A, 0xD7, 0x48, 0xE4, 0x41, 0x23, 0x65, 0x6D, 0xC8, 0xC7, 0xCE, 0xF5 } } } }, // DOS + PC98 + { UNK_LANG, kPlatformUnknown, { 0x00004DD6, 0x0010315D, { { 0x4A, 0x1B, 0xA2, 0x35, 0xE1, 0x22, 0xD3, 0x7A, 0xE9, 0x69, 0x12, 0x3A, 0x9C, 0x92, 0x6F, 0x5C } } } }, // Old DOS floppy { UNK_LANG, kPlatformAmiga, { 0x00004ECC, 0x0010312B, { { 0x9A, 0x91, 0xF1, 0x9C, 0x8A, 0x96, 0x1C, 0x7B, 0xB7, 0xE4, 0xF1, 0xE9, 0x7D, 0xEF, 0x40, 0xBF } } } }, @@ -252,13 +260,19 @@ const ExtractEntrySearchData k1CharacterImageFilenamesProvider[] = { }; const ExtractEntrySearchData k1AudioTracksProvider[] = { - { UNK_LANG, kPlatformPC, { 0x00000041, 0x00000FBF, { { 0xB5, 0xA2, 0x90, 0xE9, 0x73, 0x83, 0x47, 0x5A, 0xB3, 0x3E, 0x04, 0xBB, 0xAA, 0xC8, 0x84, 0x53 } } } }, + { UNK_LANG, kPlatformPC, { 0x00000038, 0x00000D5C, { { 0x65, 0x35, 0x2F, 0xA3, 0x93, 0x22, 0x15, 0xA0, 0xC6, 0x2B, 0x73, 0x7C, 0x3E, 0xB8, 0x7A, 0xB5 } } } }, { UNK_LANG, kPlatformFMTowns, { 0x0000005D, 0x0000154E, { { 0xA7, 0x7E, 0x03, 0x0A, 0x81, 0x54, 0xD2, 0x5D, 0x7B, 0x33, 0x07, 0xBF, 0x70, 0x01, 0x4B, 0x79 } } } }, EXTRACT_END_ENTRY }; +const ExtractEntrySearchData k1AudioTracks2Provider[] = { + { UNK_LANG, kPlatformPC, { 0x00000009, 0x00000363, { { 0x16, 0xA2, 0x68, 0x21, 0x04, 0xA8, 0x39, 0x7E, 0xA1, 0x7D, 0x70, 0xFD, 0x86, 0xC7, 0x69, 0x28 } } } }, + + EXTRACT_END_ENTRY +}; + const ExtractEntrySearchData k1AudioTracksIntroProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x00000006, 0x0000022C, { { 0x5F, 0xC9, 0xE1, 0x4B, 0x34, 0x52, 0xB9, 0xF8, 0xFF, 0x37, 0x8B, 0xF4, 0xEF, 0x5E, 0xC5, 0xDA } } } }, // floppy + demo { UNK_LANG, kPlatformUnknown, { 0x0000000C, 0x00000458, { { 0xEB, 0xB3, 0x96, 0xA5, 0x07, 0xE6, 0x11, 0x58, 0xDB, 0x3F, 0x34, 0x30, 0xFB, 0x7B, 0x92, 0xC8 } } } }, // CD @@ -278,6 +292,8 @@ const ExtractEntrySearchData k1ItemNamesProvider[] = { { ES_ESP, kPlatformPC, { 0x00000530, 0x0001D90A, { { 0x52, 0xFB, 0xA8, 0x3F, 0xA3, 0x6F, 0xC2, 0x67, 0x55, 0x9F, 0x66, 0x9F, 0xFD, 0x79, 0x44, 0xDF } } } }, + { RU_RUS, kPlatformPC, { 0x000004AE, 0x00011888, { { 0x6F, 0x4D, 0xBE, 0xC8, 0xAE, 0x7C, 0x12, 0x3E, 0x69, 0x0B, 0x39, 0xCB, 0x4D, 0x4B, 0xA8, 0x3A } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x00000380, 0x00012960, { { 0x2D, 0x81, 0xCF, 0x7A, 0x9D, 0x71, 0x83, 0xB7, 0xE5, 0x00, 0xB0, 0x6E, 0x25, 0x94, 0xCB, 0xA4 } } } }, { DE_DEU, kPlatformAmiga, { 0x000003E5, 0x0001607D, { { 0x6D, 0xBE, 0xAD, 0xE5, 0xD1, 0x41, 0x6C, 0x42, 0x71, 0x79, 0x9C, 0x78, 0x93, 0x84, 0xC8, 0x11 } } } }, @@ -302,6 +318,8 @@ const ExtractEntrySearchData k1TakenStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000014, 0x000005D8, { { 0xD6, 0x00, 0x90, 0x6A, 0x75, 0x3B, 0xF1, 0xFE, 0xF4, 0x3E, 0x0E, 0x1D, 0x39, 0xEB, 0x2D, 0xC8 } } } }, + { RU_RUS, kPlatformPC, { 0x00000010, 0x00000262, { { 0x1E, 0x90, 0x20, 0xC8, 0xD3, 0x08, 0x53, 0x4F, 0x28, 0x95, 0x6A, 0xA4, 0x14, 0x37, 0x05, 0xF0 } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000008, 0x00000261, { { 0x93, 0x5B, 0x79, 0xE8, 0x89, 0x8E, 0xB5, 0x37, 0x39, 0x2A, 0xB0, 0x04, 0x98, 0x80, 0x5A, 0x4E } } } }, { DE_DEU, kPlatformAmiga, { 0x0000000E, 0x000004E0, { { 0x52, 0x4D, 0x74, 0x91, 0x70, 0x0D, 0x4C, 0x40, 0x5C, 0x7E, 0xBA, 0xDA, 0x24, 0x49, 0xF3, 0x1A } } } }, @@ -324,8 +342,10 @@ const ExtractEntrySearchData k1PlacedStringsProvider[] = { { IT_ITA, kPlatformPC, { 0x0000000D, 0x0000040D, { { 0x9C, 0x71, 0x53, 0x35, 0xC3, 0xE8, 0x46, 0xB9, 0xD2, 0xFA, 0x1C, 0x8C, 0xC3, 0xFF, 0xBC, 0x1F } } } }, // floppy { IT_ITA, kPlatformPC, { 0x00000011, 0x000003B8, { { 0xC8, 0xA6, 0xE4, 0x8A, 0xF7, 0x4C, 0x3F, 0xA6, 0x24, 0x7F, 0xEF, 0xE4, 0x63, 0x8B, 0x72, 0xF3 } } } }, // (fan) CD - + { ES_ESP, kPlatformPC, { 0x0000000D, 0x00000439, { { 0x57, 0xAE, 0x1C, 0xC1, 0xF5, 0xE8, 0x5B, 0x9E, 0x90, 0x02, 0xB9, 0x8D, 0x86, 0x38, 0xFB, 0xA8 } } } }, + + { RU_RUS, kPlatformPC, { 0x00000009, 0x00000203, { { 0x7D, 0xAE, 0x67, 0x94, 0x8E, 0x73, 0x35, 0xC1, 0x11, 0xB4, 0x55, 0x6E, 0x92, 0x25, 0x39, 0xE4 } } } }, EXTRACT_END_ENTRY }; @@ -344,6 +364,8 @@ const ExtractEntrySearchData k1DroppedStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000008, 0x00000261, { { 0x1D, 0xB5, 0xFB, 0x23, 0x94, 0xA7, 0x86, 0x7A, 0xAC, 0x53, 0xDA, 0x6F, 0xCC, 0x41, 0x0F, 0xD7 } } } }, + { RU_RUS, kPlatformPC, { 0x0000000A, 0x000001F5, { { 0xAA, 0x21, 0x88, 0x6D, 0xD0, 0xAB, 0x5C, 0x15, 0x7F, 0xAD, 0x0E, 0x3B, 0x2F, 0x17, 0xBF, 0xAD } } } }, + EXTRACT_END_ENTRY }; @@ -384,6 +406,8 @@ const ExtractEntrySearchData k1PutDownStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000002D, 0x00001052, { { 0x12, 0x0A, 0x23, 0x11, 0xDF, 0x8A, 0x59, 0xD4, 0xF2, 0xCA, 0xA5, 0xA7, 0x76, 0x1B, 0x54, 0xB6 } } } }, + { RU_RUS, kPlatformPC, { 0x00000024, 0x0000099F, { { 0x05, 0xD7, 0xB8, 0x32, 0x95, 0x93, 0x29, 0x5F, 0xF3, 0x1A, 0xF0, 0x2E, 0xBA, 0x3A, 0x0D, 0x27 } } } }, + EXTRACT_END_ENTRY }; @@ -401,6 +425,8 @@ const ExtractEntrySearchData k1WaitAmuletStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000042, 0x000017FD, { { 0x0A, 0x8A, 0x7E, 0x9A, 0x5F, 0x4A, 0x35, 0x06, 0x4D, 0x6B, 0xBF, 0x29, 0x1B, 0xAD, 0xD8, 0x37 } } } }, + { RU_RUS, kPlatformPC, { 0x0000003C, 0x00000EF1, { { 0xC1, 0x0A, 0xFA, 0xBB, 0x65, 0xC3, 0x31, 0xC9, 0x80, 0x9B, 0x0C, 0x16, 0xED, 0xBF, 0x47, 0xFA } } } }, + { EN_ANY, kPlatformUnknown, { 0x0000003E, 0x0000150D, { { 0xA8, 0xBF, 0x99, 0x9B, 0xC1, 0x36, 0x21, 0x47, 0x6D, 0x99, 0x4F, 0x34, 0xE6, 0x61, 0x47, 0xFD } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -420,6 +446,8 @@ const ExtractEntrySearchData k1BlackJewelStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000025, 0x00000CF6, { { 0x4B, 0x13, 0x39, 0xCB, 0x3F, 0x44, 0x18, 0x46, 0x43, 0xDB, 0x94, 0xC5, 0x3E, 0x6B, 0xC4, 0x74 } } } }, + { RU_RUS, kPlatformPC, { 0x00000021, 0x000007FF, { { 0x3F, 0x26, 0xB4, 0xB4, 0x11, 0x0C, 0xEF, 0xC0, 0x6A, 0xD1, 0xCC, 0x0E, 0x68, 0x7D, 0xA5, 0x1A } } } }, + { EN_ANY, kPlatformUnknown, { 0x00000024, 0x00000B73, { { 0x8D, 0x57, 0x5F, 0x93, 0x85, 0x75, 0xF2, 0xD8, 0x36, 0xC2, 0x7C, 0x0E, 0x3B, 0xEA, 0xE0, 0x0A } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -438,6 +466,8 @@ const ExtractEntrySearchData k1PoisonGoneStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000033, 0x0000127E, { { 0x67, 0xEB, 0xD3, 0x00, 0xF8, 0x4F, 0xF1, 0x79, 0x48, 0xE6, 0x9C, 0xB2, 0xA7, 0xCF, 0x76, 0x07 } } } }, + { RU_RUS, kPlatformPC, { 0x00000027, 0x00000952, { { 0x36, 0x64, 0x30, 0x1C, 0x5A, 0xC0, 0x0D, 0x73, 0xE5, 0xA6, 0x2F, 0xD8, 0x64, 0x98, 0x81, 0x56 } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000002E, 0x00000F59, { { 0xAD, 0x95, 0xF3, 0xA7, 0xBB, 0x04, 0x08, 0x77, 0xD0, 0x71, 0xFC, 0x8B, 0x33, 0x2A, 0x6D, 0xD3 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000037, 0x00001324, { { 0xB3, 0xE6, 0x0A, 0x49, 0x37, 0x73, 0x3C, 0xAF, 0x78, 0x9E, 0x7D, 0x13, 0x75, 0xAE, 0xA8, 0x89 } } } }, @@ -463,6 +493,8 @@ const ExtractEntrySearchData k1HealingTipStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000028, 0x00000E0F, { { 0x3E, 0x40, 0xCA, 0x2A, 0x5F, 0xFE, 0x74, 0x30, 0x8C, 0x31, 0x41, 0x09, 0xBD, 0xFD, 0xA3, 0x7E } } } }, + { RU_RUS, kPlatformPC, { 0x00000026, 0x000008EE, { { 0x7C, 0xC0, 0x62, 0x39, 0x66, 0x9E, 0x63, 0xCD, 0x21, 0x3D, 0x72, 0x91, 0xB8, 0xB9, 0xB6, 0x92 } } } }, + { EN_ANY, kPlatformUnknown, { 0x0000002E, 0x00000F04, { { 0x95, 0x39, 0x36, 0x89, 0xC4, 0x60, 0x7C, 0x0C, 0xDC, 0x06, 0xF7, 0x86, 0x1A, 0xF7, 0x93, 0x2B } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -483,6 +515,9 @@ const ExtractEntrySearchData k1WispJewelStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000005F, 0x0000211E, { { 0xE7, 0x0A, 0x85, 0x25, 0x44, 0x41, 0x47, 0x3B, 0x7A, 0xA6, 0x62, 0xAE, 0xAE, 0xD5, 0x92, 0x45 } } } }, + // only one of two strings translated in the fan translation + { RU_RUS, kPlatformPC, { 0x00000053, 0x0000191F, { { 0x14, 0xEB, 0x38, 0x54, 0x40, 0x40, 0x04, 0xA6, 0xA0, 0xFE, 0xDB, 0xD0, 0x8C, 0xA6, 0x1F, 0x55 } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000056, 0x00001C62, { { 0x43, 0x28, 0x3C, 0x0F, 0x78, 0x52, 0xE7, 0x2A, 0x77, 0xF3, 0x21, 0x5A, 0xF0, 0xFC, 0x9E, 0xF8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000063, 0x00002184, { { 0x6B, 0xDC, 0x6B, 0xCF, 0xD4, 0xC7, 0x2A, 0x9A, 0x2E, 0x34, 0x71, 0x4E, 0xB7, 0xF6, 0xAF, 0xDA } } } }, @@ -508,6 +543,8 @@ const ExtractEntrySearchData k1MagicJewelStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000011, 0x000005CD, { { 0x32, 0x2A, 0xFF, 0x9F, 0x10, 0x75, 0x6B, 0xD6, 0x46, 0xAE, 0x55, 0xD3, 0x68, 0x4F, 0xBB, 0x5A } } } }, + { RU_RUS, kPlatformPC, { 0x00000012, 0x0000047D, { { 0xB1, 0xC3, 0x66, 0xBC, 0x42, 0xAD, 0x5B, 0xD8, 0xF5, 0x3D, 0xB9, 0x50, 0x77, 0x32, 0xA7, 0x15 } } } }, + { EN_ANY, kPlatformUnknown, { 0x00000014, 0x0000069E, { { 0x6A, 0x1C, 0x9B, 0x85, 0x61, 0xC7, 0x28, 0xA9, 0xA3, 0xF4, 0xFA, 0x47, 0x90, 0x8F, 0x06, 0xB4 } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -525,6 +562,8 @@ const ExtractEntrySearchData k1ThePoisonStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000059, 0x00001DF7, { { 0x16, 0x7B, 0x5F, 0x91, 0x06, 0x5B, 0xFC, 0x9C, 0x88, 0x61, 0xCC, 0x1B, 0x52, 0x4F, 0x91, 0xC5 } } } }, + { RU_RUS, kPlatformPC, { 0x00000052, 0x0000136F, { { 0xEF, 0xD2, 0xA0, 0x5F, 0xD5, 0xE6, 0x77, 0x96, 0xFA, 0xC5, 0x60, 0x7C, 0xB7, 0xA8, 0x7C, 0x7A } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000058, 0x00001C24, { { 0xBA, 0x1F, 0xBD, 0x5C, 0x85, 0x3D, 0x3C, 0x92, 0xD1, 0x13, 0xF3, 0x40, 0x2E, 0xBB, 0x1C, 0xE2 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000073, 0x00002690, { { 0x44, 0xAE, 0xC9, 0xFD, 0x9F, 0x8E, 0x1B, 0xDD, 0x3F, 0xE4, 0x4D, 0x4B, 0x5A, 0x13, 0xE5, 0x99 } } } }, @@ -549,6 +588,9 @@ const ExtractEntrySearchData k1FluteStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000052, 0x00001D8E, { { 0x9D, 0xA5, 0xF1, 0x42, 0xD1, 0x48, 0xEB, 0x8F, 0x4B, 0xDC, 0xD9, 0x10, 0x55, 0xBD, 0x12, 0xBB } } } }, + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x0000003C, 0x00001599, { { 0x96, 0x72, 0x5A, 0x8A, 0xA0, 0xEE, 0xA2, 0xCE, 0x4D, 0x21, 0x01, 0x6C, 0xC5, 0x1A, 0xEB, 0x21 } } } }, + { EN_ANY, kPlatformFMTowns, { 0x0000005A, 0x000024F9, { { 0xCA, 0x1F, 0x62, 0x23, 0x22, 0x25, 0x4A, 0x94, 0x8A, 0x50, 0x59, 0xD5, 0xB4, 0x4E, 0xF1, 0xA6 } } } }, { JA_JPN, kPlatformFMTowns, { 0x00000053, 0x00002745, { { 0x7A, 0xBB, 0xFC, 0x30, 0xB6, 0xCE, 0x61, 0xD4, 0xDB, 0xB0, 0xE6, 0xB2, 0xF4, 0x4D, 0x81, 0x35 } } } }, @@ -571,6 +613,8 @@ const ExtractEntrySearchData k1FlaskFullStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000001B, 0x0000099D, { { 0x13, 0x23, 0x5D, 0x38, 0x9B, 0xFB, 0x00, 0x5C, 0xA1, 0x3A, 0x22, 0xD6, 0xCD, 0x5C, 0x09, 0xAE } } } }, + { RU_RUS, kPlatformPC, { 0x0000001A, 0x0000066E, { { 0x36, 0x43, 0xB6, 0xB2, 0xED, 0xBA, 0x21, 0x0C, 0x16, 0x54, 0x99, 0xF9, 0x2E, 0x6E, 0x0A, 0x28 } } } }, + EXTRACT_END_ENTRY }; @@ -586,6 +630,8 @@ const ExtractEntrySearchData k1FullFlaskStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000009A, 0x0000363B, { { 0x38, 0x25, 0xE6, 0xB5, 0xCB, 0x78, 0x5E, 0xAD, 0x2D, 0xD4, 0x2E, 0x8B, 0x89, 0x20, 0xB1, 0x95 } } } }, + { RU_RUS, kPlatformPC, { 0x00000094, 0x0000232B, { { 0xBF, 0x68, 0xF9, 0x8F, 0x82, 0xE9, 0xE7, 0x69, 0x33, 0xD6, 0x41, 0x15, 0x2C, 0xFE, 0x72, 0xAB } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000009A, 0x00003521, { { 0x26, 0xE5, 0xC8, 0x6D, 0x14, 0x81, 0x9F, 0x90, 0x38, 0x3C, 0x00, 0x9D, 0x8E, 0x72, 0xB1, 0x83 } } } }, { DE_DEU, kPlatformAmiga, { 0x000000B0, 0x00003E38, { { 0x8A, 0x6D, 0x42, 0x36, 0x29, 0x06, 0xB2, 0xCE, 0xA3, 0x41, 0x14, 0xE8, 0xB1, 0xEF, 0x6E, 0x3B } } } }, @@ -611,6 +657,9 @@ const ExtractEntrySearchData k1VeryCleverStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000036, 0x000013F8, { { 0x2D, 0x9B, 0x7D, 0x58, 0xD1, 0x94, 0x04, 0x45, 0x6E, 0x81, 0xCC, 0x1E, 0x2F, 0xC5, 0xC9, 0xEA } } } }, + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x00000032, 0x0000118D, { { 0x4B, 0x6D, 0xD4, 0xDC, 0x3E, 0xA2, 0x2D, 0x6D, 0x2C, 0x5A, 0xF7, 0x67, 0x4B, 0x6D, 0x40, 0xEF } } } }, + EXTRACT_END_ENTRY }; @@ -628,6 +677,8 @@ const ExtractEntrySearchData k1NewGameStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000001B, 0x00000701, { { 0x2B, 0x87, 0xC3, 0x82, 0x68, 0xA5, 0xFC, 0xC5, 0x64, 0x9E, 0xAB, 0xD2, 0x8A, 0x07, 0x9C, 0x1E } } } }, + { RU_RUS, kPlatformPC, { 0x00000015, 0x0000035F, { { 0x7E, 0x49, 0xC1, 0xCB, 0x2D, 0x61, 0xA7, 0x4C, 0x20, 0xAC, 0xEC, 0x54, 0x80, 0x14, 0x6A, 0xCA } } } }, + EXTRACT_END_ENTRY }; @@ -654,7 +705,7 @@ const ExtractEntrySearchData k1Healing2ShapesProvider[] = { const ExtractEntrySearchData k1PoisonDeathShapesProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x0000008C, 0x00002E90, { { 0xBC, 0x44, 0xFB, 0x98, 0xE7, 0x42, 0xF6, 0xC8, 0x87, 0xDD, 0x00, 0x42, 0x85, 0xD8, 0x1E, 0x81 } } } }, - + { UNK_LANG, kPlatformUnknown, { 0x0000008C, 0x00002E7C, { { 0xA5, 0xD7, 0x13, 0xFC, 0x43, 0x22, 0x13, 0xBC, 0x5F, 0x3F, 0xC8, 0x28, 0xDA, 0x04, 0xB0, 0xDD } } } }, // Old Dos Floppy EXTRACT_END_ENTRY }; @@ -931,6 +982,8 @@ const ExtractEntrySearchData k1GUIStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000023A, 0x0000C3BD, { { 0xED, 0x0D, 0xE7, 0x5B, 0xDC, 0x21, 0x41, 0x54, 0x68, 0x7D, 0x8E, 0x97, 0x1A, 0xB1, 0xA1, 0x4A } } } }, // floppy + { RU_RUS, kPlatformPC, { 0x000001B1, 0x000065E8, { { 0x91, 0x22, 0x61, 0x8B, 0xCD, 0x7C, 0x0E, 0xD4, 0x32, 0x00, 0xC3, 0x6E, 0x50, 0x7F, 0x3C, 0x82 } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x000001DF, 0x00009042, { { 0x0D, 0xD3, 0x1A, 0x92, 0x8D, 0x9C, 0x72, 0x55, 0xEF, 0xFB, 0x81, 0x21, 0x3B, 0x43, 0xA7, 0xE8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000237, 0x0000BAF7, { { 0xD7, 0x1A, 0x8E, 0xCC, 0x6D, 0x3E, 0xA9, 0xDD, 0x9A, 0x6B, 0x71, 0xFE, 0xD4, 0x50, 0x30, 0x6E } } } }, @@ -957,6 +1010,9 @@ const ExtractEntrySearchData k1ConfigStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000004A, 0x00001B7B, { { 0x6B, 0x69, 0x50, 0x92, 0x9B, 0x35, 0x58, 0xE1, 0xEA, 0xBF, 0x42, 0x0B, 0xEB, 0x88, 0x41, 0x8D } } } }, // floppy + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x0000003F, 0x00000B0D, { { 0x0E, 0x60, 0x0F, 0x4A, 0xA9, 0xF0, 0x1B, 0x76, 0xBB, 0x33, 0xB2, 0x4B, 0x5C, 0xB5, 0x4A, 0x97 } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x0000002E, 0x00000FA1, { { 0x5E, 0xFF, 0xFF, 0x3D, 0xF8, 0x11, 0x6F, 0x3B, 0xC5, 0x39, 0x8F, 0x25, 0x8F, 0x0F, 0xE9, 0x2B } } } }, { DE_DEU, kPlatformAmiga, { 0x00000043, 0x00001783, { { 0xB2, 0x2B, 0xAB, 0x27, 0x06, 0x9A, 0x1E, 0x4B, 0xA7, 0xD3, 0xFF, 0xEB, 0xFD, 0x12, 0xDC, 0x94 } } } }, @@ -1057,6 +1113,8 @@ const ExtractEntrySearchData k2SeqplayStringsProvider[] = { { IT_ITA, kPlatformPC, { 0x00000916, 0x0003188F, { { 0xDC, 0x46, 0x06, 0xE1, 0xB0, 0x66, 0xBC, 0x18, 0x2E, 0x6E, 0x9E, 0xC9, 0xA4, 0x14, 0x8D, 0x08 } } } }, // floppy { IT_ITA, kPlatformPC, { 0x000008C8, 0x00030947, { { 0x7F, 0x75, 0x5F, 0x99, 0x94, 0xFE, 0xA1, 0xE6, 0xEF, 0xB8, 0x93, 0x71, 0x83, 0x1B, 0xAC, 0x4A } } } }, // (fan) CD + { RU_RUS, kPlatformPC, { 0x000008C8, 0x00028639, { { 0xF9, 0x1D, 0x6A, 0x85, 0x23, 0x5E, 0x2A, 0x64, 0xBC, 0x45, 0xB2, 0x48, 0x13, 0x49, 0xD4, 0xF7 } } } }, // (fan) floppy + { EN_ANY, kPlatformFMTowns, { 0x00000990, 0x00030C61, { { 0x60, 0x51, 0x11, 0x83, 0x3F, 0x06, 0xC3, 0xA3, 0xE0, 0xC0, 0x2F, 0x41, 0x29, 0xDE, 0x65, 0xB1 } } } }, { JA_JPN, kPlatformFMTowns, { 0x000008A8, 0x00036831, { { 0x56, 0x5B, 0x23, 0x61, 0xE8, 0x3B, 0xE1, 0x36, 0xD6, 0x62, 0xD0, 0x84, 0x00, 0x04, 0x05, 0xAD } } } }, @@ -1281,10 +1339,15 @@ const ExtractEntrySearchData kLolIngamePakFilesProvider[] = { }; const ExtractEntrySearchData kLolCharacterDefsProvider[] = { - { UNK_LANG, kPlatformPC, { 0x00000492, 0x000046B0, { { 0x7A, 0x94, 0x8B, 0xC6, 0xF7, 0xF1, 0x2F, 0xF3, 0xBC, 0x1B, 0x0B, 0x4E, 0x00, 0xC9, 0x44, 0x58 } } } }, // floppy - { 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 } } } }, + { RU_RUS, kPlatformPC, { 0x00000492, 0x000052BA, { { 0x52, 0x29, 0x0D, 0x49, 0xFD, 0x17, 0xD7, 0x70, 0x6D, 0xCA, 0xEB, 0xB6, 0x7E, 0xFA, 0xBE, 0x08 } } } }, // floppy + { EN_ANY, kPlatformPC, { 0x00000492, 0x000046B0, { { 0x7A, 0x94, 0x8B, 0xC6, 0xF7, 0xF1, 0x2F, 0xF3, 0xBC, 0x1B, 0x0B, 0x4E, 0x00, 0xC9, 0x44, 0x58 } } } }, // floppy + { DE_DEU, kPlatformPC, { 0x00000492, 0x000047FD, { { 0x8C, 0x0B, 0x8B, 0xCE, 0xE0, 0xB0, 0x8F, 0xA9, 0x06, 0xC3, 0x98, 0xE6, 0x2E, 0x09, 0xB6, 0x93 } } } }, // floppy + { EN_ANY, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { DE_DEU, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { FR_FRA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { RU_RUS, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { IT_ITA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { JA_JPN, kPlatformPC98, { 0x00000492, 0x00005893, { { 0x7C, 0x7E, 0xFB, 0x80, 0xD9, 0xB6, 0x16, 0x87, 0x80, 0xB7, 0x46, 0x9B, 0x96, 0x1A, 0x6A, 0xBE } } } }, EXTRACT_END_ENTRY }; @@ -1766,6 +1829,7 @@ const ExtractEntry extractProviders[] = { { k1RoomList, k1RoomListProvider }, { k1CharacterImageFilenames, k1CharacterImageFilenamesProvider }, { k1AudioTracks, k1AudioTracksProvider }, + { k1AudioTracks2, k1AudioTracks2Provider }, { k1AudioTracksIntro, k1AudioTracksIntroProvider }, { k1ItemNames, k1ItemNamesProvider }, { k1TakenStrings, k1TakenStringsProvider }, @@ -1962,4 +2026,3 @@ ExtractEntryList getProvidersForId(int id) { return list; } - diff --git a/devtools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h index b9687a5949..833c70a4fe 100644 --- a/devtools/create_kyradat/tables.h +++ b/devtools/create_kyradat/tables.h @@ -39,4 +39,3 @@ typedef std::list<ExtractEntrySearchData> ExtractEntryList; ExtractEntryList getProvidersForId(int id); #endif - diff --git a/devtools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp index 3b9f621949..2420f44168 100644 --- a/devtools/create_kyradat/util.cpp +++ b/devtools/create_kyradat/util.cpp @@ -137,4 +137,3 @@ uint32 fileSize(FILE *fp) { fseek(fp, pos, SEEK_SET); return sz; } - diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index aec9e45b8b..b4de34d832 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -124,4 +124,4 @@ int main(int argc, char *argv[]) { } return 0; -}
\ No newline at end of file +} diff --git a/devtools/create_mads/scripts/rex_nebular.txt b/devtools/create_mads/scripts/rex_nebular.txt index f177720398..f33a574813 100644 --- a/devtools/create_mads/scripts/rex_nebular.txt +++ b/devtools/create_mads/scripts/rex_nebular.txt @@ -2239,5 +2239,3 @@ sub scene101_actions @2f6ba: RET end - - diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 35d08561bf..0b190b3f0e 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -773,6 +773,7 @@ const Feature s_features[] = { { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, // Feature flags + { "bink", "USE_BINK", "", true, "Bink video support" }, { "scalers", "USE_SCALERS", "", true, "Scalers" }, { "hqscalers", "USE_HQ_SCALERS", "", true, "HQ scalers" }, { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 3d7f8fdd3d..40c515f26b 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -59,11 +59,11 @@ </Link> <PostBuildEvent> <Command>@echo off -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\</Command> +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -84,10 +84,12 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\</Command> <TargetMachine>MachineX86</TargetMachine> </Link> <PostBuildEvent> - <Command>xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\</Command> + <Command>@echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> <PreBuildEvent> <Command> @@ -120,4 +122,4 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\</Command> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/devtools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters index 5ecd6c3dde..b4f0b18774 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj.filters +++ b/devtools/create_project/msvc10/create_project.vcxproj.filters @@ -68,4 +68,4 @@ <Filter>scripts</Filter> </None> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index bdd57be7df..2cf8895d4b 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -77,8 +77,8 @@ int main(int argc, char *argv[]) { writeByte(outFile, TOON_DAT_VER_MAJ); writeByte(outFile, TOON_DAT_VER_MIN); - // game versions/variantes - writeUint16BE(outFile, NUM_VARIANTE); + // game versions/variants + writeUint16BE(outFile, NUM_VARIANTS); // Write locationDirNotVisited nbrElem = sizeof(locationDirNotVisited_EN) / sizeof(char *); @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) { nbrElem = sizeof(specialInfoLine_SP) / sizeof(char *); writeTextArray(outFile, specialInfoLine_SP, nbrElem); -// Not yet handled : miscTexts, endingLine and exitLine. Are they useful? + // Not yet handled: miscTexts, endingLine and exitLine. Are they useful? fclose(outFile); return 0; @@ -160,4 +160,3 @@ void writeTextArray(FILE *outFile, const char *textArray[], int nbrText) { fwrite(padBuf, pad, 1, outFile); } } - diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h index 60b33013f4..b047959215 100644 --- a/devtools/create_toon/create_toon.h +++ b/devtools/create_toon/create_toon.h @@ -30,9 +30,9 @@ #define TOON_DAT_VER_MAJ 0 // 1 byte #define TOON_DAT_VER_MIN 3 // 1 byte -// Number of Variante of the game. For the moment, it's the same -// than the number of languages -#define NUM_VARIANTE 5 +// Number of variants of the game. For the moment, it's the same +// as the number of languages +#define NUM_VARIANTS 5 typedef unsigned char uint8; typedef unsigned char byte; diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index 2164512337..bc49c7adaf 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -318,4 +318,3 @@ const char *exitLine_RU = "Hope you enjoyed playing ToonStruck!!"; const char* exitLine_SP = "\255\255Esperamos que te diviertas jugando a ToonStruck!!"; #endif - diff --git a/devtools/credits.pl b/devtools/credits.pl index a124314670..8d4bc19df0 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -445,12 +445,27 @@ sub add_paragraph { begin_credits("Credits"); begin_section("ScummVM Team"); - begin_section("Project Leaders"); + begin_section("Project Leader"); begin_persons(); add_person("Eugene Sandulenko", "sev", ""); end_persons(); end_section(); + begin_section("PR Office"); + begin_persons(); + add_person("Arnaud Boutonné", "Strangerke", "Public Relations Officer, Project Administrator"); + add_person("Eugene Sandulenko", "sev", "Project Leader"); + end_persons(); + end_section(); + + begin_section("Core Team"); + begin_persons(); + add_person("Willem Jan Palenstijn", "wjp", ""); + add_person("Eugene Sandulenko", "sev", ""); + add_person("Johannes Schickel", "LordHoto", ""); + end_persons(); + end_section(); + begin_section("Retired Project Leaders"); begin_persons(); add_person("James Brown", "ender", ""); @@ -526,6 +541,7 @@ begin_credits("Credits"); begin_section("DreamWeb"); add_person("Vladimir Menshakov", "whoozle", ""); add_person("Torbjörn Andersson", "eriktorbjorn", ""); + add_person("Bertrand Augereau", "Tramb", ""); end_section(); begin_section("Gob"); @@ -683,6 +699,10 @@ begin_credits("Credits"); add_person("Angus Lees", "Gus", ""); end_section(); + begin_section("BADA"); + add_person("Chris Warren-Smith", "", ""); + end_section(); + begin_section("Dreamcast"); add_person("Marcus Comstedt", "", ""); end_section(); @@ -709,6 +729,7 @@ begin_credits("Credits"); begin_section("Nintendo DS"); add_person("Neil Millstone", "agent-q", ""); + add_person("Bertrand Augereau", "Tramb", "HQ software scaler"); end_section(); begin_section("OpenPandora"); diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index e4d0779848..d225195f71 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -96,5 +96,3 @@ int main(int argc, char** argv) { scir_free_resource_manager(resmgr); return 0; } - - diff --git a/devtools/sci/scitrace.asm b/devtools/sci/scitrace.asm index 2e541326f2..2c5d2cc4cc 100644 --- a/devtools/sci/scitrace.asm +++ b/devtools/sci/scitrace.asm @@ -130,4 +130,3 @@ NowInstallTSR: code_seg ends end scitrace - diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index e9e155925e..cae949b99b 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -433,8 +433,8 @@ arttime Blue's Art Time Activities d00ffc8c32d17e575fd985d435d2eb88 -1 en All - Demo - Kirben BluesBirthday Blue's Birthday Adventure - 99128b6a5bdd9831d9682fb8b5cbf8d4 -1 en All - Yellow - knifethrower - 1ff5997c78fbd0a841a75ef15a05d9d5 -1 en Windows - Red - Mathew + 99128b6a5bdd9831d9682fb8b5cbf8d4 -1 en All Yellow Yellow - knifethrower + 1ff5997c78fbd0a841a75ef15a05d9d5 -1 en All Red Red - Mathew 2d4acbdcfd8e374c9da8c2e7303a5cd0 -1 en All - Demo - Kirben cc0c4111449054f1692bb3c0c5e04629 -1 en All - Demo - George Kormend diff --git a/devtools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h index f39b993bd2..7bec5f07a8 100644 --- a/devtools/skycpt/KmpSearch.h +++ b/devtools/skycpt/KmpSearch.h @@ -32,5 +32,3 @@ private: }; #endif //__KmpSearch__ - - diff --git a/devtools/skycpt/skycpt-engine.patch b/devtools/skycpt/skycpt-engine.patch index 16388a3221..d7ead35c9b 100644 --- a/devtools/skycpt/skycpt-engine.patch +++ b/devtools/skycpt/skycpt-engine.patch @@ -64,4 +64,3 @@ Index: engines/sky/logic.cpp + _skyControl->doLoadSavePanel(); return true; } - diff --git a/devtools/tasmrecover/.gitignore b/devtools/tasmrecover/.gitignore index f2bff8e8d9..69ae325082 100644 --- a/devtools/tasmrecover/.gitignore +++ b/devtools/tasmrecover/.gitignore @@ -1,4 +1,3 @@ *.pyc dreamgen.* _stubs* - diff --git a/devtools/tasmrecover/dreamweb/backdrop.asm b/devtools/tasmrecover/dreamweb/backdrop.asm index 5dfe20bf5d..ec0e4959b3 100644 --- a/devtools/tasmrecover/dreamweb/backdrop.asm +++ b/devtools/tasmrecover/dreamweb/backdrop.asm @@ -850,27 +850,3 @@ over147: mov ch,0 ret endp - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm index c222a63178..8a52435b0c 100644 --- a/devtools/tasmrecover/dreamweb/dreamweb.asm +++ b/devtools/tasmrecover/dreamweb/dreamweb.asm @@ -6264,20 +6264,3 @@ STACKSPACE ends ;-----------------------------------------------------------End of all code---- end Dreamweb - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/keypad.asm b/devtools/tasmrecover/dreamweb/keypad.asm index 8d918e618b..6eee2fa11c 100644 --- a/devtools/tasmrecover/dreamweb/keypad.asm +++ b/devtools/tasmrecover/dreamweb/keypad.asm @@ -1759,4 +1759,3 @@ Findtext1 proc near ret endp - diff --git a/devtools/tasmrecover/dreamweb/look.asm b/devtools/tasmrecover/dreamweb/look.asm index 399e1f16fd..a5a8b8055e 100644 --- a/devtools/tasmrecover/dreamweb/look.asm +++ b/devtools/tasmrecover/dreamweb/look.asm @@ -158,9 +158,3 @@ dogetback: mov getback,1 ret endp - - - - - - diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm index 7f3979c2b3..5354e9f7d5 100644 --- a/devtools/tasmrecover/dreamweb/monitor.asm +++ b/devtools/tasmrecover/dreamweb/monitor.asm @@ -1490,8 +1490,3 @@ finishcurdel: ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm index 2bbf4fe498..b06a351f5f 100644 --- a/devtools/tasmrecover/dreamweb/newplace.asm +++ b/devtools/tasmrecover/dreamweb/newplace.asm @@ -577,8 +577,3 @@ Readcitypic proc near ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm index 830c9676f3..e6f8037579 100644 --- a/devtools/tasmrecover/dreamweb/object.asm +++ b/devtools/tasmrecover/dreamweb/object.asm @@ -2603,8 +2603,3 @@ beforethistext: mov [es:di],ax ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm index 369e799d53..6c98774a0f 100644 --- a/devtools/tasmrecover/dreamweb/saveload.asm +++ b/devtools/tasmrecover/dreamweb/saveload.asm @@ -1502,6 +1502,7 @@ Loadold proc near alreadyloadold: mov ax,mousebutton and ax,1 jz noloadold + mov ax,0ffffh call doload cmp getback,4 jz noloadold @@ -1513,7 +1514,3 @@ alreadyloadold: mov ax,mousebutton noloadold: ret endp - - - - diff --git a/devtools/tasmrecover/dreamweb/sblaster.asm b/devtools/tasmrecover/dreamweb/sblaster.asm index 46eb8e2366..7a271e9c90 100644 --- a/devtools/tasmrecover/dreamweb/sblaster.asm +++ b/devtools/tasmrecover/dreamweb/sblaster.asm @@ -1260,33 +1260,3 @@ nopitflip: cli iret endp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm index 45f807da3f..06b06c76e3 100644 --- a/devtools/tasmrecover/dreamweb/sprite.asm +++ b/devtools/tasmrecover/dreamweb/sprite.asm @@ -4226,7 +4226,7 @@ botofdoor2: sub ah,ch opendoor2: cmp throughdoor,1 jz mustbeopen cmp lockstatus,1 - jz shutdoor + jz shutdoor2 mustbeopen: mov cl,[es:bx+19] cmp cl,1 jnz notdoorsound4 @@ -5017,17 +5017,3 @@ dumpevery2: mov ax,[es:bx] finishevery2: ret endp - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/talk.asm b/devtools/tasmrecover/dreamweb/talk.asm index b6b96313f7..4d6b381881 100644 --- a/devtools/tasmrecover/dreamweb/talk.asm +++ b/devtools/tasmrecover/dreamweb/talk.asm @@ -563,21 +563,3 @@ doredes: call delpointer ret endp - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/titles.asm b/devtools/tasmrecover/dreamweb/titles.asm index 8f2b46e3f4..52f58867ed 100644 --- a/devtools/tasmrecover/dreamweb/titles.asm +++ b/devtools/tasmrecover/dreamweb/titles.asm @@ -570,16 +570,3 @@ realcreditsearly: ret endp - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/use.asm b/devtools/tasmrecover/dreamweb/use.asm index fbbd9c99db..78917d50f4 100644 --- a/devtools/tasmrecover/dreamweb/use.asm +++ b/devtools/tasmrecover/dreamweb/use.asm @@ -3815,14 +3815,3 @@ nowinch: call showfirstuse ret endp - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/vars.asm b/devtools/tasmrecover/dreamweb/vars.asm index 8646697e52..6d34074528 100644 --- a/devtools/tasmrecover/dreamweb/vars.asm +++ b/devtools/tasmrecover/dreamweb/vars.asm @@ -273,7 +273,7 @@ savesource dw 0 savex db 0 savey db 0 currentob db 0 -priority db 0 +priorityDep db 0 ; dep for deprecated, I leave a byte here to minimize changes to the generated code destpos db 0 @@ -560,4 +560,3 @@ roomssample db 0 gameerror db 0 howmuchalloc dw 0 - diff --git a/devtools/tasmrecover/dreamweb/vgafades.asm b/devtools/tasmrecover/dreamweb/vgafades.asm index 06cc9d6a44..a1043d9cf5 100644 --- a/devtools/tasmrecover/dreamweb/vgafades.asm +++ b/devtools/tasmrecover/dreamweb/vgafades.asm @@ -862,5 +862,3 @@ Initialmoncols proc near ret endp - - diff --git a/devtools/tasmrecover/dreamweb/vgagrafx.asm b/devtools/tasmrecover/dreamweb/vgagrafx.asm index 110fc95ee0..4ba1b16ba1 100644 --- a/devtools/tasmrecover/dreamweb/vgagrafx.asm +++ b/devtools/tasmrecover/dreamweb/vgagrafx.asm @@ -1758,5 +1758,3 @@ Title6graphics db "DREAMWEB.I06",0 Title7graphics db "DREAMWEB.I07",0 Palettescreen db "DREAMWEB.PAL",0 - - diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 5f7a528a5b..8e37b4e851 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -1,5 +1,26 @@ #!/usr/bin/python +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + from tasm.parser import parser from tasm.cpp import cpp @@ -8,6 +29,7 @@ p.strip_path = 3 context = p.parse('dreamweb/dreamweb.asm') p.link() generator = cpp(context, "DreamGen", blacklist = [ + # These functions are not processed 'randomnumber', 'quickquit', 'quickquit2', @@ -15,15 +37,122 @@ generator = cpp(context, "DreamGen", blacklist = [ 'multiget', 'multiput', 'multidump', - 'frameoutnm', - 'cls', + 'frameoutnm', + 'frameoutbh', + 'frameoutfx', + 'cls', + 'clearwork', 'printundermon', + 'kernchars', + 'getnextword', + 'getnumber', + 'dumptextline', + 'printboth', + 'printchar', + 'printdirect', + 'printslow', + 'usetimedtext', + 'dumptimedtext', + 'setuptimedtemp', + 'putundertimed', + 'getundertimed', 'worktoscreen', 'width160', 'convertkey', 'readabyte', 'readoneblock', + 'printsprites', + 'printasprite', + 'eraseoldobs', + 'clearsprites', + 'makesprite', + 'showframe', + 'initman', + 'aboutturn', + 'readheader', + 'fillspace', + 'getroomdata', + 'startloading', + 'showreelframe', + 'showgamereel', + 'getreelframeax', + 'findsource', + 'walking', + 'autosetwalk', + 'checkdest', + 'spriteupdate', + 'dodoor', + 'lockeddoorway', + 'liftsprite', 'frameoutv', - 'modifychar' + 'modifychar', + 'allocatework', + 'lockmon', + 'cancelch0', + 'cancelch1', + 'getroomspaths', + 'makebackob', + 'dealwithspecial', + 'plotreel', + 'facerightway', + 'zoom', + 'crosshair', + 'showrain', + 'domix', + 'channel0tran', + 'makenextblock', + 'loopchannel0', + 'parseblaster', + 'deltextline', + 'doblocks', + 'checkifperson', + 'checkiffree', + 'getreelstart', + 'findobname', + 'copyname', + 'commandwithob', + 'showpanel', + 'updatepeople', + 'madmantext', + 'madmode', + 'movemap', + 'doorway', + 'widedoor', + 'showallobs', + 'addalong', + 'addlength', + 'getdimension', + 'getxad', + 'getyad', + 'getmapad', + 'calcmapad', + 'calcfrframe', + 'finalframe', + 'commandonly', + 'makename', + 'findlen', + 'blocknametext', + 'walktotext', + 'personnametext', + 'findxyfrompath', + 'findormake', + 'setallchanges', + 'dochange', + 'deletetaken', + 'placesetobject', + 'removesetobject', + 'showallfree', + 'adjustlen', + 'finishedwalking', + 'checkone', + ], skip_output = [ + # These functions are processed but not output + 'dreamweb', + 'backobject', + 'mainman', + 'madman', + 'loadgame', + 'savegame', + 'doload' ]) generator.generate('dreamweb') #start routine diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index dfdfb239f4..d2b860ddf5 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import op, traceback, re, proc from copy import copy proc_module = proc @@ -12,11 +33,35 @@ def parse_bin(s): return v class cpp: - def __init__(self, context, namespace, skip_first = 0, blacklist = []): + def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = []): self.namespace = namespace fname = namespace.lower() + ".cpp" header = namespace.lower() + ".h" - banner = "/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */" + banner = """/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */ + +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +""" self.fd = open(fname, "wt") self.hd = open(header, "wt") hid = "TASMRECOVER_%s_STUBS_H__" %namespace.upper() @@ -34,8 +79,10 @@ class cpp: self.proc_done = [] self.blacklist = blacklist self.failed = list(blacklist) + self.skip_output = skip_output self.translated = [] self.proc_addr = [] + self.used_data_offsets = set() self.methods = [] self.fd.write("""%s @@ -53,11 +100,13 @@ namespace %s { if self.indirection == -1: try: offset,p,p = self.context.get_offset(name) - print "OFFSET = %d" %offset - self.indirection = 0 - return str(offset) except: pass + else: + print "OFFSET = %d" %offset + self.indirection = 0 + self.used_data_offsets.add((name,offset)) + return "offset_%s" % (name,) g = self.context.get_global(name) if isinstance(g, op.const): @@ -482,7 +531,8 @@ namespace %s { self.proc.optimize(keep_labels=[label]) self.proc.visit(self, start) self.body += "}\n"; - self.translated.insert(0, self.body) + if name not in self.skip_output: + self.translated.insert(0, self.body) self.proc = None if self.temps_count > 0: raise Exception("temps count == %d at the exit of proc" %self.temps_count); @@ -544,14 +594,23 @@ namespace %s { """\n#include "dreamweb/runtime.h" namespace %s { - +#include "structs.h" class %sContext : public Context { public: void __start(); void __dispatch_call(uint16 addr); +#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f() """ %(self.namespace, self.namespace)) + + for name,addr in self.proc_addr: + self.hd.write("\tstatic const uint16 addr_%s = 0x%04x;\n" %(name, addr)) + + + for name,addr in self.used_data_offsets: + self.hd.write("\tstatic const uint16 offset_%s = 0x%04x;\n" %(name, addr)) + offsets = [] for k, v in self.context.get_globals().items(): if isinstance(v, op.var): @@ -561,10 +620,13 @@ public: offsets = sorted(offsets, key=lambda t: t[1]) for o in offsets: - self.hd.write("\tconst static uint16 k%s = %s;\n" %o) + self.hd.write("\tstatic const uint16 k%s = %s;\n" %o) self.hd.write("\n") for p in set(self.methods): - self.hd.write("\tvoid %s();\n" %p) + if p in self.blacklist: + self.hd.write("\t//void %s();\n" %p) + else: + self.hd.write("\tvoid %s();\n" %p) self.hd.write("};\n}\n\n#endif\n") self.hd.close() @@ -574,7 +636,7 @@ public: self.fd.write("\nvoid %sContext::__dispatch_call(uint16 addr) {\n\tswitch(addr) {\n" %self.namespace) self.proc_addr.sort(cmp = lambda x, y: x[1] - y[1]) for name,addr in self.proc_addr: - self.fd.write("\t\tcase 0x%04x: %s(); break;\n" %(addr, name)) + self.fd.write("\t\tcase addr_%s: %s(); break;\n" %(name, name)) self.fd.write("\t\tdefault: ::error(\"invalid call to %04x dispatched\", (uint16)ax);") self.fd.write("\n\t}\n}\n\n} /*namespace*/\n") diff --git a/devtools/tasmrecover/tasm/lex.py b/devtools/tasmrecover/tasm/lex.py index cf7e6e19bf..9728c149ca 100644 --- a/devtools/tasmrecover/tasm/lex.py +++ b/devtools/tasmrecover/tasm/lex.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + def parse_args(text): #print "parsing: [%s]" %text escape = False diff --git a/devtools/tasmrecover/tasm/op.py b/devtools/tasmrecover/tasm/op.py index 10fdd8a568..30852bcb58 100644 --- a/devtools/tasmrecover/tasm/op.py +++ b/devtools/tasmrecover/tasm/op.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import re import lex @@ -407,4 +428,3 @@ class label(baseop): self.name = name def visit(self, visitor): visitor._label(self.name) - diff --git a/devtools/tasmrecover/tasm/parser.py b/devtools/tasmrecover/tasm/parser.py index 4cea496722..ebbd714cf4 100644 --- a/devtools/tasmrecover/tasm/parser.py +++ b/devtools/tasmrecover/tasm/parser.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import os, re from proc import proc import lex diff --git a/devtools/tasmrecover/tasm/proc.py b/devtools/tasmrecover/tasm/proc.py index ed7053df89..50a394413f 100644 --- a/devtools/tasmrecover/tasm/proc.py +++ b/devtools/tasmrecover/tasm/proc.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import re import op diff --git a/devtools/themeparser.py b/devtools/themeparser.py index a3524461a0..5c6f89897b 100644 --- a/devtools/themeparser.py +++ b/devtools/themeparser.py @@ -616,4 +616,3 @@ class STXBinaryFile(object): if __name__ == '__main__': bin = STXBinaryFile('../gui/themes/scummclassic', True, True) bin.parse() - |