thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup; remove GF_10TH, it's not used or needed anywhere.

Browse source 
svn-id: r46978
This commit is contained in:
Matthew Hoops 2010-01-04 17:37:25 +00:00
parent 380190ee12
commit 8cc208ba2e
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/mohawk/bitmap.cpp
View file

@ -625,7 +625,6 @@ ImageData* MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
if (_info.colorsUsed == 0) if (_info.colorsUsed == 0)
_info.colorsUsed = 256; _info.colorsUsed = 256;
// TODO: Myst ME's Help.dat contains WDIB's with 24bpp color.
if (_info.bitsPerPixel != 8 && _info.bitsPerPixel != 24) if (_info.bitsPerPixel != 8 && _info.bitsPerPixel != 24)
error("%dbpp Bitmaps not supported", _info.bitsPerPixel); error("%dbpp Bitmaps not supported", _info.bitsPerPixel);

8
engines/mohawk/detection.cpp
View file

@ -301,7 +301,7 @@ static const MohawkGameDescription gameDescriptions[] = {
Common::GUIO_NONE Common::GUIO_NONE
}, },
GType_MYST, GType_MYST,
GF_ME|GF_10TH, GF_ME,
0, 0,
}, },
@ -319,7 +319,7 @@ static const MohawkGameDescription gameDescriptions[] = {
Common::GUIO_NONE Common::GUIO_NONE
}, },
GType_MYST, GType_MYST,
GF_ME|GF_10TH, GF_ME,
0, 0,
}, },
@ -409,7 +409,7 @@ static const MohawkGameDescription gameDescriptions[] = {
Common::GUIO_NONE Common::GUIO_NONE
}, },
GType_RIVEN, GType_RIVEN,
GF_DVD|GF_10TH, GF_DVD,
0, 0,
}, },
@ -617,7 +617,7 @@ static const MohawkGameDescription gameDescriptions[] = {
0 0
}, },
// In The 1rst Degree // In The 1st Degree
// French Windows // French Windows
// From Strangerke // From Strangerke
{ {

8
engines/mohawk/mohawk.h
View file

@ -54,9 +54,8 @@ enum MohawkGameType {
enum MohawkGameFeatures { enum MohawkGameFeatures {
GF_ME = (1 << 0), // Myst Masterpiece Edition GF_ME = (1 << 0), // Myst Masterpiece Edition
GF_DVD = (1 << 1), GF_DVD = (1 << 1),
GF_10TH = (1 << 2), // 10th Anniversary GF_DEMO = (1 << 2),
GF_DEMO = (1 << 3), GF_HASMIDI = (1 << 3)
GF_HASMIDI = (1 << 4)
}; };
struct MohawkGameDescription; struct MohawkGameDescription;
@ -93,10 +92,11 @@ public:
void pauseGame(); void pauseGame();
protected: private:
PauseDialog *_pauseDialog; PauseDialog *_pauseDialog;
void pauseEngineIntern(bool); void pauseEngineIntern(bool);
protected:
// An array holding the main Mohawk archives require by the games // An array holding the main Mohawk archives require by the games
Common::Array<MohawkFile *> _mhk; Common::Array<MohawkFile *> _mhk;
}; };