Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
y-lohse committed Sep 21, 2016
2 parents 9637fdf + 66488b2 commit f4aa6ac
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions engine/Story.js
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ export class Story extends InkObject{
var resultSeed = this.state.storySeed + this.state.previousRandom;
var random = new PRNG(resultSeed);

var nextRandom = random.Next();
var nextRandom = random.next();
var chosenValue = (nextRandom % randomRange) + minInt.value;
this.state.PushEvaluationStack(new IntValue(chosenValue));

Expand All @@ -742,7 +742,7 @@ export class Story extends InkObject{
this.state.previousRandom = 0;

// SEED_RANDOM returns nothing.
this.state.PushEvaluationStack(new Runtime.Void());
this.state.PushEvaluationStack(new Void());
break;

case ControlCommand.CommandType.VisitIndex:
Expand Down Expand Up @@ -893,6 +893,7 @@ export class Story extends InkObject{
try {
funcContainer = this.ContentAtPath(new Path(functionName));
} catch (e) {
console.log(e);
if (e.message.indexOf("not found") >= 0)
throw "Function doesn't exist: '" + functionName + "'";
else
Expand Down

0 comments on commit f4aa6ac

Please sign in to comment.