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

Fix #22: Try to find data files if wrong case for non-Windows platforms #33

Merged
merged 2 commits into from Jan 24, 2018

Conversation

IntelOrca
Copy link
Collaborator

No description provided.

@janisozaur
Copy link
Contributor

janisozaur commented Jan 24, 2018

CI builds, but suggests formatting changes: https://travis-ci.org/OpenRCT2/OpenLoco/builds/332570277. Code LGTM, but haven't tested it. That might need hooking in some places for #14?

@IntelOrca
Copy link
Collaborator Author

IntelOrca commented Jan 24, 2018

How do I auto format? Is there a script I can run?

This should allow #14 to remove the case change to one of the paths. What do you mean by hooking? There is no interop here except the initial hook to get_file_path.

@janisozaur
Copy link
Contributor

clang-format -i -style=file <path/to/file.cpp>

@IntelOrca IntelOrca changed the title Try to find data files if wrong case for non-Windows platforms Fix #22: Try to find data files if wrong case for non-Windows platforms Jan 24, 2018
@AaronVanGeffen
Copy link
Member

AaronVanGeffen commented Jan 24, 2018

Tested this on top of #12, which works. Renamed a few DAT files, including my g1.DAT to use different casing. ~~~Unfortunately, this does lead to them no longer being found, so this patch doesn't seem to have the intended effect.~~~

This happened because validate_loco_install_path was not using the routine. I've added a quick patch.

Copy link
Contributor

@janisozaur janisozaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given @AaronVanGeffen already tested it, the code looks good.

@janisozaur janisozaur merged commit 43737a3 into master Jan 24, 2018
@janisozaur janisozaur deleted the fix/wrong-cased-paths branch January 24, 2018 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants