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

Jump to bottom

Fix #9630: intro game could zoom in/out more than allowed by settings #9633

Merged
merged 1 commit into from Oct 20, 2021
Merged

Fix #9630: intro game could zoom in/out more than allowed by settings #9633

merged 1 commit into from Oct 20, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Oct 20, 2021 •
edited

Also fixes #9622

Motivation / Problem

I couldn't reproduce the crash until I got the crucial info, intro game crashes when Maximum zoom in level is set to normal (gui.zoom_min = 2).

Description

Respect gui.zoom_min and gui.zoom_max when animating intro game.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@glx22 glx22 changed the title Fix #9630, #9622: intro game could zoom in/out more than allowed by settings Fix #9630: intro game could zoom in/out more than allowed by settings Oct 20, 2021
@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Oct 20, 2021
@glx22 glx22 merged commit bc1b84c into OpenTTD:master Oct 20, 2021
@glx22 glx22 deleted the fix_9630 branch October 20, 2021 20:08
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Oct 23, 2021
@glx22 @TrueBrain
Fix OpenTTD#9630: intro game could zoom in/out more than allowed by s…
cdc7c1f 
…ettings (OpenTTD#9633)

Also fixes OpenTTD#9622
@TrueBrain TrueBrain mentioned this pull request Oct 23, 2021
Merged
TrueBrain pushed a commit that referenced this pull request Oct 23, 2021
@glx22 @TrueBrain
Fix #9630: intro game could zoom in/out more than allowed by settings (…
61479fd 
…#9633)

Also fixes #9622
@TrueBrain TrueBrain added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Oct 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frosch123 frosch123 frosch123 approved these changes

Assignees
No one assigned
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Crash]: OpenTTD 12.0 crashes on startup when zoom_min / zoom_max config values are non-default
4 participants
@glx22 @frosch123 @TrueBrain @LordAro