diff options
author | Kamil Zbrog | 2014-03-29 22:23:20 +0100 |
---|---|---|
committer | lukaslw | 2014-06-22 19:21:10 +0200 |
commit | 4c7326cfae914639bb5aa974b886f549cefdc4c5 (patch) | |
tree | ef158de0a02e7935a48af31a6c4a95ea193d94db | |
parent | 5ffa58dba7a941249af9ca8c1bd229c310fb296b (diff) | |
download | scummvm-rg350-4c7326cfae914639bb5aa974b886f549cefdc4c5.tar.gz scummvm-rg350-4c7326cfae914639bb5aa974b886f549cefdc4c5.tar.bz2 scummvm-rg350-4c7326cfae914639bb5aa974b886f549cefdc4c5.zip |
PRINCE: Compilation fix after merge
-rw-r--r-- | engines/prince/mhwanh.h | 8 | ||||
-rw-r--r-- | engines/prince/object.h | 2 | ||||
-rw-r--r-- | engines/prince/prince.cpp | 2 | ||||
-rw-r--r-- | engines/prince/prince.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/prince/mhwanh.h b/engines/prince/mhwanh.h index 9344312cce..5364c5d20a 100644 --- a/engines/prince/mhwanh.h +++ b/engines/prince/mhwanh.h @@ -23,14 +23,14 @@ #ifndef PRINCE_MHWANH_H #define PRINCE_MHWANH_H -#include "graphics/decoders/image_decoder.h" -#include "graphics/decoders/bmp.h" +#include "image/image_decoder.h" +#include "image/bmp.h" #include "graphics/surface.h" #include "resource.h" namespace Prince { -class MhwanhDecoder : public Graphics::ImageDecoder { +class MhwanhDecoder : public Image::ImageDecoder { public: MhwanhDecoder(); virtual ~MhwanhDecoder(); @@ -55,7 +55,7 @@ namespace Resource { } template <> inline - bool loadFromStream<Graphics::BitmapDecoder>(Graphics::BitmapDecoder &image, Common::SeekableReadStream &stream) { + bool loadFromStream<Image::BitmapDecoder>(Image::BitmapDecoder &image, Common::SeekableReadStream &stream) { return image.loadStream(stream); } } diff --git a/engines/prince/object.h b/engines/prince/object.h index aa55bf06a6..7a3d19e906 100644 --- a/engines/prince/object.h +++ b/engines/prince/object.h @@ -23,7 +23,7 @@ #ifndef PRINCE_OBJECT_H #define PRINCE_OBJECT_H -#include "graphics/decoders/image_decoder.h" +#include "image/image_decoder.h" #include "graphics/surface.h" namespace Prince { diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index 687081d60c..d778f48b10 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -181,7 +181,7 @@ void PrinceEngine::init() { delete talkTxtStream; - _roomBmp = new Graphics::BitmapDecoder(); + _roomBmp = new Image::BitmapDecoder(); _mainHero = new Hero(); _secondHero = new Hero(); diff --git a/engines/prince/prince.h b/engines/prince/prince.h index 9802769ed9..f1707c04ec 100644 --- a/engines/prince/prince.h +++ b/engines/prince/prince.h @@ -31,7 +31,7 @@ #include "common/rect.h" #include "common/events.h" -#include "graphics/decoders/bmp.h" +#include "image/bmp.h" #include "gui/debugger.h" @@ -157,7 +157,7 @@ private: uint8 _cursorNr; Common::RandomSource *_rnd; - Graphics::BitmapDecoder *_roomBmp; + Image::BitmapDecoder *_roomBmp; Cursor *_cursor1; Cursor *_cursor2; MhwanhDecoder *_walizkaBmp; |