Fix trigger action updates and dialogue continuation semantics#101
Merged
modawan merged 1 commit intomodawan:masterfrom Apr 25, 2026
Merged
Fix trigger action updates and dialogue continuation semantics#101modawan merged 1 commit intomodawan:masterfrom
modawan merged 1 commit intomodawan:masterfrom
Conversation
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
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.
Summary
This PR contains the gameplay/runtime fixes split out from the earlier mixed branch.
Included:
Object::update(dt)fix so delayed/queued trigger actions actually advanceClearAllActions()Area::startDialog()fix to use the resolved conversation resrefNot included:
ClearAllActions note
The failure mode here is that the currently executing front action can call
ClearAllActions()on its owner while it is still running. The old implementation trims from the back, which can delete the queued continuation that the current action is about to hand off to.This PR tracks the currently executing action via
_executingActionand preserves that active front action and its continuation chain whenclearAllActions(false)is called during execution.I did not use a temporary
Action::lock()approach here because the goal is not just to preserve the executing action object; it is to preserve the active front-of-queue handoff/continuation semantics without changing the broader action-locking model.Verification
Expected sibling PR overlap
This branch may need a small follow-up rebase if the dev-tools PR lands first.
Expected overlap is limited to:
src/libs/game/object/area.cppsrc/libs/game/object/trigger.cpp