diff options
author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/saga/detection_tables.h | |
parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/saga/detection_tables.h')
-rw-r--r-- | engines/saga/detection_tables.h | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 2f72e7a13c..98009326ae 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -192,9 +192,9 @@ static const SAGAGameDescription gameDescriptions[] = { ADGF_DEMO, GUIO1(GUIO_NOSPEECH) }, - GID_ITE, // Game id - GF_OLD_ITE_DOS, // features - ITE_DEFAULT_SCENE, // Starting scene number + GID_ITE, + GF_ITE_DOS_DEMO, + ITE_DEFAULT_SCENE, &ITEDemo_Resources, ARRAYSIZE(ITEDEMO_GameFonts), ITEDEMO_GameFonts, @@ -393,6 +393,33 @@ static const SAGAGameDescription gameDescriptions[] = { NULL, }, + // Inherit the earth - German Wyrmkeep combined Windows/Mac/Linux CD + + // Supplied by user nicode in bug #6428. + // Contains voices.rsc instead of "Inherit the Earth Voices". + { + { + "ite", + "Multi-OS CD Version", + { + {"ite.rsc", GAME_RESOURCEFILE, "420e09cfdbb4db12baefd4bc81d8e154", 8925349}, + {"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84", -1}, + { NULL, 0, NULL, 0} + }, + Common::DE_DEU, + Common::kPlatformUnknown, + ADGF_CD, + GUIO0() + }, + GID_ITE, + 0, + ITE_DEFAULT_SCENE, + &ITE_Resources, + ARRAYSIZE(ITE_GameFonts), + ITE_GameFonts, + NULL, + }, + // Inherit the earth - Italian Wyrmkeep combined Windows/Mac/Linux CD (fan translation) // version is different from the other Wyrmkeep re-releases in that it does |