cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-31 08:57:56 +00:00
Code Issues Releases Wiki Activity

Hashlink actually working!

Browse source
This commit is contained in:
EliteMasterEric 2024-02-13 03:03:11 -05:00
parent fa4b896d9a
commit e37fc09e89
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/InitState.hx
View file

@ -245,9 +245,9 @@ class InitState extends FlxState
#elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard
startLevel(defineLevel(), defineDifficulty());
#elseif FREEPLAY // -DFREEPLAY
FlxG.switchState(new FreeplayState());
FlxG.switchState(() -> new funkin.ui.freeplay.FreeplayState());
#elseif DIALOGUE // -DDIALOGUE
FlxG.switchState(new funkin.ui.debug.dialogue.ConversationDebugState());
FlxG.switchState(() -> new funkin.ui.debug.dialogue.ConversationDebugState());
#elseif ANIMATE // -DANIMATE
FlxG.switchState(() -> new funkin.ui.debug.anim.FlxAnimateTest());
#elseif WAVEFORM // -DWAVEFORM

2
source/funkin/audio/SoundGroup.hx
View file

@ -192,7 +192,7 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
function get_playing():Bool
{
if (getFirstAlive != null) return getFirstAlive().playing;
if (getFirstAlive() != null) return getFirstAlive().playing;
else
return false;
}

10
source/funkin/graphics/shaders/BlendModesShader.hx
View file

@ -4,20 +4,22 @@ import flixel.addons.display.FlxRuntimeShader;
import funkin.Paths;
import openfl.utils.Assets;
import openfl.display.BitmapData;
import openfl.display.ShaderInput;
class BlendModesShader extends FlxRuntimeShader
{
public var camera:BitmapData;
public var camera:ShaderInput<BitmapData>;
public var cameraData:BitmapData;
public function new()
{
super(Assets.getText(Paths.frag('blendModes')));
}
public function setCamera(camera:BitmapData):Void
public function setCamera(cameraData:BitmapData):Void
{
this.camera = camera;
this.cameraData = cameraData;
this.setBitmapData('camera', camera);
this.setBitmapData('camera', this.cameraData);
}
}

2
source/funkin/ui/debug/charting/commands/CopyItemsCommand.hx
View file

@ -138,7 +138,7 @@ class CopyItemsCommand implements ChartEditorCommand
state.txtCopyNotif.y = FlxG.mouse.y - 16;
FlxTween.tween(state.txtCopyNotif, {y: state.txtCopyNotif.y - 32}, 0.5,
{
type: FlxTween.ONESHOT,
type: FlxTweenType.ONESHOT,
ease: FlxEase.quadOut,
onComplete: function(_) {
state.txtCopyNotif.visible = false;

4
source/funkin/ui/story/StoryMenuState.hx
View file

@ -509,10 +509,10 @@ class StoryMenuState extends MusicBeatState
// super.dispatchEvent(event) dispatches event to module scripts.
super.dispatchEvent(event);
if (levelProps != null && levelProps.length > 0)
if (levelProps?.members != null && levelProps.members.length > 0)
{
// Dispatch event to props.
for (prop in levelProps)
for (prop in levelProps.members)
{
ScriptEventDispatcher.callEvent(prop, event);
}