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 #7159, e934f09: Waiting time at red one-way signals was too short. #7252

Merged
merged 1 commit into from Feb 21, 2019

Conversation

@michicc
Copy link
Member

michicc commented Feb 19, 2019

This is not an exact fix as previously, the wait time was speed/acceleration dependant. This simple fix ignores that and just makes it somewhat right.

@michicc
Copy link
Member Author

michicc commented Feb 19, 2019

If pf.wait_oneway_signal is supposed to be in days, the "correct" factor would be DAY_TICKS * 2.

@PeterN
Copy link
Member

PeterN commented Feb 20, 2019

byte wait_oneway_signal; ///< waitingtime in days before a oneway signal
So it looks like days is the intention, if not the implementation. That's been the comment since initial import of crashed SVN.

This is not an exact fix as previously, the wait time was speed/acceleration dependant. This simple fix ignores that and just makes the 'days' from the settings comment to be actually days.
@michicc michicc force-pushed the michicc:pr/7159 branch from 607baf9 to 1e0c90a Feb 20, 2019
@michicc
Copy link
Member Author

michicc commented Feb 20, 2019

Updated so the wait time for one-way and two-way signals is in fact given in days.

@LordAro LordAro merged commit 690d1dd into OpenTTD:master Feb 21, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190220.21 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
@michicc michicc deleted the michicc:pr/7159 branch Feb 21, 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

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