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.

Sign up for GitHub

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

Remove bogus onlayer parsing on scene statements #3991

Merged
merged 2 commits into from Jan 5, 2023
Merged

Remove bogus onlayer parsing on scene statements #3991

merged 2 commits into from Jan 5, 2023

Conversation

Gouvernathor
Copy link
Member

@Gouvernathor Gouvernathor commented Sep 23, 2022 •
edited 

label scn:
    scene sand6
    "scene sand6"
    scene wet onlayer screens
    "scene wet onlayer screens"
    # scene onlayer screens bashar onlayer master
    # "scene onlayer screens bashar onlayer master"
    # scene onlayer master sand6 onlayer screens
    # "scene onlayer master sand6 onlayer screens"
    scene
    "scene"
    # scene onlayer screens wet
    # "scene onlayer screens wet"
    scene onlayer screens
    "scene onlayer screens"
    jump scn

The commented-out lines were previously bogus, as they didn't raise a parsing error but their first onlayer clause was silently ignored.
Now, they raise parsing errors.
Fei, the separate onlayer parsing is required for the last scene statement to function properly.

This PR offers no compat, for the same reasons as in ddc4eab.
But if one is requested, I have a lead on how to do it differently.

@Gouvernathor
Remove bogus onlayer parsing on scene statements
fccda46 
The layer variable was never used, c77a113 contained that mistake all along
@Gouvernathor Gouvernathor linked an issue Sep 23, 2022 that may be closed by this pull request
duplicate onlayer allowed in scene statement #3966
Closed
@Gouvernathor Gouvernathor marked this pull request as draft December 10, 2022 21:42
@Gouvernathor Gouvernathor marked this pull request as ready for review January 3, 2023 14:32
@renpytom renpytom merged commit 3e14e1f into master Jan 5, 2023
@renpytom renpytom deleted the fix-3966 branch January 5, 2023 03:10
@Gouvernathor Gouvernathor mentioned this pull request Jun 5, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Booplicate Booplicate Booplicate left review comments

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

Successfully merging this pull request may close these issues.

duplicate onlayer allowed in scene statement
3 participants
@Gouvernathor @Booplicate @renpytom