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 #6633: Cargo monitor industry delivery now accounts for which IndustryID the cargo was delivered to #7176

Merged
merged 1 commit into from Mar 2, 2019

Conversation

@SamuXarick
Copy link
Contributor

SamuXarick commented Feb 4, 2019

No description provided.

@PeterN
Copy link
Member

PeterN commented Feb 4, 2019

This feels wrong, somehow, but I'm not sure how yet.

src/cargomonitor.cpp Outdated Show resolved Hide resolved
src/economy.cpp Outdated Show resolved Hide resolved
@michicc
Copy link
Member

michicc commented Feb 18, 2019

I do think this is a worthwhile change as the description of the cargo monitor API clearly states that deliveries to a certain industry is monitored and not to any industries that happen to be around.

…ustryID the cargo was delivered to
@SamuXarick SamuXarick force-pushed the SamuXarick:cargo-monitor-industry-delivery branch from d76dd6c to 28e76e3 Feb 20, 2019
@michicc michicc dismissed their stale review Feb 20, 2019

Changes applied.

@TrueBrain
Copy link
Member

TrueBrain commented Mar 2, 2019

@PeterN : ever found out what feels wrong? Otherwise I suggest we go with @michicc , and approve it? :)

@michicc
michicc approved these changes Mar 2, 2019
@michicc michicc merged commit 780593a into OpenTTD:master Mar 2, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190220.14 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 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
@SamuXarick SamuXarick deleted the SamuXarick:cargo-monitor-industry-delivery branch Mar 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.