Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-03-22 21:06:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/scripted-modules' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-modules

Browse source
This commit is contained in:
Eric Myllyoja 2022-04-18 19:36:18 -04:00
commit d5d1c0ae95
2 changed files with 9 additions and 7 deletions
source/funkin
animate
ParseAnimate.hx
play
VanillaCutscenes.hx

2
source/funkin/animate/ParseAnimate.hx
View file

@ -4,7 +4,9 @@ import haxe.format.JsonParser;
import openfl.Assets;
import openfl.geom.Matrix3D;
import openfl.geom.Matrix;
#if sys
import sys.io.File;
#end
/**
* Generally designed / written in a way that can be easily taken out of FNF and used elsewhere

14
source/funkin/play/VanillaCutscenes.hx
View file

@ -1,11 +1,11 @@
package funkin.play;
import flixel.util.FlxTimer;
import flixel.tweens.FlxTween;
import flixel.tweens.FlxTween;
import flixel.tweens.FlxEase;
import flixel.util.FlxColor;
import flixel.FlxSprite;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
/**
* Static methods for playing cutscenes in the PlayState.
@ -44,8 +44,8 @@ class VanillaCutscenes
PlayState.instance.add(blackScreen);
#if html5
vid:FlxVideo = new FlxVideo(path);
vid.finishCallback = finishVideoCutscene();
var vid:FlxVideo = new FlxVideo(path);
vid.finishCallback = finishVideoCutscene;
#else
finishVideoCutscene();
#end