Fix: Train running sounds should only be produced for engine parts. #12229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wagons were excluded, but articulated parts and second multihead parts should be excluded too.
2TallTyler
approved these changes
Mar 8, 2024
TrueBrain
pushed a commit
to TrueBrain/OpenTTD
that referenced
this pull request
Mar 16, 2024
PeterN
added a commit
to PeterN/OpenTTD
that referenced
this pull request
Apr 14, 2024
…d correctly. OpenTTD#12229 stopped updating motion_counter for non-engine parts of trains, and in doing so accidentally followed the spec for NewGRF var 46, which breaks NewGRFs that used to... accidentally work. Make var 46 return motion_counter of the first engine, regardless of self or parent scope. This means var 46 is always in sync with the head engine, and avoids further changes to when motion_counter is updated.
PeterN
added a commit
to PeterN/OpenTTD
that referenced
this pull request
Apr 23, 2024
…arts. NewGRFs relied on the incorrectly motion counter that was 'fixed' in OpenTTD#12229, so always update v->motion_counter for all vehicle parts.
PeterN
added a commit
that referenced
this pull request
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation / Problem
Train running sounds should only be produced for normal engine parts. Wagons were already excluded, but articulated parts and second multihead parts should be excluded too.
Description
Check for
!IsEngine()instead ofIsWagon(), as, like wagons, articulated parts and second multihead parts are not flagged as engines.Limitations
This does not seem to be in the spec for vehicle running sounds, however it is in the code for TTDPatch, where subclass is checked to be 0:
https://github.com/ttdpatch/ttdpatch/blob/a88a0bf794ed0f085f7cd8fba682d060ab4789c9/patches/vehspri.asm#L1150
At this point is probably doesn't really matter what TTDPatch did, however this feature is seldom used, and one reason for that is that OpenTTD didn't match TTDPatch.
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.