From 2fc9d6845b51dd589995891681ac01d241e9a2c9 Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Mon, 12 Apr 2010 21:21:06 +0000 Subject: Apply patch #2982163 - CONFIG: Use HE keyword instead of HB for the Hebrew language svn-id: r48645 --- README | 2 +- common/util.cpp | 3 ++- common/util.h | 2 +- engines/agos/charset-fontdata.cpp | 2 +- engines/agos/charset.cpp | 14 +++++++------- engines/agos/detection_tables.h | 4 ++-- engines/agos/res_snd.cpp | 2 +- engines/agos/saveload.cpp | 16 ++++++++-------- engines/agos/script_s1.cpp | 4 ++-- engines/agos/script_s2.cpp | 2 +- engines/agos/verb.cpp | 6 +++--- engines/agos/vga_s2.cpp | 2 +- engines/gob/detection.cpp | 6 +++--- engines/gob/gob.cpp | 4 ++-- engines/queen/command.cpp | 2 +- engines/queen/display.cpp | 2 +- engines/queen/graphics.cpp | 2 +- engines/queen/input.cpp | 2 +- engines/queen/journal.cpp | 2 +- engines/queen/resource.cpp | 2 +- engines/queen/talk.cpp | 2 +- engines/scumm/detection_tables.h | 4 ++-- engines/scumm/scumm-md5.h | 22 +++++++++++----------- engines/tinsel/config.cpp | 2 +- engines/tinsel/detection.cpp | 2 +- tools/md5table.c | 2 +- tools/scumm-md5.txt | 20 ++++++++++---------- 27 files changed, 68 insertions(+), 67 deletions(-) diff --git a/README b/README index 2a7d8005b1..68aca6a7bc 100644 --- a/README +++ b/README @@ -1052,7 +1052,7 @@ Simon the Sorcerer 1 and 2 fr - French it - Italian es - Spanish - hb - Hebrew + he - Hebrew pl - Polish ru - Russian diff --git a/common/util.cpp b/common/util.cpp index 19e727d672..742eb0035d 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -116,7 +116,8 @@ const LanguageDescription g_languages[] = { {"fr", "French", FR_FRA}, {"de", "German", DE_DEU}, {"gr", "Greek", GR_GRE}, - {"hb", "Hebrew", HB_ISR}, + {"he", "Hebrew", HE_ISR}, + {"hb", "Hebrew", HE_ISR}, // Deprecated {"hu", "Hungarian", HU_HUN}, {"it", "Italian", IT_ITA}, {"jp", "Japanese", JA_JPN}, diff --git a/common/util.h b/common/util.h index 865f5e6217..0b7a44f5b3 100644 --- a/common/util.h +++ b/common/util.h @@ -102,7 +102,7 @@ enum Language { FR_FRA, DE_DEU, GR_GRE, - HB_ISR, + HE_ISR, HU_HUN, IT_ITA, JA_JPN, diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp index dbd61a3b46..a477b3dedc 100644 --- a/engines/agos/charset-fontdata.cpp +++ b/engines/agos/charset-fontdata.cpp @@ -2370,7 +2370,7 @@ void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) { case Common::PL_POL: src = polish_simonFont + (chr - 32) * 8; break; - case Common::HB_ISR: + case Common::HE_ISR: src = hebrew_simonFont + (chr - 32) * 8; break; case Common::ES_ESP: diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp index 7d93f26f7b..5e9279c491 100644 --- a/engines/agos/charset.cpp +++ b/engines/agos/charset.cpp @@ -319,7 +319,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei if (count != 0) memset(dst, 0, count); - if (_language == Common::HB_ISR) + if (_language == Common::HE_ISR) dst += width - 1; // For Hebrew, start at the right edge, not the left. dst_org = dst; @@ -328,7 +328,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei dst_org += width * textHeight; dst = dst_org; } else if ((chr -= ' ') == 0) { - dst += (_language == Common::HB_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right + dst += (_language == Common::HE_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right } else { byte *img_hdr, *img; uint i, img_width, img_height; @@ -345,7 +345,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei img = src + READ_LE_UINT16(img_hdr); } - if (_language == Common::HB_ISR) + if (_language == Common::HE_ISR) dst -= img_width - 1; // For Hebrew, move from right edge to left edge of image. byte *cur_dst = dst; @@ -371,7 +371,7 @@ void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint hei cur_dst += width; } while (--img_height); - if (_language != Common::HB_ISR) // Hebrew character movement is done higher up + if (_language != Common::HE_ISR) // Hebrew character movement is done higher up dst += img_width - 1; } } @@ -499,8 +499,8 @@ void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) { clearWindow(window); } else if (c == 13 || c == 10) { windowNewLine(window); - } else if ((c == 1 && _language != Common::HB_ISR) || (c == 8)) { - if (_language == Common::HB_ISR) { + } else if ((c == 1 && _language != Common::HE_ISR) || (c == 8)) { + if (_language == Common::HE_ISR) { if (b >= 64 && b < 91) width = _hebrewCharWidths [b - 64]; @@ -546,7 +546,7 @@ void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) { window->textRow--; } - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { if (c >= 64 && c < 91) width = _hebrewCharWidths [c - 64]; window->textColumnOffset -= width; diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index dc506346eb..e3709f8409 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -1672,7 +1672,7 @@ static const AGOSGameDescription gameDescriptions[] = { { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", 711}, { NULL, 0, NULL, 0} }, - Common::HB_ISR, + Common::HE_ISR, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE @@ -2148,7 +2148,7 @@ static const AGOSGameDescription gameDescriptions[] = { { "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9", 513}, { NULL, 0, NULL, 0} }, - Common::HB_ISR, + Common::HE_ISR, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 06dfab1ecd..6e54d926c4 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -78,7 +78,7 @@ void AGOSEngine_Simon2::playSpeech(uint16 speech_id, uint16 vgaSpriteId) { } _skipVgaWait = true; } else { - if (getGameType() == GType_SIMON2 && _subtitles && _language != Common::HB_ISR) { + if (getGameType() == GType_SIMON2 && _subtitles && _language != Common::HE_ISR) { loadVoice(speech_id); return; } diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index 191e2fd4a0..e9fbaf3525 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -608,13 +608,13 @@ void AGOSEngine_Simon1::listSaveGames(char *dst) { lastSlot = slot; if (slot < 10) { showMessageFormat(" "); - } else if (_language == Common::HB_ISR) { + } else if (_language == Common::HE_ISR) { lastSlot = (slot % 10) * 10; lastSlot += slot / 10; } showMessageFormat("%d", lastSlot); - if (_language == Common::HB_ISR && !(slot % 10)) + if (_language == Common::HE_ISR && !(slot % 10)) showMessageFormat("0"); showMessageFormat(".%s\n", dst); dst += 18; @@ -672,7 +672,7 @@ void AGOSEngine_Simon1::userGame(bool load) { char *name; bool b; char buf[108]; - int maxChar = (_language == Common::HB_ISR) ? 155: 128; + int maxChar = (_language == Common::HE_ISR) ? 155: 128; _saveOrLoad = load; @@ -711,7 +711,7 @@ restart:; window->textRow = result; // init x offset with a 2 character savegame number + a period (18 pix) - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { window->textColumn = 3; window->textColumnOffset = 6; } else { @@ -725,7 +725,7 @@ restart:; // now process entire savegame name to get correct x offset for cursor _saveGameNameLen = 0; while (name[_saveGameNameLen]) { - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { byte width = 6; if (name[_saveGameNameLen] >= 64 && name[_saveGameNameLen] < 91) width = _hebrewCharWidths [name[_saveGameNameLen] - 64]; @@ -770,7 +770,7 @@ restart:; goto restart; } - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { if (i >= 128) i -= 64; else if (i >= 32) @@ -788,7 +788,7 @@ restart:; _saveGameNameLen--; m = name[_saveGameNameLen]; - if (_language == Common::HB_ISR) + if (_language == Common::HE_ISR) x = 8; else x = (name[_saveGameNameLen] == 'i' || name[_saveGameNameLen] == 'l') ? 1 : 8; @@ -889,7 +889,7 @@ void AGOSEngine::userGameBackSpace(WindowBlock *window, int x, byte b) { oldTextColor = window->textColor; window->textColor = window->fillColor; - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { x = 128; } else { x += 120; diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 0db612a8c6..64d1cbba3f 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -319,7 +319,7 @@ void AGOSEngine_Simon1::os1_pauseGame() { case Common::PL_POL: keyYes = Common::KEYCODE_t; break; - case Common::HB_ISR: + case Common::HE_ISR: keyYes = Common::KEYCODE_f; break; case Common::ES_ESP: @@ -426,7 +426,7 @@ void AGOSEngine_Simon1::os1_screenTextPObj() { int j, k; if (subObject->objectFlags & kOFNumber) { - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { j = subObject->objectFlagValue[getOffsetOfChild2Param(subObject, kOFNumber)]; k = (j % 10) * 10; k += j / 10; diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 7d6b5e7a36..dd525163c7 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -417,7 +417,7 @@ void AGOSEngine_Simon2::os2_screenTextPObj() { int j, k; if (subObject->objectFlags & kOFNumber) { - if (_language == Common::HB_ISR) { + if (_language == Common::HE_ISR) { j = subObject->objectFlagValue[getOffsetOfChild2Param(subObject, kOFNumber)]; k = (j % 10) * 10; k += j / 10; diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index bdf23d5815..a85c1627bf 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -258,7 +258,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) { case Common::RU_RUS: verb_prep_names = russian_verb_prep_names; break; - case Common::HB_ISR: + case Common::HE_ISR: verb_prep_names = hebrew_verb_prep_names; break; case Common::ES_ESP: @@ -287,7 +287,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) { case Common::RU_RUS: verb_names = russian_verb_names; break; - case Common::HB_ISR: + case Common::HE_ISR: verb_names = hebrew_verb_names; break; case Common::ES_ESP: @@ -332,7 +332,7 @@ void AGOSEngine::showActionString(const byte *string) { window->textColumn = x / 8; window->textColumnOffset = x & 7; - if (_language == Common::HB_ISR && window->textColumnOffset != 0) { + if (_language == Common::HE_ISR && window->textColumnOffset != 0) { window->textColumnOffset = 8 - window->textColumnOffset; window->textColumn++; } diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index e133427d76..4eb739e974 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -89,7 +89,7 @@ void AGOSEngine::vc59_stopAnimations() { } void AGOSEngine::vc64_ifSpeech() { - if ((getGameType() == GType_SIMON2 && _subtitles && _language != Common::HB_ISR) || + if ((getGameType() == GType_SIMON2 && _subtitles && _language != Common::HE_ISR) || !_sound->isVoiceActive()) { vcSkipNextInstruction(); } diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 656f6336da..1f8bfdc138 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -1881,7 +1881,7 @@ static const GOBGameDescription gameDescriptions[] = { "lit", "", AD_ENTRY1s("intro.stk", "e0767783ff662ed93665446665693aef", 4371238), - HB_ISR, + HE_ISR, kPlatformPC, ADGF_NO_FLAGS, GUIO_NOSUBTITLES | GUIO_NOSPEECH @@ -2317,7 +2317,7 @@ static const GOBGameDescription gameDescriptions[] = { "fascination", "VGA 3 disks edition", AD_ENTRY1s("intro.stk", "d6e45ce548598727e2b5587a99718eba", 1055909), - HB_ISR, + HE_ISR, kPlatformPC, ADGF_NO_FLAGS, GUIO_NOSUBTITLES | GUIO_NOSPEECH @@ -2485,7 +2485,7 @@ static const GOBGameDescription gameDescriptions[] = { "gob3", "", AD_ENTRY1s("intro.stk", "904fc32032295baa3efb3a41f17db611", 178582), - HB_ISR, + HE_ISR, kPlatformPC, ADGF_NO_FLAGS, GUIO_NOSUBTITLES | GUIO_NOSPEECH diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 6ad1214dd6..024728a1d1 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -66,7 +66,7 @@ const Common::Language GobEngine::_gobToScummVMLang[] = { Common::EN_USA, Common::NL_NLD, Common::KO_KOR, - Common::HB_ISR, + Common::HE_ISR, Common::PT_BRA, Common::JA_JPN }; @@ -290,7 +290,7 @@ Common::Error GobEngine::run() { case Common::KO_KOR: _global->_language = kLanguageKorean; break; - case Common::HB_ISR: + case Common::HE_ISR: _global->_language = kLanguageHebrew; break; case Common::PT_BRA: diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp index 81f0f3ff89..5a12aeffa1 100644 --- a/engines/queen/command.cpp +++ b/engines/queen/command.cpp @@ -140,7 +140,7 @@ public: CmdText *CmdText::makeCmdTextInstance(uint8 y, QueenEngine *vm) { switch (vm->resource()->getLanguage()) { - case Common::HB_ISR: + case Common::HE_ISR: return new CmdTextHebrew(y, vm); case Common::GR_GRE: return new CmdTextGreek(y, vm); diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index ae223ff6cf..12d3893b8a 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -967,7 +967,7 @@ void Display::showMouseCursor(bool show) { void Display::initFont() { switch (_vm->resource()->getLanguage()) { - case Common::HB_ISR: + case Common::HE_ISR: _font = _fontHebrew; break; case Common::RU_RUS: diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp index 6d0a11ccfe..c4f25d815d 100644 --- a/engines/queen/graphics.cpp +++ b/engines/queen/graphics.cpp @@ -514,7 +514,7 @@ void Graphics::setBobText(const BobSlot *pbs, const char *text, int textX, int t // Hebrew strings are written from right to left and should be cut // to lines in reverse - if (_vm->resource()->getLanguage() == Common::HB_ISR) { + if (_vm->resource()->getLanguage() == Common::HE_ISR) { for (i = length - 1; i >= 0; i--) { lineLength++; diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 473253786c..9518388b26 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -74,7 +74,7 @@ Input::Input(Common::Language language, OSystem *system, QueenEngine *vm) : case Common::IT_ITA: _currentCommandKeys = _commandKeys[3]; break; - case Common::HB_ISR: + case Common::HE_ISR: _currentCommandKeys = _commandKeys[4]; break; case Common::ES_ESP: diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 60bf5ac8cd..aff24be22e 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -425,7 +425,7 @@ void Journal::drawPanelText(int y, const char *text) { _panelTextY[_panelTextCount++] = y; } else { *p++ = '\0'; - if (_vm->resource()->getLanguage() == Common::HB_ISR) { + if (_vm->resource()->getLanguage() == Common::HE_ISR) { drawPanelText(y - 5, p); drawPanelText(y + 5, s); } else { diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index fda12eb7c5..a43141ef56 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -194,7 +194,7 @@ bool Resource::detectVersion(DetectedGameVersion *ver, Common::File *f) { ver->language = Common::DE_DEU; break; case 'H': - ver->language = Common::HB_ISR; + ver->language = Common::HE_ISR; break; case 'I': ver->language = Common::IT_ITA; diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 9955ebb856..27b1e9c60a 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -1089,7 +1089,7 @@ int Talk::splitOption(const char *str, char optionText[5][MAX_STRING_SIZE]) { if (_vm->resource()->getLanguage() == Common::EN_ANY || _vm->display()->textWidth(option) <= MAX_TEXT_WIDTH) { strcpy(optionText[0], option); lines = 1; - } else if (_vm->resource()->getLanguage() == Common::HB_ISR) { + } else if (_vm->resource()->getLanguage() == Common::HE_ISR) { lines = splitOptionHebrew(option, optionText); } else { lines = splitOptionDefault(option, optionText); diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 9597c69745..c203379125 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -655,7 +655,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "freddi3", "F3-Mdemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "freddi3", "f3-mdemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "freddi3", "FF3-DEMO", kGenHEPC, UNK_LANG, UNK, 0 }, - { "freddi3", "FF3DEMO", kGenHEPC, Common::HB_ISR, UNK, 0 }, + { "freddi3", "FF3DEMO", kGenHEPC, Common::HE_ISR, UNK, 0 }, { "freddi3", "Freddi 3", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 }, { "freddi3", "Freddi Fish 3", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "freddi3", "FreddiFGT", kGenHEPC, Common::DE_DEU, UNK, 0 }, @@ -736,7 +736,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "pajama2", "pj2demo", kGenHEPC, UNK_LANG, UNK, 0 }, { "pajama2", "Pjs2demo", kGenHEPC, UNK_LANG, UNK, 0 }, { "pajama2", "PJ2 Demo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 }, - { "pajama2", "PS2DEMO", kGenHEPC, Common::HB_ISR, UNK, 0 }, + { "pajama2", "PS2DEMO", kGenHEPC, Common::HE_ISR, UNK, 0 }, { "pajama3", "pajama3", kGenHEPC, UNK_LANG, UNK, 0 }, { "pajama3", "FPJ3Demo", kGenHEPC, Common::FR_FRA, UNK, 0 }, diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h index 5cd3653351..077a74ff88 100644 --- a/engines/scumm/scumm-md5.h +++ b/engines/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Sun Apr 04 09:25:29 2010 + This file was generated by the md5table tool on Mon Apr 5 16:05:33 2010 DO NOT EDIT MANUALLY! */ @@ -84,7 +84,7 @@ static const MD5Table md5table[] = { { "182344899c2e2998fca0bebcd82aa81a", "atlantis", "", "CD", 12035, Common::EN_ANY, Common::kPlatformPC }, { "183d7464902d40d00800e8ee1f04117c", "maniac", "V2", "V2", 1988, Common::DE_DEU, Common::kPlatformPC }, { "1875b90fade138c9253a8e967007031a", "indy3", "VGA", "VGA", 6295, Common::EN_ANY, Common::kPlatformPC }, - { "187d315f6b5168f68680dfe8c3d76a3e", "loom", "EGA", "EGA", -1, Common::HB_ISR, Common::kPlatformPC }, + { "187d315f6b5168f68680dfe8c3d76a3e", "loom", "EGA", "EGA", -1, Common::HE_ISR, Common::kPlatformPC }, { "1900e501a52fbf55bde6e4196f6d2aa6", "zak", "V2", "V2", -1, Common::IT_ITA, Common::kPlatformPC }, { "19263586f749a560c1adf8b3393a9593", "socks", "HE 85", "", -1, Common::RU_RUS, Common::kPlatformWindows }, { "19bf6938a94698296bcb0c99c31c91a7", "spyfox2", "", "Demo", -1, Common::EN_GRB, Common::kPlatformWindows }, @@ -97,7 +97,7 @@ static const MD5Table md5table[] = { { "1dd3c11ea4439adfe681e4e405b624e1", "monkey", "EGA", "EGA", -1, Common::FR_FRA, Common::kPlatformPC }, { "1dd7aa088e09f96d06818aa9a9deabe0", "indy3", "No AdLib", "EGA", 5361, Common::EN_ANY, Common::kPlatformMacintosh }, { "1ed22f601f8b3695804a6583cc3083f1", "puttrace", "HE 98.5", "", -1, Common::NL_NLD, Common::kPlatformUnknown }, - { "1f2e62b5a9c50589fc342285a6bb3a27", "freddi", "HE 73", "", -1, Common::HB_ISR, Common::kPlatformWindows }, + { "1f2e62b5a9c50589fc342285a6bb3a27", "freddi", "HE 73", "", -1, Common::HE_ISR, Common::kPlatformWindows }, { "1fbebd7b2b692df5297870447a80cfed", "atlantis", "Floppy", "Floppy", 12030, Common::DE_DEU, Common::kPlatformPC }, { "1ff5997c78fbd0a841a75ef15a05d9d5", "BluesBirthday", "", "Red", -1, Common::EN_ANY, Common::kPlatformWindows }, { "2012f854d83d9cc6f73b2b544cd8bbf8", "water", "HE 80", "", -1, Common::RU_RUS, Common::kPlatformWindows }, @@ -124,7 +124,7 @@ static const MD5Table md5table[] = { { "2a208ffbcd0e83e86f4356e6f64aa6e1", "loom", "EGA", "EGA", -1, Common::ES_ESP, Common::kPlatformPC }, { "2a41b53cf1a90b6e6f26c10cc6041084", "tentacle", "", "Demo", 2439158, Common::EN_ANY, Common::kPlatformMacintosh }, { "2a446817ffcabfef8716e0c456ecaf81", "puttzoo", "", "Demo", -1, Common::DE_DEU, Common::kPlatformWindows }, - { "2a8658dbd13d84d1bce64a71a35995eb", "pajama2", "HE 99", "Demo", -1, Common::HB_ISR, Common::kPlatformWindows }, + { "2a8658dbd13d84d1bce64a71a35995eb", "pajama2", "HE 99", "Demo", -1, Common::HE_ISR, Common::kPlatformWindows }, { "2c04aacffb8428f30ccf4f734fbe3adc", "activity", "", "", -1, Common::EN_ANY, Common::kPlatformPC }, { "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", "CD", "", 9455, Common::EN_ANY, Common::kPlatformMacintosh }, { "2d1e891fe52df707c30185e52c50cd92", "monkey", "CD", "CD", 8955, Common::EN_ANY, Common::kPlatformPC }, @@ -168,7 +168,7 @@ static const MD5Table md5table[] = { { "3a3e592b074f595489f7f11e150c398d", "puttzoo", "HE 99", "Updated", -1, Common::EN_USA, Common::kPlatformWindows }, { "3a5d13675e9a23aedac0bac7730f0ac1", "samnmax", "", "CD", -1, Common::FR_FRA, Common::kPlatformMacintosh }, { "3a5ec90d556d4920976c5578bfbfaf79", "maniac", "NES", "extracted", -1, Common::DE_DEU, Common::kPlatformNES }, - { "3af61c5edf8e15b43dbafd285b2e9777", "puttcircus", "", "Demo", -1, Common::HB_ISR, Common::kPlatformWindows }, + { "3af61c5edf8e15b43dbafd285b2e9777", "puttcircus", "", "Demo", -1, Common::HE_ISR, Common::kPlatformWindows }, { "3b301b7892f883ce42ab4be6a274fea6", "samnmax", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformPC }, { "3b832f4a90740bf22e9b8ed42ca0128c", "freddi4", "HE 99", "", -1, Common::EN_GRB, Common::kPlatformWindows }, { "3cce1913a3bc586b51a75c3892ff18dd", "indy3", "VGA", "VGA", -1, Common::RU_RUS, Common::kPlatformPC }, @@ -277,7 +277,7 @@ static const MD5Table md5table[] = { { "688328c5bdc4c8ec4145688dfa077bf2", "freddi4", "HE 99", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown }, { "6886e5d08cee329b1f2e743ae2e3ceed", "monkey2", "", "", 11135, Common::DE_DEU, Common::kPlatformPC }, { "695fe0b3963333b7e15b37514db3c745", "thinkerk", "", "Demo", 29789, Common::EN_USA, Common::kPlatformUnknown }, - { "697c9b7c55a05d8199c48b48e379d2c8", "puttmoon", "", "", -1, Common::HB_ISR, Common::kPlatformPC }, + { "697c9b7c55a05d8199c48b48e379d2c8", "puttmoon", "", "", -1, Common::HE_ISR, Common::kPlatformPC }, { "69d70269fafc4445adbb0d223e4f9a3f", "indy3", "EGA", "EGA", 5361, Common::EN_ANY, Common::kPlatformPC }, { "69ea626f1f87eecb78ea0d6c6b983a1d", "monkey2", "", "", -1, Common::IT_ITA, Common::kPlatformPC }, { "69ffe29185b8d71f09f6199f8b2a87cb", "lost", "HE 100", "", -1, Common::RU_RUS, Common::kPlatformWindows }, @@ -379,7 +379,7 @@ static const MD5Table md5table[] = { { "8f3758ff98c9c5d78e5d635222cad026", "atlantis", "Floppy", "Floppy", -1, Common::IT_ITA, Common::kPlatformPC }, { "8fec68383202d38c0d25e9e3b757c5df", "comi", "Demo", "Demo", 18041, Common::UNK_LANG, Common::kPlatformWindows }, { "8ffd618a776a4c0d8922bb28b09f8ce8", "airport", "", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows }, - { "90a329d8ad5b7ce0690429e98cfbb32f", "funpack", "", "", -1, Common::HB_ISR, Common::kPlatformPC }, + { "90a329d8ad5b7ce0690429e98cfbb32f", "funpack", "", "", -1, Common::HE_ISR, Common::kPlatformPC }, { "90c755e1c9b9b8a4129d37b2259d0655", "chase", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown }, { "90e2f0af4f779629695c6394a65bb702", "spyfox2", "", "", -1, Common::FR_FRA, Common::kPlatformUnknown }, { "910e31cffb28226bd68c569668a0d6b4", "monkey", "EGA", "EGA", -1, Common::ES_ESP, Common::kPlatformPC }, @@ -540,7 +540,7 @@ static const MD5Table md5table[] = { { "d62d248c3df6ec177405e2cb23d923b2", "indy3", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformPC }, { "d6334a5a9b61afe18c368540fdf522ca", "airport", "", "", -1, Common::EN_ANY, Common::kPlatformMacintosh }, { "d6dd0646404768a63e963891a96daadd", "atlantis", "Floppy", "Floppy", 12035, Common::EN_ANY, Common::kPlatformMacintosh }, - { "d73c851b942af44deb9b6d5f416a0972", "freddi3", "HE 99", "Demo", -1, Common::HB_ISR, Common::kPlatformWindows }, + { "d73c851b942af44deb9b6d5f416a0972", "freddi3", "HE 99", "Demo", -1, Common::HE_ISR, Common::kPlatformWindows }, { "d74122362a77ec24525fdd50297dfd82", "freddi4", "", "", -1, Common::FR_FRA, Common::kPlatformMacintosh }, { "d7ab7cd6105546016e6a0d46fb36b964", "pajama", "HE 100", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown }, { "d7b247c26bf1f01f8f7daf142be84de3", "balloon", "HE 99", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows }, @@ -567,7 +567,7 @@ static const MD5Table md5table[] = { { "e144f5f49d9241d2a9dee2576b3d09cb", "airport", "", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows }, { "e17db1ddf91b39ca6bbc8ad3ed19e883", "monkey", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns }, { "e246e02db9630533a40d99c9f54a8e01", "monkey2", "", "", -1, Common::EN_ANY, Common::kPlatformMacintosh }, - { "e361a7058ed8e8ebb462663c0a3ae8d6", "puttputt", "HE 62", "", -1, Common::HB_ISR, Common::kPlatformPC }, + { "e361a7058ed8e8ebb462663c0a3ae8d6", "puttputt", "HE 62", "", -1, Common::HE_ISR, Common::kPlatformPC }, { "e41de1c2a15abbcdbf9977e2d7e8a340", "freddi2", "HE 100", "Updated", -1, Common::RU_RUS, Common::kPlatformWindows }, { "e44ea295a3f8fe4f41983080dab1e9ce", "freddi", "HE 90", "Updated", -1, Common::FR_FRA, Common::kPlatformMacintosh }, { "e534d29afb3c6e0ee9dc3d53c5956714", "atlantis", "Floppy", "Floppy", -1, Common::DE_DEU, Common::kPlatformAmiga }, @@ -595,10 +595,10 @@ static const MD5Table md5table[] = { { "ee785fe2569bc9965526e774f7ab86f1", "spyfox", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformMacintosh }, { "ef347474f3c7be3b29584eaa133cca05", "samnmax", "Floppy", "Floppy", -1, Common::FR_FRA, Common::kPlatformPC }, { "ef71a322b6530ac45b1a070f7c0795f7", "moonbase", "Demo", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows }, - { "ef74d9071d4e564b037cb44bd6774de7", "fbear", "HE 62", "", -1, Common::HB_ISR, Common::kPlatformPC }, + { "ef74d9071d4e564b037cb44bd6774de7", "fbear", "HE 62", "", -1, Common::HE_ISR, Common::kPlatformPC }, { "efe0a04a703e765ebebe92b6c8aa6b86", "baseball2003", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown }, { "f049e38c1f8302b5db6170f1872af89a", "monkey", "CD", "CD", 8955, Common::ES_ESP, Common::kPlatformPC }, - { "f06e66fd45b2f8b0f4a2833ff4476050", "fbpack", "", "", -1, Common::HB_ISR, Common::kPlatformPC }, + { "f06e66fd45b2f8b0f4a2833ff4476050", "fbpack", "", "", -1, Common::HE_ISR, Common::kPlatformPC }, { "f08145577e4f13584cc90b3d6e9caa55", "pajama3", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown }, { "f163cf53f7850e43fb482471e5c52e1a", "maniac", "NES", "", 262144, Common::ES_ESP, Common::kPlatformNES }, { "f1b0e0d587b85052de5534a3847e68fe", "water", "HE 99", "Updated", -1, Common::EN_ANY, Common::kPlatformUnknown }, diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp index 9249da6edd..43e54dc4ea 100644 --- a/engines/tinsel/config.cpp +++ b/engines/tinsel/config.cpp @@ -141,7 +141,7 @@ void Config::readFromDisk() { if (lang == Common::JA_JPN) { // TODO: Add support for JAPAN version - } else if (lang == Common::HB_ISR) { + } else if (lang == Common::HE_ISR) { // TODO: Add support for HEBREW version // The Hebrew version appears to the software as being English diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 4e832e9567..49fc817b34 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -336,7 +336,7 @@ static const TinselGameDescription gameDescriptions[] = { {"english.smp", 0, NULL, -1}, {NULL, 0, NULL, 0} }, - Common::HB_ISR, + Common::HE_ISR, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE diff --git a/tools/md5table.c b/tools/md5table.c index dbaa7bb4d1..b69f3957cd 100644 --- a/tools/md5table.c +++ b/tools/md5table.c @@ -110,7 +110,7 @@ static const StringMap langMap[] = { { "ko", "KO_KOR" }, { "se", "SE_SWE" }, { "en", "EN_GRB" }, - { "hb", "HB_ISR" }, + { "he", "HE_ISR" }, { "ru", "RU_RUS" }, { "cz", "CZ_CZE" }, { "nl", "NL_NLD" }, diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt index a628d76099..5c28cd8785 100644 --- a/tools/scumm-md5.txt +++ b/tools/scumm-md5.txt @@ -169,7 +169,7 @@ loom Loom 6f8a22bfa397be1f7ed4b74aba0e397e -1 fr DOS EGA EGA v1.2 26 Jun 90 Jorpho 470c45b636139bb40716daa1c7edaad0 -1 de DOS EGA EGA v1.2 Deutsch from 7 Jun 90 Peter Eckerlein fa127d7c4bb47d05bb1c33ddcaa9f767 5748 de DOS EGA EGA v1.2 Deutsch from 7 Jun 90 Fingolfin - 187d315f6b5168f68680dfe8c3d76a3e -1 hb DOS EGA EGA - + 187d315f6b5168f68680dfe8c3d76a3e -1 he DOS EGA EGA - c3df37df9d3b481b45f75283a9907c47 -1 it DOS EGA EGA - Andrea Petrucci 0be88565f734b1e9e77ccaaf3bb14b29 -1 es DOS EGA EGA v1.2 Espanol from 31 Aug 90 George Kormend 2a208ffbcd0e83e86f4356e6f64aa6e1 -1 es DOS EGA EGA v1.2 Espanol from 31 Aug 90 abnog, Andrea Petrucci, Peter Eckerlein @@ -459,7 +459,7 @@ fbear Fatty Bear's Birthday Surprise 6bca7a1a96d16e52b8f3c42b50dbdca3 -1 jp 3DO HE 62 - - George Kormendi 3824e60cdf639d22f6df92a03dc4b131 7732 en DOS HE 62 - - khalek 4f1d6f8b38343dba405472538b5037ed 7717 en DOS HE 62 - - George Kormendi - ef74d9071d4e564b037cb44bd6774de7 -1 hb DOS HE 62 - - sev + ef74d9071d4e564b037cb44bd6774de7 -1 he DOS HE 62 - - sev 3df6ead57930488bc61e6e41901d0e97 -1 en Mac HE 62 - - khalek 179879b6e35c1ead0d93aab26db0951b 13381 en Windows HE 70 - - khalek @@ -470,7 +470,7 @@ fbear Fatty Bear's Birthday Surprise fbpack Fatty Bear's Fun Pack e01acc8c12ef44e8f778fe87e5f90f4e -1 en 3DO - - - sev c9717ee6059f1e43b768b464493d2fba -1 jp 3DO - - - clone2727 - f06e66fd45b2f8b0f4a2833ff4476050 -1 hb DOS - - - sev + f06e66fd45b2f8b0f4a2833ff4476050 -1 he DOS - - - sev freddi Freddi Fish 1: The Case of the Missing Kelp Seeds d4cccb5af88f3e77f370896e9ba8c5f9 -1 All Windows HE 71 - - sev @@ -481,7 +481,7 @@ freddi Freddi Fish 1: The Case of the Missing Kelp Seeds c782fbbe74a987c3df8ac73cd3e289ed -1 se Mac HE 73 - - Torbjörn Andersson 5ebb57234b2fe5c5dff641e00184ad81 -1 fr Windows HE 73 - - gist974 cf8ef3a1fb483c5c4b1c584d1167b2c4 -1 de Windows HE 73 - - Oncer - 1f2e62b5a9c50589fc342285a6bb3a27 -1 hb Windows HE 73 - - e_orz + 1f2e62b5a9c50589fc342285a6bb3a27 -1 he Windows HE 73 - - e_orz 507bb360688dc4180fdf0d7597352a69 26402 se Windows HE 73 - - Sven Arvidsson df047cc4792150f601290357566d36a6 -1 us All HE 90 Updated - khalek e44ea295a3f8fe4f41983080dab1e9ce -1 fr Mac HE 90 Updated - ThierryFR @@ -528,7 +528,7 @@ freddi3 Freddi Fish 3: The Case of the Stolen Conch Shell bbadf7309c4a2c2763e4bbba3c3be634 -1 fr All - Demo - Kirben 754feb59d3bf86b8a00840df74fd7b26 -1 nl Windows - Demo - adutchguy ed2b074bc3166087a747acb2a3c6abb0 -1 de All HE 98.5 Demo - Joachim Eberhard - d73c851b942af44deb9b6d5f416a0972 -1 hb Windows HE 99 Demo - Ori Avtalion + d73c851b942af44deb9b6d5f416a0972 -1 he Windows HE 99 Demo - Ori Avtalion freddi4 Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch 4f580a021eee026f3b4589e17d130d78 -1 All All - - - Kirben, sev @@ -644,7 +644,7 @@ pajama2 Pajama Sam 2: Thunder and Lightning Aren't so Frightening 36a6750e03fb505fc19fc2bf3e4dbe91 58749 en All - Demo - sev 30ba1e825d4ad2b448143ae8df18482a -1 nl All HE 98.5 Demo - Kirben 4521138d15d1fd7649c31fb981746231 -1 de All HE 98.5 Demo - Joachim Eberhard - 2a8658dbd13d84d1bce64a71a35995eb -1 hb Windows HE 99 Demo - Ori Avtalion + 2a8658dbd13d84d1bce64a71a35995eb -1 he Windows HE 99 Demo - Ori Avtalion pajama3 Pajama Sam 3: You Are What You Eat From Your Head to Your Feet f7711f9264d4d43c2a1518ec7c10a607 79382 us All - - - Kirben @@ -708,7 +708,7 @@ puttmoon Putt-Putt Goes to the Moon a9543ef0d79bcb47cd76ec197ad0a967 -1 en 3DO - - - sev 780e4a0ae2ff17dc296f4a79543b44f8 -1 All DOS - - - khalek b9bb68c5d2c9b6e2d9c513a29a754a57 7828 en DOS - - - George Kormendi - 697c9b7c55a05d8199c48b48e379d2c8 -1 hb DOS - - - sev + 697c9b7c55a05d8199c48b48e379d2c8 -1 he DOS - - - sev 9dc02577bf50d4cfaf3de3fbac06fbe2 -1 en Mac - - - khalek 9c92eeaf517a31b7221ec2546ab669fd -1 en Windows HE 70 - - khalek @@ -726,7 +726,7 @@ puttcircus Putt-Putt Joins the Circus a7cacad9c40c4dc9e1812abf6c8af9d5 -1 en All - Demo - Kirben, sev 1387d16aa620dc1c2d1fd87f8a9e7a09 -1 fr Windows - Demo - Mevi - 3af61c5edf8e15b43dbafd285b2e9777 -1 hb Windows - Demo - Ori Avtalion + 3af61c5edf8e15b43dbafd285b2e9777 -1 he Windows - Demo - Ori Avtalion puttputt Putt-Putt Joins the Parade 7766c9487f9d53a8cb0edabda5119c3d 8022 en DOS HE 60 - - George Kormendi @@ -735,7 +735,7 @@ puttputt Putt-Putt Joins the Parade be2abe172f58db170de3a037daa1dd27 -1 jp 3DO HE 61 - - clone2727 ee41f6afbc5b26fa475754b56fe92048 8032 jp 3DO HE 61 - - George Kormendi 9708cf716ed8bcc9ff3fcfc69413b746 -1 en DOS HE 62 - - khalek - e361a7058ed8e8ebb462663c0a3ae8d6 -1 hb DOS HE 62 - - sev + e361a7058ed8e8ebb462663c0a3ae8d6 -1 he DOS HE 62 - - sev 684732efb5799c0f78804c99d8de9aba -1 en Mac HE 62 - - khalek 6a30a07f353a75cdc602db27d73e1b42 -1 en Windows HE 70 - - khalek @@ -806,7 +806,7 @@ funpack Putt-Putt's Fun Pack e95cf980719c0be078fb68a67af97b4a -1 jp 3DO - - - clone2727 3d219e7546039543307b55a91282bf18 -1 en DOS - - - iziku 46b53fd430adcfbed791b48a0d4b079f -1 en DOS - - - khalek - 90a329d8ad5b7ce0690429e98cfbb32f -1 hb DOS - - - + 90a329d8ad5b7ce0690429e98cfbb32f -1 he DOS - - - PuttsFunShop Putt-Putt's One-Stop Fun Shop 5262a27afcaee04e5c4900220bd463e7 -1 us All - - - Kirben -- cgit v1.2.3