libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Move ImageCache to Saga2Engine

Browse Source
This commit is contained in:
a/ 2021-07-01 05:40:12 +09:00 committed by Eugene Sandulenko
parent 85b1c8e842
commit 30071b6046
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
8 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/saga2/contain.cpp
View File

@ -1762,11 +1762,11 @@ void initContainers(void) {
if (containerRes == NULL)
containerRes = resFile->newContext(MKTAG('C', 'O', 'N', 'T'), "cont.resources");
selImage = ImageCache.requestImage(imageRes, MKTAG('A', 'M', 'N', 'T'));
selImage = g_vm->_imageCache->requestImage(imageRes, MKTAG('A', 'M', 'N', 'T'));
}
void cleanupContainers(void) {
if (selImage) ImageCache.releaseImage(selImage);
if (selImage) g_vm->_imageCache->releaseImage(selImage);
if (containerRes) resFile->disposeContext(containerRes);
selImage = NULL;

10
engines/saga2/floating.cpp
View File

@ -132,7 +132,7 @@ void DecoratedWindow::setDecorations(
for (i = 0; i < numDecorations; i++, dec++) {
// request an image pointer from the image Cache
dec->image = ImageCache.requestImage(con,
dec->image = g_vm->_imageCache->requestImage(con,
MKTAG('B', 'R', 'D', dec->imageNumber));
decorations[i].extent = dec->extent;
decorations[i].image = dec->image;
@ -158,7 +158,7 @@ void DecoratedWindow::setDecorations(
for (i = 0; i < numDecorations; i++, dec++) {
// request an image pointer from the image Cache
dec->image = ImageCache.requestImage(con, id_ | MKTAG(0, 0, 0, dec->imageNumber));
dec->image = g_vm->_imageCache->requestImage(con, id_ | MKTAG(0, 0, 0, dec->imageNumber));
decorations[i].extent = dec->extent;
decorations[i].image = dec->image;
decorations[i].imageNumber = dec->imageNumber;
@ -190,7 +190,7 @@ void DecoratedWindow::setDecorations(
for (i = 0; i < numDecorations; i++, dec++) {
// request an image pointer from the image Cache
dec->image = ImageCache.requestImage(con,
dec->image = g_vm->_imageCache->requestImage(con,
MKTAG('B', 'R', 'D', dec->imageNumber));
decorations[i].extent = dec->extent;
decorations[i].image = dec->image;
@ -216,7 +216,7 @@ void DecoratedWindow::setDecorations(
for (i = 0; i < numDecorations; i++, dec++) {
// request an image pointer from the image Cache
dec->image = ImageCache.requestImage(con, id_ | MKTAG(0, 0, 0, dec->imageNumber));
dec->image = g_vm->_imageCache->requestImage(con, id_ | MKTAG(0, 0, 0, dec->imageNumber));
decorations[i].extent = dec->extent;
decorations[i].image = dec->image;
decorations[i].imageNumber = dec->imageNumber;
@ -239,7 +239,7 @@ void DecoratedWindow::removeDecorations(void) {
// release requests made to the Image Cache
for (dec = decorations, i = 0; i < numDecorations; i++, dec++) {
ImageCache.releaseImage(dec->image);
g_vm->_imageCache->releaseImage(dec->image);
}
if (decorations)

11
engines/saga2/imagcach.cpp
View File

@ -36,6 +36,14 @@ namespace Saga2 {
extern char *idname(long s);
#endif
void initImageCache() {
g_vm->_imageCache = new CImageCache;
}
void cleanupImageCache() {
delete g_vm->_imageCache;
}
CImageNode::CImageNode(hResContext *con, uint32 resID) {
if (con) {
#if DEBUG
@ -184,7 +192,4 @@ void *CImageCache::requestImage(hResContext *con, uint32 resID) {
return imageNode->getImagePtr();
}
// global declarations
CImageCache ImageCache;
} // end of namespace Saga2

7
engines/saga2/imagcach.h
View File

@ -29,6 +29,9 @@
namespace Saga2 {
void initImageCache(void);
void cleanupImageCache(void);
/* ===================================================================== *
ImageNode class which defines a re-entrant image resource
* ===================================================================== */
@ -73,10 +76,6 @@ public:
void releaseImage(void *);
};
// global declarations
extern CImageCache ImageCache;
} // end of namespace Saga2
#endif

40
engines/saga2/intrface.cpp
View File

@ -811,12 +811,12 @@ CMassWeightIndicator::CMassWeightIndicator(gPanelList *panel, const Point16 &pos
// setup mass/bulk indicator imagery
if (death) {
massBulkImag = ImageCache.requestImage(containerRes, MKTAG('D', 'J', 'B', massBulkResNum));
massBulkImag = g_vm->_imageCache->requestImage(containerRes, MKTAG('D', 'J', 'B', massBulkResNum));
pieIndImag = loadImageRes(containerRes, pieIndResNum, numPieIndImages, 'D', 'A', 'J');
} else {
massBulkImag = ImageCache.requestImage(containerRes, MKTAG('G', 'J', 'B', massBulkResNum));
massBulkImag = g_vm->_imageCache->requestImage(containerRes, MKTAG('G', 'J', 'B', massBulkResNum));
pieIndImag = loadImageRes(containerRes, pieIndResNum, numPieIndImages, 'G', 'A', 'J');
}
@ -869,7 +869,7 @@ CMassWeightIndicator::~CMassWeightIndicator(void) {
indList.remove(this);
unloadImageRes(pieIndImag, numPieIndImages);
ImageCache.releaseImage(massBulkImag);
g_vm->_imageCache->releaseImage(massBulkImag);
}
/*****************************************************************************
@ -948,9 +948,9 @@ CManaIndicator::CManaIndicator(gPanelList &list) : gCompImage(list,
// load in the ring images
ringImages = loadImageRes(resContext, ringResNum, numRings, 'R', 'N', 'G');
backImage = ImageCache.requestImage(resContext, MKTAG('B', 'A', 'C', 'K'));
backImage = g_vm->_imageCache->requestImage(resContext, MKTAG('B', 'A', 'C', 'K'));
wellImage = ImageCache.requestImage(resContext, MKTAG('W', 'E', 'L', 'L'));
wellImage = g_vm->_imageCache->requestImage(resContext, MKTAG('W', 'E', 'L', 'L'));
// hmm this could be cleaner...
starRingEndPos[0] = Point16(redEndX, redEndY);
@ -998,8 +998,8 @@ CManaIndicator::~CManaIndicator(void) {
unloadImageRes(ringImages, numRings);
// release back image
ImageCache.releaseImage(backImage);
ImageCache.releaseImage(wellImage);
g_vm->_imageCache->releaseImage(backImage);
g_vm->_imageCache->releaseImage(wellImage);
// release the saved map
if (savedMap.data)
@ -1321,7 +1321,7 @@ CHealthIndicator::CHealthIndicator(AppFunc *cmd) {
starImag = loadButtonRes(healthRes, starStart, starNum, 'S', 'T', 'A');
// load in the health star border
starFrameImag = ImageCache.requestImage(healthRes, MKTAG('B', 'T', 'N', starFrameResNum));
starFrameImag = g_vm->_imageCache->requestImage(healthRes, MKTAG('B', 'T', 'N', starFrameResNum));
// set the image indexes to nominal startup values
for (i = 0; i < numControls + 1; i++) {
@ -1397,7 +1397,7 @@ CHealthIndicator::~CHealthIndicator(void) {
unloadImageRes(starImag, starNum);
// release star frame imagery
ImageCache.releaseImage(starFrameImag);
g_vm->_imageCache->releaseImage(starFrameImag);
}
// Recalculate and update the health star for a particular brother
@ -1578,7 +1578,7 @@ void **loadButtonRes(hResContext *con, int16 resID, int16 numRes) {
for (i = 0, k = resID; i < numRes; i++, k++) {
// get an image from the image cache
images[i] = ImageCache.requestImage(con, MKTAG('B', 'T', 'N', k));
images[i] = g_vm->_imageCache->requestImage(con, MKTAG('B', 'T', 'N', k));
}
return images;
@ -1594,7 +1594,7 @@ void **loadButtonRes(hResContext *con, int16 resID, int16 numRes, char a, char b
void **images = (void **)malloc(sizeof(void *)*numRes);
for (i = 0, k = resID; i < numRes; i++, k++) {
images[i] = ImageCache.requestImage(con, MKTAG(a, b, c, k));
images[i] = g_vm->_imageCache->requestImage(con, MKTAG(a, b, c, k));
}
return images;
@ -1612,7 +1612,7 @@ void unloadImageRes(void **images, int16 numRes) {
if (images) {
for (i = 0; i < numRes; i++) {
ImageCache.releaseImage(images[i]);
g_vm->_imageCache->releaseImage(images[i]);
}
free(images);
@ -1655,17 +1655,17 @@ void SetupUserControls(void) {
julBtnImag = loadButtonRes(imageRes, julBtnResNum, numBtnImages);
phiBtnImag = loadButtonRes(imageRes, phiBtnResNum, numBtnImages);
kevBtnImag = loadButtonRes(imageRes, kevBtnResNum, numBtnImages);
broBtnFrameImag = ImageCache.requestImage(imageRes, MKTAG('F', 'R', 'A', 'M'));
broBtnFrameImag = g_vm->_imageCache->requestImage(imageRes, MKTAG('F', 'R', 'A', 'M'));
// set up the portrait name plates
for (n = 0; n < kNumViews; n++) {
namePlateImages[n] = ImageCache.requestImage(imageRes, MKTAG('B', 'T', 'N', namePlateResNum[n]));
namePlateImages[n] = g_vm->_imageCache->requestImage(imageRes, MKTAG('B', 'T', 'N', namePlateResNum[n]));
}
// get the frame image
namePlateFrameImag = ImageCache.requestImage(imageRes, MKTAG('B', 'T', 'N', 15));
armorImag = ImageCache.requestImage(imageRes, MKTAG('B', 'T', 'N', 34));
namePlateFrameImag = g_vm->_imageCache->requestImage(imageRes, MKTAG('B', 'T', 'N', 15));
armorImag = g_vm->_imageCache->requestImage(imageRes, MKTAG('B', 'T', 'N', 34));
// clean out the old context
if (imageRes) resFile->disposeContext(imageRes);
@ -1824,15 +1824,15 @@ void CleanupButtonImages(void) {
}
// name plate frame
ImageCache.releaseImage(namePlateFrameImag);
ImageCache.releaseImage(armorImag);
g_vm->_imageCache->releaseImage(namePlateFrameImag);
g_vm->_imageCache->releaseImage(armorImag);
// release name frames
ImageCache.releaseImage(broBtnFrameImag);
g_vm->_imageCache->releaseImage(broBtnFrameImag);
// name plates
for (i = 0; i < kNumViews; i++) {
ImageCache.releaseImage(namePlateImages[i]);
g_vm->_imageCache->releaseImage(namePlateImages[i]);
}
}

3
engines/saga2/loadsave.cpp
View File

@ -45,6 +45,7 @@
#include "saga2/vpal.h"
#include "saga2/palette.h"
#include "saga2/contain.h"
#include "saga2/imagcach.h"
namespace Saga2 {
@ -91,6 +92,7 @@ void initGameState(void) {
pauseTimer();
initGlobals();
initImageCache();
initTimer();
initAudio();
initCalender();
@ -484,6 +486,7 @@ void cleanupGameState(void) {
cleanupWorlds();
cleanupAudio();
cleanupTimer();
cleanupImageCache();
cleanupGlobals();
}

1
engines/saga2/saga2.cpp
View File

@ -53,6 +53,7 @@ Saga2Engine::Saga2Engine(OSystem *syst)
g_vm = this;
_bandList = nullptr;
_imageCache = nullptr;
_mouseInfo = nullptr;
_smkDecoder = nullptr;
_videoX = _videoY = 0;

2
engines/saga2/saga2.h
View File

@ -47,6 +47,7 @@ class ActorAppearance;
class PathRequest;
class MotionTask;
class GrabInfo;
class CImageCache;
enum {
kDebugResources = 1 << 0,
@ -102,6 +103,7 @@ public:
Common::List<PathRequest *> _pathQueue;
Common::List<MotionTask *>::iterator _nextMT;
BandList *_bandList;
CImageCache *_imageCache;
GrabInfo *_mouseInfo;
gDisplayPort _mainPort;