Skip to content

Commit 37eb193

Browse files
authored
Fix Character uses one 'script' instead of multiple 'scripts' (#871)
1 parent 0eeef88 commit 37eb193

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

source/funkin/game/Character.hx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
165165

166166
public function tryDance() {
167167
var event = new CancellableEvent();
168-
script.call("onTryDance", [event]);
168+
scripts.call("onTryDance", [event]);
169169
if (event.cancelled)
170170
return;
171171

@@ -197,7 +197,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
197197
}
198198

199199
public override function measureHit(curMeasure:Int)
200-
script.call("measureHit", [curMeasure]);
200+
scripts.call("measureHit", [curMeasure]);
201201

202202
public override function stepHit(curStep:Int)
203203
scripts.call("stepHit", [curStep]);
@@ -254,13 +254,13 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
254254
public var ghostDraw:Bool = false;
255255
public override function draw() {
256256
var e = EventManager.get(DrawEvent).recycle();
257-
script.call("draw", [e]);
257+
scripts.call("draw", [e]);
258258

259259
preDraw();
260260
super.draw();
261261
postDraw();
262262

263-
script.call("postDraw", [e]);
263+
scripts.call("postDraw", [e]);
264264
}
265265

266266
public var singAnims = ["singLEFT", "singDOWN", "singUP", "singRIGHT"];
@@ -273,15 +273,15 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
273273
public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null<Bool> = null, Reversed:Bool = false, Frame:Int = 0)
274274
{
275275
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
276-
script.call("onPlaySingAnim", [event]);
276+
scripts.call("onPlaySingAnim", [event]);
277277
if (event.cancelled) return;
278278

279279
playSingAnimUnsafe(event.direction, hasAnimation(event.animName) ? event.suffix : "", event.context, event.force, event.reversed, event.frame);
280280
}
281281

282282
public function playSingAnimUnsafe(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, Force:Bool = true, Reversed:Bool = false, Frame:Int = 0) {
283283
var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
284-
script.call("playSingAnimUnsafe", [event]);
284+
scripts.call("playSingAnimUnsafe", [event]);
285285
if (event.cancelled) return;
286286

287287
playAnim(event.animName, event.force, event.context, event.reversed, event.frame);

source/funkin/game/PlayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ class PlayState extends MusicBeatState
643643
public inline function callOnCharacters(func:String, ?parameters:Array<Dynamic>) {
644644
if(strumLines != null) strumLines.forEachAlive(function (strLine:StrumLine) {
645645
if (strLine.characters != null) for (character in strLine.characters)
646-
if (character != null) character.script.call(func, parameters);
646+
if (character != null) character.scripts.call(func, parameters);
647647
});
648648
}
649649

0 commit comments

Comments
 (0)