Skip to content

Commit a296b33

Browse files
committed
Add postUpdate & onCameraMove to Character Scripts
1 parent a3498ce commit a296b33

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

source/funkin/game/Character.hx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
121121
@:noCompletion var isDanceLeftDanceRight:Bool = false;
122122

123123
override function update(elapsed:Float) {
124-
super.update(elapsed);
125124
scripts.call("update", [elapsed]);
125+
126+
super.update(elapsed);
127+
126128
if (stunned) {
127129
__stunnedTime += elapsed;
128130
if (__stunnedTime > Flags.STUNNED_TIME)
@@ -133,6 +135,8 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
133135
tryDance();
134136

135137
__lockAnimThisFrame = false;
138+
139+
scripts.call("postUpdate", [elapsed]);
136140
}
137141

138142
private var danced:Bool = false;

source/funkin/game/PlayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ class PlayState extends MusicBeatState
14641464
public function moveCamera() if (strumLines.members[curCameraTarget] != null) {
14651465
var data:CamPosData = getStrumlineCamPos(curCameraTarget);
14661466
if (data.amount > 0) {
1467-
var event = scripts.event("onCameraMove", EventManager.get(CamMoveEvent).recycle(data.pos, strumLines.members[curCameraTarget], data.amount));
1467+
var event = gameAndCharsEvent("onCameraMove", EventManager.get(CamMoveEvent).recycle(data.pos, strumLines.members[curCameraTarget], data.amount));
14681468
if (!event.cancelled)
14691469
camFollow.setPosition(event.position.x, event.position.y);
14701470
}

0 commit comments

Comments
 (0)