Skip to content

Commit 8bab844

Browse files
authored
Fix Sustain Clipping
1 parent fb90e2d commit 8bab844

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

source/funkin/game/Strum.hx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class Strum extends FlxSprite {
121121
public override function update(elapsed:Float) {
122122
super.update(elapsed);
123123
if (cpu) {
124-
if (lastHit + (Conductor.crochet / 2) < Conductor.songPosition && getAnim() == "confirm") {
124+
if (lastHit + (Conductor.crochet * 0.5) < Conductor.songPosition && getAnim() == "confirm") {
125125
playAnim("static");
126126
}
127127
}
@@ -133,7 +133,7 @@ class Strum extends FlxSprite {
133133
}
134134

135135
@:noCompletion public static inline final PIX180:Float = 565.4866776461628; // 180 * Math.PI
136-
@:noCompletion public static final N_WIDTHDIV2:Float = Note.swagWidth / 2;
136+
@:noCompletion public static final N_WIDTHDIV2:Float = Note.swagWidth / 2; // DEPRECATED
137137

138138
/**
139139
* Updates the position of a note.
@@ -162,16 +162,16 @@ class Strum extends FlxSprite {
162162

163163
if (shouldX || shouldY) {
164164
if (daNote.strumRelativePos) {
165-
if (shouldX) daNote.x = (this.width - daNote.width) / 2;
165+
if (shouldX) daNote.x = (this.width - daNote.width) * 0.5;
166166
if (shouldY) {
167167
daNote.y = (daNote.strumTime - Conductor.songPosition) * (0.45 * CoolUtil.quantize(getScrollSpeed(daNote), 100));
168-
if (daNote.isSustainNote) daNote.y += N_WIDTHDIV2;
168+
if (daNote.isSustainNote) daNote.y += height * 0.5;
169169
}
170170
} else {
171171
var offset = FlxPoint.get(0, (Conductor.songPosition - daNote.strumTime) * (0.45 * CoolUtil.quantize(getScrollSpeed(daNote), 100)));
172172
var realOffset = FlxPoint.get(0, 0);
173173

174-
if (daNote.isSustainNote) offset.y -= N_WIDTHDIV2;
174+
if (daNote.isSustainNote) offset.y -= height * 0.5;
175175

176176
if (Std.int(daNote.__noteAngle % 360) != 0) {
177177
var noteAngleCos = FlxMath.fastCos(daNote.__noteAngle / PIX180);
@@ -257,4 +257,4 @@ class Strum extends FlxSprite {
257257
public inline function getAnim() {
258258
return animation.name;
259259
}
260-
}
260+
}

0 commit comments

Comments
 (0)