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

Revert "EMI: Remove last ifdef ENABLE_MONKEY4 checks"

Browse source 
This reverts commit 930ccad494.
This commit is contained in:
Einar Johan Trøan Sømåen 2013-07-30 21:50:28 +02:00
parent 1b8e815c1d
commit bc2edd831a
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/grim/bitmap.cpp
View file

@ -259,6 +259,7 @@ bool BitmapData::loadTGA(Common::SeekableReadStream *data) {
} }
bool BitmapData::loadTile(Common::SeekableReadStream *o) { bool BitmapData::loadTile(Common::SeekableReadStream *o) {
#ifdef ENABLE_MONKEY4
_x = 0; _x = 0;
_y = 0; _y = 0;
_format = 1; _format = 1;
@ -339,6 +340,7 @@ bool BitmapData::loadTile(Common::SeekableReadStream *o) {
delete[] data; delete[] data;
g_driver->createBitmap(this); g_driver->createBitmap(this);
#endif // ENABLE_MONKEY4
return true; return true;
} }

2
engines/grim/detection.cpp
View file

@ -242,6 +242,7 @@ static const GrimGameDescription gameDescriptions[] = {
}, },
GType_GRIM GType_GRIM
}, },
#ifdef ENABLE_MONKEY4
{ {
// Escape from Monkey Island English // Escape from Monkey Island English
{ {
@ -411,6 +412,7 @@ static const GrimGameDescription gameDescriptions[] = {
}, },
GType_MONKEY4 GType_MONKEY4
}, },
#endif // ENABLE_MONKEY4
{ AD_TABLE_END_MARKER, GType_GRIM } { AD_TABLE_END_MARKER, GType_GRIM }
}; };