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: Depot building cost does not include foundation build cost (#6875) #6883

Merged
merged 1 commit into from Aug 14, 2018

Conversation

Projects
None yet
4 participants
@JGRennison
Contributor

JGRennison commented Aug 11, 2018

Fixes issue #6875

@LordAro

Part of me wonders how feasible it is to extract half of those functions into a common function, given how they're basically identical. Probably not worth the effort though

@LordAro LordAro removed the needs-review label Aug 12, 2018

@michicc

This comment has been minimized.

Show comment
Hide comment
@michicc

michicc Aug 13, 2018

Member

Is it still a clean rebase with the track building regression update?

Member

michicc commented Aug 13, 2018

Is it still a clean rebase with the track building regression update?

Fix: Depot building cost does not include foundation build cost (#6875)
Update AI regression test results file to match
@JGRennison

This comment has been minimized.

Show comment
Hide comment
@JGRennison

JGRennison Aug 14, 2018

Contributor

It doesn't conflict with the AI/script track building changes.

For the avoidance of doubt I have rebased it.

Contributor

JGRennison commented Aug 14, 2018

It doesn't conflict with the AI/script track building changes.

For the avoidance of doubt I have rebased it.

@michicc michicc merged commit df92a05 into OpenTTD:master Aug 14, 2018

6 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
openttd/commit-checker The commit looks good
Details
openttd/linux-amd64-clang-3.8 The commit looks good
Details
openttd/linux-amd64-gcc-6 The commit looks good
Details
openttd/linux-i386-gcc-6 The commit looks good
Details
openttd/osx-10.9 The commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment