AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into deferred_loading

Browse Source
This commit is contained in:
George FunBook
2021-02-15 15:30:29 -06:00
parent 6af7621d86 50fccded66
commit e9d0cc2bc2
22 changed files with 357 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/DialogueBox.hx
View File

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