Allow different cutscenes to play at the same time#1107
Merged
SnipUndercover merged 2 commits intoMay 12, 2026
Conversation
SnipUndercover
approved these changes
Apr 7, 2026
maddie480-bot
added
the
1: review needed
…-cutscene-changes" This reverts commit dcc400b.
maddie480
force-pushed
the
finally-fix-999-mayhaps
branch
from
a69cdbb to
d0ce85a
Compare
Member
Author
|
Branch updated to include the restoration of PR #999 as a separate commit |
DashingCat
approved these changes
Apr 15, 2026
microlith57
approved these changes
May 9, 2026
Member
microlith57
left a comment
microlith57
left a comment
There was a problem hiding this comment.
cool! please inform lönn team about the new fields ^_^
Comment on lines
+49
to
-29
| if (Scene is not Level level) | ||
| return; | ||
|
|
||
| if (triggered) | ||
| return; | ||
|
|
||
| if (deathCount >= 0 && level.Session.DeathsInCurrentLevel != deathCount) | ||
| return; | ||
|
|
||
| if (ignoreIntroState && ((patch_Player) player).IsIntroState) | ||
| return; | ||
|
|
||
| // don't activate if the same dialog is already in progress | ||
| if (DialogCutscene.IsInProgress(dialogEntry)) | ||
| return; | ||
| } |
Member
There was a problem hiding this comment.
praise: very nice, clean guard chain
Member
|
The pull request was approved and entered the 3-day last-call window. |
maddie480-bot
added
3: last call window
Member
|
The last-call window for this pull request ended. It can now be merged if no blockers were brought up. |
maddie480-bot
added
4: ready to merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The whole reason why #999 is held in beta since forever (4 months? wow) is that triggering multiple cutscenes at once was used... by TASers I think? The compromise is to block triggering of the cutscene if a duplicate of it (as in, the same dialog, unless I missed something) is already running, not if any cutscene is running.