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

Core ink fix: callstack used for external function #52

Closed
wants to merge 1 commit into from
Closed

Core ink fix: callstack used for external function #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions engine/StoryState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,11 @@ export class StoryState{
// Create a new base call stack element.
this.callStack = new CallStack(funcContainer);
this.callStack.currentElement.type = PushPopType.Function;

// The variablesState object needs to track the callstack
// we're using so temp variables are created in the right place.
// We'll reset this when we restore the original callstack.
this._variablesState._callStack = this.callStack;

// By setting ourselves in external function evaluation mode,
// we're saying it's okay to end the flow without a Done or End,
Expand Down Expand Up @@ -652,6 +657,7 @@ export class StoryState{
this.callStack = this._originalCallstack;
this._originalCallstack = null;
this._originalEvaluationStackHeight = 0;
this._variablesState._callStack = this.callStack;

if (returnedObj) {
if (returnedObj instanceof Void)
Expand Down