Compare commits

..

No commits in common. "14efed32e3abd7f37a20fc81e94048fe7e21c4e8" and "89a93407f1c6538c84ccee9909a9cf1751e2e11a" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -27,7 +27,6 @@ class Player {
this.waitTime = 0; this.waitTime = 0;
this.manualNext = false; this.manualNext = false;
this.hasMoreText = false; this.hasMoreText = false;
this.hasFadedOut = false;
this.uiHidden = false; this.uiHidden = false;
this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) }; this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) };
this.assetLoadPercent = 0; this.assetLoadPercent = 0;
@ -505,8 +504,6 @@ class Player {
//FadeTo //FadeTo
case "divaeffectcontinue": case "divaeffectcontinue":
case "fadeout": { case "fadeout": {
if(this.hasFadedOut) { break; }
this.hasFadedOut = true;
if(cur.Command.toLowerCase() === "divaeffectcontinue") { if(cur.Command.toLowerCase() === "divaeffectcontinue") {
cur.Arg1 = 'black'; cur.Arg1 = 'black';
cur.Arg6 = 1; cur.Arg6 = 1;
@ -523,7 +520,6 @@ class Player {
} }
//FadeFrom //FadeFrom
case "fadein": { case "fadein": {
this.hasFadedOut = false;
this.waitTime = Number(cur.Arg6) * 1000; this.waitTime = Number(cur.Arg6) * 1000;
if(!cur.Arg1) if(!cur.Arg1)
cur.Arg1 = 'white'; cur.Arg1 = 'white';
@ -1382,7 +1378,6 @@ class Player {
this.lerpTargets = []; this.lerpTargets = [];
this.manualNext = false; this.manualNext = false;
this.hasMoreText = false; this.hasMoreText = false;
this.hasFadedOut = false;
this.audioLoadPercent = 0; this.audioLoadPercent = 0;
this.assetLoadPercent = 0; this.assetLoadPercent = 0;
this.playingVoice = undefined; this.playingVoice = undefined;

@ -1 +1 @@
Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec Subproject commit c8e9be400b68111bd1abfb879205e2f07d91d1a5