From 8b929a584fac5022bfc6d061685326e68e2a5588 Mon Sep 17 00:00:00 2001 From: lolbot-iichan Date: Thu, 6 Jun 2019 07:07:16 +0300 Subject: WINTERMUTE: Show warning on running 2.5D games This is shown for the 2 games added in 0d8834b5616aa8fc936c750ed92ef4423610d641, as both of them use ACTOR3DX entities, i.e. 3D models, which are not supported in ScummVM --- engines/wintermute/base/base_file_manager.cpp | 4 ++++ engines/wintermute/base/base_file_manager.h | 1 + engines/wintermute/base/file/base_package.cpp | 1 + 3 files changed, 6 insertions(+) (limited to 'engines/wintermute/base') diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index 05830ffcd8..b026bbee56 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -337,6 +337,10 @@ bool BaseFileManager::hasFile(const Common::String &filename) { return false; } +int BaseFileManager::listMatchingMembers(Common::ArchiveMemberList &list, const Common::String &pattern) { + return _packages.listMatchingMembers(list, pattern); +} + ////////////////////////////////////////////////////////////////////////// Common::SeekableReadStream *BaseFileManager::openFile(const Common::String &filename, bool absPathWarning, bool keepTrackOf) { if (strcmp(filename.c_str(), "") == 0) { diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index d953e44704..2c67d83462 100644 --- a/engines/wintermute/base/base_file_manager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -42,6 +42,7 @@ public: bool closeFile(Common::SeekableReadStream *File); bool hasFile(const Common::String &filename); + int listMatchingMembers(Common::ArchiveMemberList &list, const Common::String &pattern); Common::SeekableReadStream *openFile(const Common::String &filename, bool absPathWarning = true, bool keepTrackOf = true); byte *readWholeFile(const Common::String &filename, uint32 *size = nullptr, bool mustExist = true); diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index ae4955390b..b80547f509 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -206,6 +206,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool fileEntry->_length = length; fileEntry->_compressedLength = compLength; fileEntry->_flags = flags; + fileEntry->_filename = upcName; _files[upcName] = Common::ArchiveMemberPtr(fileEntry); } else { -- cgit v1.2.3