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

Codechange: Use std::vector for industry tile layouts #7759

Merged
merged 1 commit into from Oct 19, 2019

Conversation

@nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Oct 4, 2019

This is secretly preparation for implementing procedural industry layouts, as you can tell by the branch name.

Tested working with default industries, FIRS 2, FIRS 3, SPI 1.32, and several ECS vectors.

@nielsmh
Copy link
Contributor Author

@nielsmh nielsmh commented Oct 4, 2019

The issues with (undefined string) in error message about industries that could not be placed on map also occurs in master.

The issue with ECS Agricultural vector causing crashes in string handling only occurs with these changes.

@nielsmh
Copy link
Contributor Author

@nielsmh nielsmh commented Oct 4, 2019

The fix in #7760 also resolves the ECS Agricultural vector crash.

@nielsmh nielsmh marked this pull request as ready for review Oct 4, 2019
src/newgrf.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/newgrf.cpp Outdated Show resolved Hide resolved
src/table/build_industry.h Show resolved Hide resolved
@nielsmh nielsmh requested a review from LordAro Oct 13, 2019
@LordAro LordAro merged commit 53f8d0b into OpenTTD:master Oct 19, 2019
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants