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: [Script] ScriptSubsidy::GetExpireDate should return an economy-date #12372

Merged
merged 1 commit into from Mar 28, 2024

Conversation

frosch123
Copy link
Member

Motivation / Problem

As discussed in #12339:

Currently ScriptSubsidy::GetExpireDate adds economy-months to ScriptDate::GetDate.
If ScriptTimeMode is set to CalendarTime, this will add economy-months to a calendar-date, which makes no sense.

Description

ScriptSubsidy::GetExpireDate should always return an economy-date.

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, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@frosch123 frosch123 added the backport requested This PR should be backport to current release (RC / stable) label Mar 24, 2024
@michicc michicc merged commit 907cb4f into OpenTTD:master Mar 28, 2024
15 checks passed
zacc pushed a commit to zacc/OpenTTD that referenced this pull request Mar 31, 2024
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Mar 31, 2024
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Mar 31, 2024
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Mar 31, 2024
@michicc michicc 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 Mar 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants