cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 09:13:18 +00:00
Code Issues Releases Wiki Activity

lil dating sim things

Browse source
This commit is contained in:
Cameron Taylor 2021-02-02 02:35:35 -05:00
parent 385097941c
commit 60c4367896
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/DialogueBox.hx
View file

@ -130,7 +130,7 @@ class DialogueBox extends FlxSpriteGroup
dialogueStarted = true; dialogueStarted = true;
} }
if (FlxG.keys.justPressed.SPACE) if (FlxG.keys.justPressed.ANY)
{ {
remove(dialogue); remove(dialogue);

6
source/PlayState.hx
View file

@ -116,6 +116,8 @@ class PlayState extends MusicBeatState
// how big to stretch the pixel art assets // how big to stretch the pixel art assets
public static var daPixelZoom:Float = 6; public static var daPixelZoom:Float = 6;
var inCutscene:Bool = false;
override public function create() override public function create()
{ {
// var gameCam:FlxCamera = FlxG.camera; // var gameCam:FlxCamera = FlxG.camera;
@ -753,6 +755,7 @@ class PlayState extends MusicBeatState
{ {
if (dialogueBox != null) if (dialogueBox != null)
{ {
inCutscene = true;
add(dialogueBox); add(dialogueBox);
} }
else else
@ -768,6 +771,8 @@ class PlayState extends MusicBeatState
function startCountdown():Void function startCountdown():Void
{ {
inCutscene = false;
generateStaticArrows(0); generateStaticArrows(0);
generateStaticArrows(1); generateStaticArrows(1);
@ -1512,6 +1517,7 @@ class PlayState extends MusicBeatState
}); });
} }
if (!inCutscene)
keyShit(); keyShit();
// if (FlxG.keys.justPressed.ONE) // if (FlxG.keys.justPressed.ONE)