diff --git a/Js/Player.js b/Js/Player.js index 8a6aa1d..99ab45e 100644 --- a/Js/Player.js +++ b/Js/Player.js @@ -27,6 +27,7 @@ class Player { this.waitTime = 0; this.manualNext = false; this.hasMoreText = false; + this.hasFadedOut = false; this.uiHidden = false; this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) }; this.assetLoadPercent = 0; @@ -504,6 +505,8 @@ class Player { //FadeTo case "divaeffectcontinue": case "fadeout": { + if(this.hasFadedOut) { break; } + this.hasFadedOut = true; if(cur.Command.toLowerCase() === "divaeffectcontinue") { cur.Arg1 = 'black'; cur.Arg6 = 1; @@ -520,6 +523,7 @@ class Player { } //FadeFrom case "fadein": { + this.hasFadedOut = false; this.waitTime = Number(cur.Arg6) * 1000; if(!cur.Arg1) cur.Arg1 = 'white'; @@ -1378,6 +1382,7 @@ class Player { this.lerpTargets = []; this.manualNext = false; this.hasMoreText = false; + this.hasFadedOut = false; this.audioLoadPercent = 0; this.assetLoadPercent = 0; this.playingVoice = undefined; diff --git a/Js/Translations b/Js/Translations index c8e9be4..ac0bfbd 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit c8e9be400b68111bd1abfb879205e2f07d91d1a5 +Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec