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

AGS: Fixes for importing character into QFG2

Browse Source
This commit is contained in:
Paul Gilbert 2021-03-20 18:57:06 -07:00
parent 0b68518ae6
commit d9381a9d86
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/ags/engine/ac/listbox.cpp
View File

@ -76,16 +76,19 @@ void ListBox_Clear(GUIListBox *listbox) {
void FillDirList(std::set<String> &files, const String &path) {
String dirName = Path::GetDirectoryPath(path);
String filePattern = Path::get_filename(path);
if (dirName.CompareLeftNoCase(get_install_dir()) == 0) {
String subDir = dirName.Mid(get_install_dir().GetLength());
if (!subDir.IsEmpty() && subDir[0u] == '/')
subDir.ClipLeft(1);
dirName = ConfMan.get("path");
} else if (dirName.CompareLeftNoCase(get_save_game_directory()) == 0) {
String subDir = dirName.Mid(get_save_game_directory().GetLength());
if (!subDir.IsEmpty() && subDir[0u] == '/')
subDir.ClipLeft(1);
dirName = Path::ConcatPaths(ConfMan.get("savepath"), subDir);
// Save files listing
Common::StringArray matches = g_system->getSavefileManager()->listSavefiles(filePattern);
for (uint idx = 0; idx < matches.size(); ++idx)
files.insert(matches[idx]);
return;
}
Common::FSDirectory dir(dirName);
@ -101,7 +104,6 @@ void ListBox_FillDirList(GUIListBox *listbox, const char *filemask) {
_G(guis_need_update) = 1;
ResolvedPath rp;
ResolveScriptPath("$SAVEGAMEDIR$/agssave.*", true, rp);
if (!ResolveScriptPath(filemask, true, rp))
return;

3
engines/ags/shared/util/path.h
View File

@ -86,6 +86,9 @@ String GetPathInASCII(const String &path);
String GetCmdLinePathInASCII(const char *arg, int arg_index);
inline String get_filename(const String &pathAndName) {
size_t p = pathAndName.FindCharReverse('/');
if (p != String::npos)
return String(pathAndName.GetNullableCStr() + p + 1);
return Common::FSNode(pathAndName).getName();
}