diff options
author | Matthew Hoops | 2010-01-04 17:37:25 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-01-04 17:37:25 +0000 |
commit | 8cc208ba2e7d1f4b67d368b8aacfad3905d45eb6 (patch) | |
tree | ea15c7369d4619b3e03ec73ff5c80d7472f2dfe1 | |
parent | 380190ee127dc0b015d69bc3cbce1af853717496 (diff) | |
download | scummvm-rg350-8cc208ba2e7d1f4b67d368b8aacfad3905d45eb6.tar.gz scummvm-rg350-8cc208ba2e7d1f4b67d368b8aacfad3905d45eb6.tar.bz2 scummvm-rg350-8cc208ba2e7d1f4b67d368b8aacfad3905d45eb6.zip |
Minor cleanup; remove GF_10TH, it's not used or needed anywhere.
svn-id: r46978
-rw-r--r-- | engines/mohawk/bitmap.cpp | 1 | ||||
-rw-r--r-- | engines/mohawk/detection.cpp | 8 | ||||
-rw-r--r-- | engines/mohawk/mohawk.h | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index 8afdc6150d..287b481d4c 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -625,7 +625,6 @@ ImageData* MystBitmap::decodeImage(Common::SeekableReadStream* stream) { if (_info.colorsUsed == 0) _info.colorsUsed = 256; - // TODO: Myst ME's Help.dat contains WDIB's with 24bpp color. if (_info.bitsPerPixel != 8 && _info.bitsPerPixel != 24) error("%dbpp Bitmaps not supported", _info.bitsPerPixel); diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index a1ae4552e5..2b6405cfd0 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -301,7 +301,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::GUIO_NONE }, GType_MYST, - GF_ME|GF_10TH, + GF_ME, 0, }, @@ -319,7 +319,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::GUIO_NONE }, GType_MYST, - GF_ME|GF_10TH, + GF_ME, 0, }, @@ -409,7 +409,7 @@ static const MohawkGameDescription gameDescriptions[] = { Common::GUIO_NONE }, GType_RIVEN, - GF_DVD|GF_10TH, + GF_DVD, 0, }, @@ -617,7 +617,7 @@ static const MohawkGameDescription gameDescriptions[] = { 0 }, - // In The 1rst Degree + // In The 1st Degree // French Windows // From Strangerke { diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h index 8e03e65cdc..7634826c5f 100644 --- a/engines/mohawk/mohawk.h +++ b/engines/mohawk/mohawk.h @@ -54,9 +54,8 @@ enum MohawkGameType { enum MohawkGameFeatures { GF_ME = (1 << 0), // Myst Masterpiece Edition GF_DVD = (1 << 1), - GF_10TH = (1 << 2), // 10th Anniversary - GF_DEMO = (1 << 3), - GF_HASMIDI = (1 << 4) + GF_DEMO = (1 << 2), + GF_HASMIDI = (1 << 3) }; struct MohawkGameDescription; @@ -93,10 +92,11 @@ public: void pauseGame(); -protected: +private: PauseDialog *_pauseDialog; void pauseEngineIntern(bool); +protected: // An array holding the main Mohawk archives require by the games Common::Array<MohawkFile *> _mhk; }; |