libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 03:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Remove DList from imagcach.h

Browse Source
This commit is contained in:
a/ 2021-07-03 08:13:09 +09:00
parent 6de10a5461
commit e1a430c801
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/saga2/imagcach.cpp
View File

@ -26,7 +26,6 @@
#include "saga2/saga2.h"
#include "saga2/fta.h"
#include "saga2/dlist.h"
#include "saga2/imagcach.h"
#include "saga2/hresmgr.h"
@ -148,19 +147,18 @@ void CImageCache::releaseImage(void *imagePtr) {
if (!imagePtr) return;
CImageNode *imageNode;
CImageNode *prevImageNode;
Common::List<CImageNode *>::iterator nextIt;
for (Common::List<CImageNode *>::iterator it = _nodes.begin(); it != _nodes.end(); it = nextIt) {
nextIt = it;
nextIt++;
for (imageNode = (CImageNode *)nodes.last();
imageNode != NULL;
imageNode = prevImageNode) {
prevImageNode = (CImageNode *)imageNode->prev();
imageNode = *it;
if (imageNode->isSameImage(imagePtr)) {
// if that was the last request for the imageNode, delete it
if (imageNode->releaseRequest()) {
// remove and delete it
imageNode->remove();
_nodes.remove(imageNode);
delete imageNode;
}
}
@ -171,9 +169,9 @@ void *CImageCache::requestImage(hResContext *con, uint32 resID) {
CImageNode *imageNode;
// look through all nodes to see if we have that image already
for (imageNode = (CImageNode *)nodes.last();
imageNode;
imageNode = (CImageNode *)imageNode->prev()) {
for (Common::List<CImageNode *>::iterator it = _nodes.begin(); it != _nodes.end(); it++) {
imageNode = *it;
if (imageNode->isSameImage(con, resID)) {
// return the image Ptr to the already allocated image resource
return imageNode->getImagePtr();
@ -186,7 +184,7 @@ void *CImageCache::requestImage(hResContext *con, uint32 resID) {
imageNode = new CImageNode(con, resID);
// add this node to the list
nodes.addTail(*imageNode);
_nodes.push_back(imageNode);
// return the newly loaded image
return imageNode->getImagePtr();

6
engines/saga2/imagcach.h
View File

@ -36,7 +36,7 @@ void cleanupImageCache(void);
ImageNode class which defines a re-entrant image resource
* ===================================================================== */
class CImageNode : public DNode {
class CImageNode {
private:
uint32 contextID; // ID of context
uint32 resourceID; // RES_ID of image
@ -64,11 +64,11 @@ public:
class CImageCache {
private:
DList nodes; // list of ImageNode
Common::List<CImageNode *> _nodes; // list of ImageNode
public:
CImageCache(void) {
assert(nodes.empty());
assert(_nodes.empty());
}
~CImageCache(void);