feat(filesystem): Implement access to shadowed files inside archives #1483
+356
−217
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
added
Enhancement
xezon
force-pushed
the
xezon/impl-file-instancing
branch
from
836fa3b to
bd69bc2
Compare
xezon
commented
Aug 23, 2025
| virtual Bool doesFileExist(const Char *filename) const; ///< return true if that file exists in an archive file somewhere. | ||
| virtual File* openFile( const Char *filename, Int access = 0, UnsignedInt instance = 0); ///< Search Archive files for specified file name and open it if found | ||
| virtual void closeAllFiles( void ) = 0; ///< Close all files associated with Archive files | ||
| virtual Bool doesFileExist(const Char *filename, UnsignedInt instance = 0) const; ///< return true if that file exists in an archive file somewhere. | ||
|
|
||
| void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. Scans each Archive file. |
There was a problem hiding this comment.
This change is not adding instance access to this function. I think it opens a potential rabbit hole and increase the complexity of this change.
| } | ||
|
|
||
| if ( (TheArchiveFileSystem != NULL) && (file == NULL) ) | ||
| { | ||
| file = TheArchiveFileSystem->openFile( filename ); | ||
| // TheSuperHacker @todo Pass 'access' here? |
There was a problem hiding this comment.
Something worthwhile to investigate. I did not intent to fix it in this change because the potential side effects are unknown.
xezon
force-pushed
the
xezon/impl-file-instancing
branch
from
bd69bc2 to
37f1631
Compare
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change implements access to shadowed files inside archives.
The Archive File System already kept track of all archives regardless of the shadowing, but made shadowed files inaccessible. This is now changed, which allows for some special uses cases we will run into when dealing with shadowed files of any kind. Shadowing is especially prevalent in Zero Hour, because that shadows a large amount of Generals files.
The review is quite a bit intricate given the complexity of the matter, the convuluted EA code and use of the uncommon multimap.
What is a shadowed file?
Consider the following files:
C:\GeneralsZH\art\textures\house.ddsshadowsart\textures\house.ddsinC:\GeneralsZH\TexturesZH.bigart\textures\house.ddsinC:\GeneralsZH\TexturesZH.bigshadowsart\textures\house.ddsinC:\Generals\Textures.bigWhat is changed?
File instances can now be accessed by their instance index: