gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Character uses one 'script' instead of multiple 'scripts' (#871)

Browse Source
This commit is contained in:
💜 Rodney, An Imaginative Furball 💙
2026-02-03 12:30:08 +07:00
committed by GitHub
parent 0eeef88ac7
commit 37eb193e53
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/game/Character.hx
+6 -6
View File
@@ -165,7 +165,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public function tryDance() {
var event = new CancellableEvent();
script.call("onTryDance", [event]);
scripts.call("onTryDance", [event]);
if (event.cancelled)
return;
@@ -197,7 +197,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
}
public override function measureHit(curMeasure:Int)
script.call("measureHit", [curMeasure]);
scripts.call("measureHit", [curMeasure]);
public override function stepHit(curStep:Int)
scripts.call("stepHit", [curStep]);
@@ -254,13 +254,13 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public var ghostDraw:Bool = false;
public override function draw() {
var e = EventManager.get(DrawEvent).recycle();
script.call("draw", [e]);
scripts.call("draw", [e]);
preDraw();
super.draw();
postDraw();
script.call("postDraw", [e]);
scripts.call("postDraw", [e]);
}
public var singAnims = ["singLEFT", "singDOWN", "singUP", "singRIGHT"];
@@ -273,7 +273,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null<Bool> = null, Reversed:Bool = false, Frame:Int = 0)
{
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
script.call("onPlaySingAnim", [event]);
scripts.call("onPlaySingAnim", [event]);
if (event.cancelled) return;
playSingAnimUnsafe(event.direction, hasAnimation(event.animName) ? event.suffix : "", event.context, event.force, event.reversed, event.frame);
@@ -281,7 +281,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public function playSingAnimUnsafe(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, Force:Bool = true, Reversed:Bool = false, Frame:Int = 0) {
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
script.call("playSingAnimUnsafe", [event]);
scripts.call("playSingAnimUnsafe", [event]);
if (event.cancelled) return;
playAnim(event.animName, event.force, event.context, event.reversed, event.frame);
source/funkin/game/PlayState.hx
+1 -1
View File
@@ -643,7 +643,7 @@ class PlayState extends MusicBeatState
public inline function callOnCharacters(func:String, ?parameters:Array<Dynamic>) {
if(strumLines != null) strumLines.forEachAlive(function (strLine:StrumLine) {
if (strLine.characters != null) for (character in strLine.characters)
if (character != null) character.script.call(func, parameters);
if (character != null) character.scripts.call(func, parameters);
});
}