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 #7945: Add cost of clearing the sloped tile when placing a dock #7947

Merged

Conversation

@SamuXarick
Copy link
Contributor

@SamuXarick SamuXarick commented Jan 17, 2020

#7945

@SamuXarick SamuXarick force-pushed the dock-add-cost-of-clearing-sloped-tile branch from 99e8fe5 to fc2bacf Jan 17, 2020
@LordAro
Copy link
Member

@LordAro LordAro commented Jan 18, 2020

I think this should be 2 commits - the first 2 - (Add cost of... + regression fix) & and the next 2 (Using "Change: Allow..." commit message). Can you squash together accordingly?

@SamuXarick SamuXarick force-pushed the dock-add-cost-of-clearing-sloped-tile branch from 8f37ea1 to 3085ca8 Jan 18, 2020
Copy link
Member

@LordAro LordAro left a comment

I think this is fine, but I'd like to see a review from someone else first...

@SamuXarick SamuXarick force-pushed the dock-add-cost-of-clearing-sloped-tile branch from 3085ca8 to 56dd2d5 Feb 9, 2020
src/station_cmd.cpp Outdated Show resolved Hide resolved
@glx22 glx22 dismissed their stale review May 10, 2020

misreading

@nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Jun 29, 2020

Needs conflict resolved in regression test result.txt before this can merge. (The file was moved in the CMake change.)

@SamuXarick SamuXarick force-pushed the dock-add-cost-of-clearing-sloped-tile branch from 56dd2d5 to d1acb81 Jul 12, 2020
@SamuXarick SamuXarick force-pushed the dock-add-cost-of-clearing-sloped-tile branch from d1acb81 to 42c9a11 Dec 17, 2020
@TrueBrain TrueBrain force-pushed the dock-add-cost-of-clearing-sloped-tile branch from 42c9a11 to 8ad11bd Jan 7, 2021
@TrueBrain
Copy link
Member

@TrueBrain TrueBrain commented Jan 7, 2021

I removed the second commit from this PR; I have no clue what it is doing, why it is there, or why we would want it. It contains no documentation of the change, no reference to what it fixes, etc etc etc. Seems some people never learn ;)

The other commit is valid, and resolves a bug.

@TrueBrain TrueBrain merged commit f84a466 into OpenTTD:master Jan 7, 2021
8 checks passed
@SamuXarick SamuXarick deleted the dock-add-cost-of-clearing-sloped-tile branch Jan 7, 2021
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

6 participants