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 #10331: Starting new company during load must happen after AI start. #10332

Merged
merged 1 commit into from Jan 8, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Jan 8, 2023

Motivation / Problem

As per #10331, Loading old savegame with only an AI in it

Starting new company during load must happen after AI start. This situation occurs when loading a savegame in single-player which only has AI companies.

Description

This is resolved by moving the section that creates the new player to the end of the AfterLoadGame() function, just after AI/scripts are started.

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

@PeterN PeterN added the backport requested This PR should be backport to current release (RC / stable) label Jan 8, 2023
… AI start.

This situation occurs when loading a savegame in single-player which only
has AI companies.
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yet another AfterLoadGame() hit.

@rubidium42
Copy link
Contributor

Tested with only AI companies; works fine in 13-RC1 and with this fix.
Tested with 14 AI companies and 1 empty slot: crashes in 13-RC1 and works fine with this fix.

@James103
Copy link
Contributor

James103 commented Jan 8, 2023

Tested with only AI companies

Did you mean "tested with 15 AI companies and no empty slots"?

@PeterN PeterN merged commit c18a171 into OpenTTD:master Jan 8, 2023
@PeterN PeterN deleted the fix-10331 branch January 8, 2023 18:09
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Jan 27, 2023
… AI start. (OpenTTD#10332)

This situation occurs when loading a savegame in single-player which only
has AI companies.
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Jan 28, 2023
… AI start. (OpenTTD#10332)

This situation occurs when loading a savegame in single-player which only
has AI companies.
michicc pushed a commit that referenced this pull request Jan 28, 2023
…rt. (#10332)

This situation occurs when loading a savegame in single-player which only
has AI companies.
@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 Jan 28, 2023
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

5 participants