diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/sky/detection.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/sky/detection.cpp')
| -rw-r--r-- | engines/sky/detection.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index a1067496da..484958ca52 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -43,21 +43,21 @@ struct SkyVersion { int dataDiskSize; const char *extraDesc; int version; - uint32 guioptions; + const char *guioptions; }; // TODO: Would be nice if Disk::determineGameVersion() used this table, too. static const SkyVersion skyVersions[] = { - { 232, -1, "floppy demo", 272, Common::GUIO_NOSPEECH }, // German - { 243, -1, "pc gamer demo", 109, Common::GUIO_NOSPEECH }, - { 247, -1, "floppy demo", 267, Common::GUIO_NOSPEECH }, // English - { 1404, -1, "floppy", 288, Common::GUIO_NOSPEECH }, - { 1413, -1, "floppy", 303, Common::GUIO_NOSPEECH }, - { 1445, 8830435, "floppy", 348, Common::GUIO_NOSPEECH }, - { 1445, -1, "floppy", 331, Common::GUIO_NOSPEECH }, - { 1711, -1, "cd demo", 365, Common::GUIO_NONE }, - { 5099, -1, "cd", 368, Common::GUIO_NONE }, - { 5097, -1, "cd", 372, Common::GUIO_NONE }, + { 232, -1, "floppy demo", 272, GUIO1(GUIO_NOSPEECH) }, // German + { 243, -1, "pc gamer demo", 109, GUIO1(GUIO_NOSPEECH) }, + { 247, -1, "floppy demo", 267, GUIO1(GUIO_NOSPEECH) }, // English + { 1404, -1, "floppy", 288, GUIO1(GUIO_NOSPEECH) }, + { 1413, -1, "floppy", 303, GUIO1(GUIO_NOSPEECH) }, + { 1445, 8830435, "floppy", 348, GUIO1(GUIO_NOSPEECH) }, + { 1445, -1, "floppy", 331, GUIO1(GUIO_NOSPEECH) }, + { 1711, -1, "cd demo", 365, GUIO0() }, + { 5099, -1, "cd", 368, GUIO0() }, + { 5097, -1, "cd", 372, GUIO0() }, { 0, 0, 0, 0, 0 } }; |