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

Various tracktype related fixes #7863

Merged
merged 6 commits into from Dec 23, 2019
Merged

Various tracktype related fixes #7863

merged 6 commits into from Dec 23, 2019

Conversation

@frosch123
Copy link
Member

frosch123 commented Dec 17, 2019

No description provided.

@frosch123 frosch123 force-pushed the frosch123:nrtfix1 branch from 9443180 to 7a10ea5 Dec 17, 2019
count[GetRailType(t)]++;
RailType rt;
switch (_settings_client.gui.default_rail_type) {
case 2: {

This comment has been minimized.

Copy link
@LordAro

LordAro Dec 18, 2019

Member

Perhaps a separate enum would be better, rather than the magic numbers

This comment has been minimized.

Copy link
@planetmaker

planetmaker Dec 22, 2019

Contributor

I've the feeling that these fixes should go into master before 1.10.0 is released :D

@LordAro LordAro added this to the 1.10.0 milestone Dec 23, 2019
Copy link
Member

LordAro left a comment

enums can come later

@LordAro LordAro merged commit b769eb3 into OpenTTD:master Dec 23, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20191217.4 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

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