Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed two issues with random game selection.

Browse source
This commit is contained in:
Leon Styhre 2020-08-06 23:41:44 +02:00
parent 3a59c77d3e
commit d2dfbc5919
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
es-app/src/SystemData.cpp
View file

@ -550,10 +550,22 @@ FileData* SystemData::getRandomGame(const FileData* currentGame)
{ {
std::vector<FileData*> gameList = mRootFolder->getFilesRecursive(GAME, true); std::vector<FileData*> gameList = mRootFolder->getFilesRecursive(GAME, true);
if (currentGame && currentGame->getType() == PLACEHOLDER)
return nullptr;
if (currentGame) { if (currentGame) {
// If the game is inside a folder, update gameList to only contain the games // If the parent of the game only contains folders, then simply make all these
// inside this folder. // folders the selection list for the random function. This covers folder-only
if (currentGame->getParent()->getFullPath() != // views regardless of how many levels deep they're located.
if (currentGame->getParent()->getOnlyFoldersFlag()) {
std::vector<FileData*> childrenList = currentGame->getParent()->getChildren();
gameList.erase(gameList.cbegin(), gameList.cend());
gameList.reserve(childrenList.size());
gameList.insert(gameList.cend(), childrenList.cbegin(), childrenList.cend());
}
// If the game is inside a folder where there are only other files, update gameList
// to only contain these files.
else if (currentGame->getParent()->getFullPath() !=
currentGame->getSystem()->getRootFolder()->getFullPath()) { currentGame->getSystem()->getRootFolder()->getFullPath()) {
std::vector<FileData*> folderList; std::vector<FileData*> folderList;
@ -566,7 +578,8 @@ FileData* SystemData::getRandomGame(const FileData* currentGame)
gameList.reserve(folderList.size()); gameList.reserve(folderList.size());
gameList.insert(gameList.cend(), folderList.cbegin(), folderList.cend()); gameList.insert(gameList.cend(), folderList.cbegin(), folderList.cend());
} }
// If the game is not inside a folder, update gameList to exclude all folders. // If the game is inside a folder with a mix of files and folders, then update
// gameList to exclude all folders so we don't jump into one of them.
else { else {
std::vector<FileData*> childrenList = mRootFolder->getChildren(); std::vector<FileData*> childrenList = mRootFolder->getChildren();
std::vector<FileData*> noFolderList; std::vector<FileData*> noFolderList;

2
es-app/src/views/gamelist/ISimpleGameListView.cpp
View file

@ -140,7 +140,7 @@ bool ISimpleGameListView::input(InputConfig* config, Input input)
} }
} }
else if (config->isMappedTo("x", input)) { else if (config->isMappedTo("x", input)) {
if (mRoot->getSystem()->isGameSystem()) { if (mRoot->getSystem()->isGameSystem() && getCursor()->getType() != PLACEHOLDER) {
// Go to random system game. // Go to random system game.
NavigationSounds::getInstance()->playThemeNavigationSound(SCROLLSOUND); NavigationSounds::getInstance()->playThemeNavigationSound(SCROLLSOUND);
FileData* randomGame = getCursor()->getSystem()->getRandomGame(getCursor()); FileData* randomGame = getCursor()->getSystem()->getRandomGame(getCursor());