libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-17 15:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Remove mess with shhared cast resources

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-02-24 15:59:04 +01:00
parent 1a0824040d
commit 8f171a97df
4 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/director/director.cpp
View File

@ -75,10 +75,6 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
_lingo = nullptr;
_sharedScore = nullptr;
_sharedSound = nullptr;
_sharedBMP = nullptr;
_sharedSTXT = nullptr;
_sharedDIB = nullptr;
_mainArchive = nullptr;
_macBinary = nullptr;
@ -106,12 +102,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
}
DirectorEngine::~DirectorEngine() {
delete _sharedSound;
delete _sharedBMP;
delete _sharedSTXT;
delete _sharedDIB;
delete _sharedScore;
delete _currentScore;
cleanupMainArchive();

8
engines/director/director.h
View File

@ -124,10 +124,6 @@ public:
void processEvents(); // evetns.cpp
void setDraggedSprite(uint16 id); // events.cpp
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedDIB() const { return _sharedDIB; }
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedBMP() const { return _sharedBMP; }
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *getSharedSTXT() const { return _sharedSTXT; }
Common::HashMap<Common::String, Score *> *_movies;
Common::RandomSource _rnd;
@ -160,10 +156,6 @@ private:
void loadMac(const Common::String movie);
Score *_sharedScore;
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedDIB;
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedSTXT;
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedSound;
Common::HashMap<int, Common::SeekableSubReadStreamEndian *> *_sharedBMP;
Archive *_mainArchive;
Common::MacResManager *_macBinary;

31
engines/director/resource.cpp
View File

@ -22,6 +22,7 @@
#include "common/config-manager.h"
#include "common/macresman.h"
#include "common/substream.h"
#include "common/file.h"
#include "graphics/macgui/macwindowmanager.h"
@ -29,6 +30,7 @@
#include "director/director.h"
#include "director/archive.h"
#include "director/cast.h"
#include "director/score.h"
#include "director/util.h"
#include "director/lingo/lingo.h"
@ -271,16 +273,6 @@ void DirectorEngine::clearSharedCast() {
delete _sharedScore;
_sharedScore = nullptr;
delete _sharedDIB;
delete _sharedSTXT;
delete _sharedSound;
delete _sharedBMP;
_sharedDIB = nullptr;
_sharedSTXT = nullptr;
_sharedSound = nullptr;
_sharedBMP = nullptr;
}
void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
@ -293,11 +285,6 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
Archive *sharedCast = createArchive();
_sharedDIB = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
_sharedSTXT = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
_sharedSound = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
_sharedBMP = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
if (!sharedCast->openFile(filename)) {
warning("loadSharedCastsFrom(): No shared cast %s", filename.c_str());
@ -376,13 +363,16 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
_sharedScore->setSpriteCasts();
Common::SeekableSubReadStreamEndian *res;
Common::Array<uint16> dib = sharedCast->getResourceIDList(MKTAG('D','I','B',' '));
if (dib.size() != 0) {
debugC(3, kDebugLoading, "****** Loading %d DIBs", dib.size());
for (Common::Array<uint16>::iterator iterator = dib.begin(); iterator != dib.end(); ++iterator) {
debugC(3, kDebugLoading, "loadSharedCastsFrom(): Shared DIB %d", *iterator);
_sharedDIB->setVal(*iterator, sharedCast->getResource(MKTAG('D','I','B',' '), *iterator));
res = sharedCast->getResource(MKTAG('D','I','B',' '), *iterator);
_sharedScore->_loadedCast->setVal(*iterator, new BitmapCast(*res, MKTAG('D','I','B',' '), getVersion()));
}
}
@ -392,7 +382,8 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
for (Common::Array<uint16>::iterator iterator = stxt.begin(); iterator != stxt.end(); ++iterator) {
debugC(3, kDebugLoading, "loadSharedCastsFrom(): Shared STXT %d", *iterator);
_sharedSTXT->setVal(*iterator, sharedCast->getResource(MKTAG('S','T','X','T'), *iterator));
res = sharedCast->getResource(MKTAG('S','T','X','T'), *iterator);
_sharedScore->_loadedCast->setVal(*iterator, new TextCast(*res, getVersion()));
}
}
@ -401,7 +392,8 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
debugC(3, kDebugLoading, "****** Loading %d BITDs", bmp.size());
for (Common::Array<uint16>::iterator iterator = bmp.begin(); iterator != bmp.end(); ++iterator) {
debugC(3, kDebugLoading, "loadSharedCastsFrom(): Shared BITD %d (%s)", *iterator, numToCastNum(*iterator - 1024));
_sharedBMP->setVal(*iterator, sharedCast->getResource(MKTAG('B','I','T','D'), *iterator));
res = sharedCast->getResource(MKTAG('B','I','T','D'), *iterator);
_sharedScore->_loadedCast->setVal(*iterator, new BitmapCast(*res, MKTAG('B','I','T','D'), getVersion()));
}
}
@ -409,8 +401,7 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
if (sound.size() != 0) {
debugC(3, kDebugLoading, "****** Loading %d SNDs", sound.size());
for (Common::Array<uint16>::iterator iterator = sound.begin(); iterator != sound.end(); ++iterator) {
debugC(3, kDebugLoading, "loadSharedCastsFrom(): Shared SND %d", *iterator);
_sharedSound->setVal(*iterator, sharedCast->getResource(MKTAG('S','N','D',' '), *iterator));
debugC(3, kDebugLoading, "loadSharedCastsFrom(): Shared SND %d, SKIPPING!", *iterator);
}
}

12
engines/director/score.cpp
View File

@ -322,20 +322,10 @@ void Score::loadSpriteImages(bool isSharedCast) {
img = new DIBDecoder();
img->loadStream(*_movieArchive->getResource(MKTAG('D', 'I', 'B', ' '), imgId));
bitmapCast->_surface = img->getSurface();
} else if (isSharedCast && _vm->getSharedDIB() != NULL && _vm->getSharedDIB()->contains(imgId)) {
debugC(2, kDebugLoading, "****** Loading 'DIB ' id: %d from shared cast", imgId);
img = new DIBDecoder();
img->loadStream(*_vm->getSharedDIB()->getVal(imgId));
bitmapCast->_surface = img->getSurface();
}
break;
case MKTAG('B', 'I', 'T', 'D'):
if (isSharedCast) {
debugC(2, kDebugLoading, "****** Loading 'BITD' id: %d from shared cast", imgId);
pic = _vm->getSharedBMP()->getVal(imgId);
if (pic != NULL)
pic->seek(0); // TODO: this actually gets re-read every loop... we need to rewind it!
} else if (_movieArchive->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
if (_movieArchive->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
debugC(2, kDebugLoading, "****** Loading 'BITD' id: %d", imgId);
pic = _movieArchive->getResource(MKTAG('B', 'I', 'T', 'D'), imgId);
}