libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 18:06:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRECTOR: Support external bitmaps

Browse Source 
Patch courtesy of eientei
This commit is contained in:
Eugene Sandulenko 2023-02-24 15:53:52 +01:00
parent 051555397d
commit 435c996a25
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/director/cast.cpp
View File

@ -27,6 +27,7 @@
#include "graphics/macgui/macfontmanager.h"
#include "graphics/macgui/macwindowmanager.h"
#include "image/bmp.h"
#include "image/pict.h"
#include "director/director.h"
#include "director/cast.h"
@ -669,6 +670,29 @@ void Cast::loadBitmapData(int key, BitmapCastMember *bitmapCast) {
else if (sharedCast && sharedCast->getArchive()->hasResource(tag, imgId))
pic = sharedCast->getArchive()->getResource(tag, imgId);
}
if (pic == nullptr || pic->size() == 0) {
// image file is linked, load from the filesystem
Common::File file;
Common::String filename = _castsInfo[key]->fileName;
Common::String directory = _castsInfo[key]->directory;
Common::String imageFilename = directory + g_director->_dirSeparator + filename;
Common::Path path = Common::Path(pathMakeRelative(imageFilename), g_director->_dirSeparator);
file.open(path);
Image::PICTDecoder *pict = new Image::PICTDecoder();
pict->loadStream(file);
file.close();
bitmapCast->_img = pict;
const Graphics::Surface *surf = pict->getSurface();
bitmapCast->_size = surf->pitch * surf->h + pict->getPaletteColorCount() * 3;
delete pic;
return;
}
} else {
if (_loadedCast->contains(imgId)) {
bitmapCast->_tag = tag = ((BitmapCastMember *)_loadedCast->getVal(imgId))->_tag;