diff options
| author | Strangerke | 2016-03-21 07:49:38 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | c4f5dd0209a42ef5d3f6cfe81a83c98f0d9853f5 (patch) | |
| tree | 8acf8d00e0b65f2dbaae312811dbee5bb4bf9602 /engines | |
| parent | cb69189a50abb8771fc7196c07b8bcfa93c06547 (diff) | |
| download | scummvm-rg350-c4f5dd0209a42ef5d3f6cfe81a83c98f0d9853f5.tar.gz scummvm-rg350-c4f5dd0209a42ef5d3f6cfe81a83c98f0d9853f5.tar.bz2 scummvm-rg350-c4f5dd0209a42ef5d3f6cfe81a83c98f0d9853f5.zip | |
GNAP: Fix compilation
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gnap/configure.engine | 3 | ||||
| -rw-r--r-- | engines/gnap/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/gnap/gamesys.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/engines/gnap/configure.engine b/engines/gnap/configure.engine new file mode 100644 index 0000000000..7aa538fd2c --- /dev/null +++ b/engines/gnap/configure.engine @@ -0,0 +1,3 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine gnap "UFOs" no diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp index 88994451a4..ecd07a6103 100644 --- a/engines/gnap/detection.cpp +++ b/engines/gnap/detection.cpp @@ -54,7 +54,7 @@ static const ADGameDescription gameDescriptions[] = { class GnapMetaEngine : public AdvancedMetaEngine { public: GnapMetaEngine() : AdvancedMetaEngine(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) { - _singleid = "gnap"; + _singleId = "gnap"; _maxScanDepth = 3; } diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp index cced8f3a21..5a72428fb8 100644 --- a/engines/gnap/gamesys.cpp +++ b/engines/gnap/gamesys.cpp @@ -24,7 +24,7 @@ #include "gnap/fontdata.h" #include "graphics/fontman.h" #include "graphics/font.h" -#include "graphics/decoders/bmp.h" +#include "image/bmp.h" namespace Gnap { @@ -365,7 +365,7 @@ Graphics::Surface *GameSys::loadBitmap(int resourceId) { uint32 resourceSize = _vm->_dat->getResourceSize(resourceId); Common::MemoryReadStream stream(resourceData, resourceSize, DisposeAfterUse::NO); Graphics::Surface *bmpSurface; - Graphics::BitmapDecoder bmp; + Image::BitmapDecoder bmp; if (!bmp.loadStream(stream)) error("GameSys::loadBitmap() Could not load bitmap resource %08X", resourceId); bmpSurface = bmp.getSurface()->convertTo(_vm->_system->getScreenFormat()); |