Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMMON: Add ignoreClashes flag to SearchSet and FSDirectory #1899

Merged
merged 1 commit into from Nov 2, 2019

Conversation

@lephilousophe
Copy link
Member

lephilousophe commented Oct 20, 2019

This lets engine mute warnings about name clashes when there are useless
for its case. This will be used by Versailles as the tree has
directories with the same name at various places.
Files are duplicated too in different directories but are identical.

I removed the mutable flag on _depth and _flat as they shouldn't have it. Their change on a const object would change behaviour of the object.

@lephilousophe lephilousophe force-pushed the lephilousophe:ignore-clashes branch 2 times, most recently from 71fb48e to 63aa9b4 Oct 20, 2019
@lephilousophe

This comment has been minimized.

Copy link
Member Author

lephilousophe commented Oct 20, 2019

After talking with @sev-, we agreed that using a flag instead of adding a new argument was better.

This lets engine mute warnings about name clashes when there are useless
for its case. This will be used by Versailles as the tree has
directories with the same name at various places.
Files are duplicated too in different directories but are identical.
@lephilousophe lephilousophe force-pushed the lephilousophe:ignore-clashes branch from 63aa9b4 to 3491c09 Oct 22, 2019
@sev-

This comment has been minimized.

Copy link
Member

sev- commented Nov 2, 2019

Looks good, thanks!

@sev- sev- merged commit d62bb15 into scummvm:master Nov 2, 2019
2 checks passed
2 checks passed
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@lephilousophe lephilousophe deleted the lephilousophe:ignore-clashes branch Nov 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.