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: Swap modern/old bus sounds #32

Merged
merged 2 commits into from Mar 23, 2021
Merged

Fix: Swap modern/old bus sounds #32

merged 2 commits into from Mar 23, 2021

Conversation

Wuzzy2
Copy link
Contributor

@Wuzzy2 Wuzzy2 commented Mar 13, 2021

Whoops! I just noticed the sounds for modern bus and old bus were swapped. (no. 27 and 28)
Meaning the sound that should be for the modern bus is actually and old bus sound, and vice-versa.
You can test this in Temperate climate with the Hereford Leopard Bus (should be 'old bus' sound) and the Foster Bus (should be 'modern bus' sound).

Look into src/sound_type.h and src/table/engine.h in OpenTTD for reference, here you can clearly see the sounds in OpenSFX are swapped (so I am not just imagining this problem ;-) )

This PR fixes this by swapping both sounds, so they are correct. Note these sounds were swapped since forever (I tested this in older versions of OpenSFX/OpenTTD), this has nothing to do with my recent OpenSFX “liberation”.

I noticed this while looking at the newly reworked file src/sound_type.h in OpenTTD.

The sounds for modern bus and old bus were swapped. They have to be the other
way around, src/sound_type.h in OpenTTD.
@Wuzzy2
Copy link
Contributor Author

@Wuzzy2 Wuzzy2 commented Mar 13, 2021

In this PR I also updated the other sound descriptions to be consistent with src/sound_type.h.

@orudge
Copy link
Contributor

@orudge orudge commented Mar 17, 2021

I will take a look at this when I get a chance - can look at doing a 1.0.1 release then if necessary.

@Wuzzy2
Copy link
Contributor Author

@Wuzzy2 Wuzzy2 commented Mar 17, 2021

Yes. Besides, I think a new release would make sense anyway once OpenSFX has piled up a couple of new translations. ;-)

@planetmaker
Copy link
Contributor

@planetmaker planetmaker commented Mar 17, 2021

Did the requirements for a release change? Previously it just needed tagging and the build system did the rest. And then the build artefact was uploaded to bananas once confirmed build showed correctly ingame.

@orudge
Copy link
Contributor

@orudge orudge commented Mar 17, 2021

@planetmaker No, that's all that needs doing now. The changelog, etc, of course needs to be updated manually first.

@Wuzzy2
Copy link
Contributor Author

@Wuzzy2 Wuzzy2 commented Mar 17, 2021

To be clear: I am fine with a quick bugfix release for this, even if it does not include new translations. It's always possible to do another release once enough translations have arrived.

@LordAro
Copy link
Member

@LordAro LordAro commented Mar 22, 2021

Now that translations are automated, best to just cut a release just before doing the "main" OTTD release

orudge
orudge approved these changes Mar 23, 2021
Copy link
Contributor

@orudge orudge left a comment

Tested, seems fine.

@orudge orudge merged commit 84d7315 into OpenTTD:master Mar 23, 2021
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants