PRINCE: Compilation fix after merge

scummvm · Jun 22, 2014 · 4c7326c · 4c7326c
1 parent 5ffa58d
commit 4c7326c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 @@ class PrinceEngine : public Engine {
 	uint8 _cursorNr;
 
 	Common::RandomSource *_rnd;
-	Graphics::BitmapDecoder *_roomBmp;
+	Image::BitmapDecoder *_roomBmp;
 	Cursor *_cursor1;
 	Cursor *_cursor2;
 	MhwanhDecoder *_walizkaBmp;