libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 16:59:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PRINCE: Compilation fix after merge

Browse Source
This commit is contained in:
Kamil Zbrog 2014-03-29 22:23:20 +01:00 committed by lukaslw
parent 5ffa58dba7
commit 4c7326cfae
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/prince/mhwanh.h
View File

@ -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);
}
}

2
engines/prince/object.h
View File

@ -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 {

2
engines/prince/prince.cpp
View File

@ -181,7 +181,7 @@ void PrinceEngine::init() {
delete talkTxtStream;
_roomBmp = new Graphics::BitmapDecoder();
_roomBmp = new Image::BitmapDecoder();
_mainHero = new Hero();
_secondHero = new Hero();

4
engines/prince/prince.h
View File

@ -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;