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

Actually allow maps and lua files to be placed within the campaign folder #1709

Merged

Conversation

Flamefire
Copy link
Member

Although this is documented it was not implemented.
Make both folders optional defaulting to the campaign folder.

I also restricted this to a single subfolder. If it contains anything else, i.e. a parent folder, it must be a (restricted) path as in the other path references in lua files, i.e. start with <RTTR_...> and do not contain upward references.

I also replaced the script-strings in the test by C++11 raw strings to avoid the many backslashes and quotes that make them rather hard to read.

@Flamefire Flamefire force-pushed the relative-campaign-folders branch 2 times, most recently from f1aed08 to 0e9a986 Compare October 22, 2024 09:18
@Flamefire Flamefire requested a review from Flow86 October 22, 2024 12:30
@Flamefire Flamefire force-pushed the relative-campaign-folders branch from 0e9a986 to 2a10176 Compare October 22, 2024 12:42
@Flamefire Flamefire force-pushed the relative-campaign-folders branch 3 times, most recently from cad6d09 to 1e59f0c Compare November 7, 2024 16:05
Makes the LUA code easier to read
…lder.

Although this is documented it was not implemented.
Make both folders optional defaulting to the campaign folder.
@Flamefire Flamefire force-pushed the relative-campaign-folders branch from 1e59f0c to 7d1ea2d Compare November 11, 2024 10:52
@Flamefire
Copy link
Member Author

@Flow86 ping

@Flamefire Flamefire merged commit a51f67f into Return-To-The-Roots:master Dec 4, 2024
21 checks passed
@Flamefire Flamefire deleted the relative-campaign-folders branch December 4, 2024 08:40
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.

2 participants