- only add a multi disk entry to the cover list if .d1 is added before the extension and the filename includes 'disc' or 'disk'.

- properly fix scummvm.ini in apps/scummmvm/scummvm.ini
This commit is contained in:
Fledge68 2021-09-15 11:45:06 -05:00
parent 346f480b3d
commit 9048d5fe57
6 changed files with 10 additions and 10 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

View File

@ -1,6 +1,6 @@
#define APP_NAME "WiiFlow WFL"
#define APP_VERSION "5.5.0 beta 4"
#define APP_VERSION "5.5.0 beta 5"
#define APP_DATA_DIR "wiiflow"
#define APPS_DIR "apps/wiiflow"

View File

@ -249,7 +249,6 @@ static void Create_Channel_List()
}
/* add plugin rom, song, or video to the list. */
string PrevName;
static void Add_Plugin_Game(char *FullPath)
{
/* Get roms's title without the extra ()'s or []'s */
@ -257,10 +256,9 @@ static void Add_Plugin_Game(char *FullPath)
//gprintf("shortName=%s\n", ShortName.c_str());
/* only add disc 1 of multi disc games */
if(ShortName == PrevName)
const char *RomFilename = strrchr(FullPath, '/') + 1;
if((strstr(RomFilename, "disc") != NULL || strstr(RomFilename, "disk") != NULL) && strstr(RomFilename, ".d1") == NULL)
return;
else
PrevName = ShortName;
/* get rom's ID */
string romID = "";
@ -280,8 +278,7 @@ static void Add_Plugin_Game(char *FullPath)
strncpy(ListElement.id, romID.c_str(), 6);
/* Get titles - Rom filename, custom title, and database xml title */
const char *RomFilename = strrchr(FullPath, '/') + 1;
*strrchr(RomFilename, '.') = '\0';
*strrchr(RomFilename, '.') = '\0';// remove extension
string customTitle = CustomTitles.getStringCustomTitles(m_plugin.PluginMagicWord, RomFilename, "");
@ -393,7 +390,6 @@ void ListGenerator::CreateRomList(Config &platform_cfg, const string& romsDir, c
}
}
PrevName = "";
platformName = "";
if(platform_cfg.loaded())
{

View File

@ -2495,7 +2495,7 @@ bool CMenu::_loadPluginList()
continue;
strncpy(m_plugin.PluginMagicWord, fmt("%08x", m_plugin.GetPluginMagic(i)), 8);
const char *romDir = m_plugin.GetRomDir(i);
if(strcasecmp(romDir, "scummvm.ini") != 0)
if(strstr(romDir, "scummvm.ini") == NULL)
{
if(strncasecmp(m_plugin.PluginMagicWord, "484252", 6) == 0)//HBRW
{

View File

@ -181,7 +181,11 @@ void CMenu::_showCF(bool refreshList)
int romsPartition = m_plugin.GetRomPartition(i);
if(romsPartition < 0)
romsPartition = m_cfg.getInt(PLUGIN_DOMAIN, "partition", 0);
Pth = sfmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i));
const char *romDir = m_plugin.GetRomDir(i);
if(strstr(romDir, "scummvm.ini") != NULL && strchr(romDir, ':') != NULL)
Pth = sfmt("%s", romDir);
else
Pth = sfmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i));
}
break;
}