[Scummvm-git-logs] scummvm master -> 8998fe97416d26dc4064322406e7838c42dca81a

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8998fe9741 AGS: Strip off game Id prefix when loading savegame file list


Commit: 8998fe97416d26dc4064322406e7838c42dca81a
    https://github.com/scummvm/scummvm/commit/8998fe97416d26dc4064322406e7838c42dca81a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-04T16:00:46-07:00

Commit Message:
AGS: Strip off game Id prefix when loading savegame file list

Changed paths:
    engines/ags/engine/ac/listbox.cpp


diff --git a/engines/ags/engine/ac/listbox.cpp b/engines/ags/engine/ac/listbox.cpp
index 97c9550e59..a367817c00 100644
--- a/engines/ags/engine/ac/listbox.cpp
+++ b/engines/ags/engine/ac/listbox.cpp
@@ -65,6 +65,20 @@ void ListBox_Clear(GUIListBox *listbox) {
 	listbox->Clear();
 }
 
+static void FillSaveList(std::set<String> &files, const String &filePattern) {
+	size_t wildcard = filePattern.FindChar('*');
+	assert(wildcard != String::npos);
+	Common::String prefix(filePattern.GetCStr(), wildcard);
+	Common::StringArray matches = g_system->getSavefileManager()->listSavefiles(filePattern);
+
+	for (uint idx = 0; idx < matches.size(); ++idx) {
+		Common::String name = matches[idx];
+		name = Common::String(name.c_str() + wildcard);
+
+		files.insert(name);
+	}
+}
+
 void FillDirList(std::set<String> &files, const String &path) {
 	String dirName = Path::GetDirectoryPath(path);
 	String filePattern = Path::get_filename(path);
@@ -76,9 +90,7 @@ void FillDirList(std::set<String> &files, const String &path) {
 		dirName = ConfMan.get("path");
 	} else if (dirName.CompareLeftNoCase(get_save_game_directory()) == 0) {
 		// Save files listing
-		Common::StringArray matches = g_system->getSavefileManager()->listSavefiles(filePattern);
-		for (uint idx = 0; idx < matches.size(); ++idx)
-			files.insert(matches[idx]);
+		FillSaveList(files, filePattern);
 		return;
 	}