[Scummvm-git-logs] scummvm master -> 68bab251523b1acd2c1d78ebf002d6ac70aa2fb6

[sev-]

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:
68bab25152 ALL: Fix compilation


Commit: 68bab251523b1acd2c1d78ebf002d6ac70aa2fb6
    https://github.com/scummvm/scummvm/commit/68bab251523b1acd2c1d78ebf002d6ac70aa2fb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-08T01:31:13+01:00

Commit Message:
ALL: Fix compilation

Changed paths:
    engines/stark/formats/xarc.cpp
    engines/stark/formats/xarc.h
    engines/ultima/shared/engine/data_archive.cpp
    engines/ultima/shared/engine/data_archive.h


diff --git a/engines/stark/formats/xarc.cpp b/engines/stark/formats/xarc.cpp
index 3ec8baf5cbd..ff69b2caa03 100644
--- a/engines/stark/formats/xarc.cpp
+++ b/engines/stark/formats/xarc.cpp
@@ -146,7 +146,7 @@ bool XARCArchive::hasFile(const Common::Path &path) const {
 	return false;
 }
 
-int XARCArchive::listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern) const {
+int XARCArchive::listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern, bool matchPathComponents) const {
 	Common::String patternString = pattern.toString();
 	int matches = 0;
 	for (Common::ArchiveMemberList::const_iterator it = _members.begin(); it != _members.end(); ++it) {
diff --git a/engines/stark/formats/xarc.h b/engines/stark/formats/xarc.h
index 9107f40bb12..d7cc70a365d 100644
--- a/engines/stark/formats/xarc.h
+++ b/engines/stark/formats/xarc.h
@@ -37,7 +37,7 @@ public:
 
 	// Archive API
 	bool hasFile(const Common::Path &path) const;
-	int listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern) const;
+	int listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern, bool matchPathComponents = false) const;
 	int listMembers(Common::ArchiveMemberList &list) const;
 	const Common::ArchiveMemberPtr getMember(const Common::Path &path) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const;
diff --git a/engines/ultima/shared/engine/data_archive.cpp b/engines/ultima/shared/engine/data_archive.cpp
index 58f809daa19..e5192b99470 100644
--- a/engines/ultima/shared/engine/data_archive.cpp
+++ b/engines/ultima/shared/engine/data_archive.cpp
@@ -124,7 +124,7 @@ bool UltimaDataArchive::hasFile(const Common::Path &path) const {
 	return _zip->hasFile(realFilename);
 }
 
-int UltimaDataArchive::listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern) const {
+int UltimaDataArchive::listMatchingMembers(Common::ArchiveMemberList &list, const Common::Path &pattern, bool matchPathComponents) const {
 	Common::String patt = pattern.toString();
 	if (patt.hasPrefixIgnoreCase(_publicFolder))
 		patt = innerToPublic(patt);
diff --git a/engines/ultima/shared/engine/data_archive.h b/engines/ultima/shared/engine/data_archive.h
index 8231bf4d24c..bf880a48ab7 100644
--- a/engines/ultima/shared/engine/data_archive.h
+++ b/engines/ultima/shared/engine/data_archive.h
@@ -80,7 +80,7 @@ public:
 	 * @return the number of members added to list
 	 */
 	int listMatchingMembers(Common::ArchiveMemberList &list,
-		const Common::Path &pattern) const override;
+		const Common::Path &pattern, bool matchPathComponents = false) const override;
 
 	/**
 	 * Add all members of the Archive to list.
@@ -147,7 +147,7 @@ public:
 	 * @return the number of members added to list
 	 */
 	int listMatchingMembers(Common::ArchiveMemberList &list,
-			const Common::Path &pattern) const override {
+			const Common::Path &pattern, bool matchPathComponents = false) const override {
 		return 0;
 	}