ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/filesystem

This commit is contained in:
Stephen Anthony 2022-08-13 17:08:55 -02:30
parent f0b3341e54 5965524ac4
commit 73c72b538a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/RomImageWidget.cxx
View File

@ -120,15 +120,13 @@ void RomImageWidget::parseProperties(const FSNode& node)
// TODO: RETRON_77 // TODO: RETRON_77
// Get a valid filename representing a snapshot file for this rom and load the snapshot // Get a valid filename representing a snapshot file for this rom and load the snapshot
const string& path = instance().snapshotLoadDir().getPath();
myImageList.clear(); myImageList.clear();
myImageIdx = 0; myImageIdx = 0;
// 1. Try to load snapshots by property name // 1. Try to load snapshots by property name
getImageList(path + myProperties.get(PropType::Cart_Name)); getImageList(myProperties.get(PropType::Cart_Name));
// 2. Also try to load snapshot images by filename // 2. Also try to load snapshot images by filename
getImageList(path + node.getNameWithExt()); getImageList(node.getNameWithExt());
if(myImageList.size()) if(myImageList.size())
mySurfaceIsValid = loadPng(myImageList[0].getPath()); mySurfaceIsValid = loadPng(myImageList[0].getPath());
@ -136,7 +134,7 @@ void RomImageWidget::parseProperties(const FSNode& node)
if(!mySurfaceIsValid) if(!mySurfaceIsValid)
{ {
// 3. If no ROM snapshots exist, try to load a default snapshot // 3. If no ROM snapshots exist, try to load a default snapshot
mySurfaceIsValid = loadPng(path + "default_snapshot.png"); mySurfaceIsValid = loadPng(instance().snapshotLoadDir().getPath() + "default_snapshot.png");
} }
#else #else
@ -163,12 +161,17 @@ bool RomImageWidget::changeImage(int direction)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool RomImageWidget::getImageList(const string& filename) bool RomImageWidget::getImageList(const string& filename)
{ {
FSNode::NameFilter filter = ([&](const FSNode& node) { const string pngName = filename + ".png";
return (!node.isDirectory() && FSNode::NameFilter filter = ([&](const FSNode& node)
(node.getPath() == filename + ".png" || {
BSPF::matchWithWildcards(node.getPath(), filename + " #*.png"))); const string& nodeName = node.getName();
}); return (!node.isDirectory() &&
(nodeName == pngName ||
(nodeName.find(filename + " #") == 0 && nodeName.find(".png") == nodeName.length() - 4)));
}
);
// Find all images matching the filename and the extension
FSNode node(instance().snapshotLoadDir().getPath()); FSNode node(instance().snapshotLoadDir().getPath());
node.getChildren(myImageList, FSNode::ListMode::FilesOnly, filter, false, false); node.getChildren(myImageList, FSNode::ListMode::FilesOnly, filter, false, false);