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 "exec" call depth and "exec" never returning to script #8852

Merged
merged 2 commits into from Mar 13, 2021
Merged

Fix "exec" call depth and "exec" never returning to script #8852

merged 2 commits into from Mar 13, 2021

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

See #8851. Two problems are mentioned:

  • "exec" doesn't have a max depth
  • "exec" doesn't return

This PR fixes both problems at the same time.

Description

"exec" uses a global bool, which limits what you can do. Making that a depth variable solves both issues nicely.

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

LordAro
LordAro reviewed Mar 13, 2021
View reviewed changes
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

I suppose using a 'depth' parameter variable is out of the question?

@TrueBrain
Fix: calling "exec" from script never returned
5294bbb 
Example:

exec other.script
echo hello

The "echo" was never executed.
@TrueBrain
Fix OpenTTD#8851: don't allow infinite "exec" depth in script, but li…
a12ad17 
…mit to 10 deep

This means if you execute a script from a script from a script, ..
for more than 10 times, it bails out now. This should be sufficient
for even the most complex scripts.
@TrueBrain TrueBrain merged commit 5056e96 into OpenTTD:master Mar 13, 2021
@TrueBrain TrueBrain deleted the console-script-depth branch March 13, 2021 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LordAro LordAro LordAro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TrueBrain @LordAro