Merge pull request #357 from lotusotho/senpaidialoguebug-fix

Fixed bug that makes the whole game crash at the start of week 6
This commit is contained in:
Cameron Taylor 2021-02-14 19:44:41 -05:00 committed by GitHub
commit 5d96dc44e0

View file

@ -171,13 +171,13 @@ class DialogueBox extends FlxSpriteGroup
dialogueStarted = true; dialogueStarted = true;
} }
if (FlxG.keys.justPressed.ANY) if (FlxG.keys.justPressed.ANY && dialogueStarted == true)
{ {
remove(dialogue); remove(dialogue);
FlxG.sound.play('assets/sounds/clickText' + TitleState.soundExt, 0.8); FlxG.sound.play('assets/sounds/clickText' + TitleState.soundExt, 0.8);
if (dialogueList[1] == null) if (dialogueList[1] == null && dialogueList[0] != null)
{ {
if (!isEnding) if (!isEnding)
{ {
@ -209,7 +209,7 @@ class DialogueBox extends FlxSpriteGroup
startDialogue(); startDialogue();
} }
} }
super.update(elapsed); super.update(elapsed);
} }
@ -218,7 +218,6 @@ class DialogueBox extends FlxSpriteGroup
function startDialogue():Void function startDialogue():Void
{ {
cleanDialog(); cleanDialog();
// var theDialog:Alphabet = new Alphabet(0, 70, dialogueList[0], false, true); // var theDialog:Alphabet = new Alphabet(0, 70, dialogueList[0], false, true);
// dialogue = theDialog; // dialogue = theDialog;
// add(theDialog); // add(theDialog);