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

Codechange: Add constants for original input/output cargo counts. #12548

Merged
merged 1 commit into from
Apr 20, 2024

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Apr 20, 2024

Motivation / Problem

House, industry and industry tiles used to have 2 or 3 cargo slots, which was increased to 16 a long time ago.

However there are still many places that need to refer to the original 2 or 3 slot counts, due to compatibility with loading old savegames, NewGRF properties, or NewGRF callbacks.

These instances all use a hand craft 2 or 3.

Description

Add HOUSE_ORIGINAL_NUM_ACCEPTS, INDUSTRY_ORIGINAL_NUM_INPUTS and INDUSTRY_ORIGINAL_NUM_OUTPUTS and use them at relevant places that I can find.

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')

@PeterN PeterN merged commit 959ced7 into OpenTTD:master Apr 20, 2024
14 checks passed
@PeterN PeterN deleted the original-cargo-constants branch April 20, 2024 19:50
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

2 participants