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

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 nielsmh force-pushed the nielsmh:indproclayout branch from 77570d2 to 4123b66 Oct 4, 2019
@nielsmh

This comment has been minimized.

Copy link
Contributor Author

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 nielsmh force-pushed the nielsmh:indproclayout branch from 4123b66 to 316ac75 Oct 4, 2019
@nielsmh

This comment has been minimized.

Copy link
Contributor Author

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
@nielsmh nielsmh force-pushed the nielsmh:indproclayout branch from 316ac75 to 8f43801 Oct 4, 2019
src/industry_cmd.cpp Outdated Show resolved Hide resolved
src/industry_cmd.cpp Outdated Show resolved Hide resolved
@nielsmh nielsmh force-pushed the nielsmh:indproclayout branch from 8f43801 to 60ce6b6 Oct 5, 2019
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 force-pushed the nielsmh:indproclayout branch from 60ce6b6 to 202c667 Oct 11, 2019
@nielsmh nielsmh requested a review from LordAro Oct 13, 2019
@LordAro LordAro merged commit 53f8d0b into OpenTTD:master Oct 19, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20191011.1 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
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.