From f9daa300f557e729384e7ec59d14b3298a079fd7 Mon Sep 17 00:00:00 2001 From: lunarcleint Date: Mon, 14 Oct 2024 18:25:43 -0700 Subject: [PATCH] fix that one stupid bug --- source/funkin/editors/charter/Charter.hx | 6 ++++-- source/funkin/editors/charter/CharterEvent.hx | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 93ec7d28..713c54d6 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -411,12 +411,14 @@ class Charter extends UIState { localEventsBackdrop = new EventBackdrop(false); localEventsBackdrop.x = -localEventsBackdrop.width; - localEventsBackdrop.cameras = [charterCamera]; + // thank you neo for pointing out im stupid -lunar + localEventsBackdrop.cameras = localEventsGroup.cameras = [charterCamera]; localEventsGroup.eventsBackdrop = localEventsBackdrop; globalEventsBackdrop = new EventBackdrop(true); globalEventsBackdrop.x = 0; - globalEventsBackdrop.cameras = [charterCamera]; + // thank you neo for pointing out im stupid -lunar + globalEventsBackdrop.cameras = globalEventsGroup.cameras = [charterCamera]; globalEventsGroup.eventsBackdrop = globalEventsBackdrop; add(gridBackdropDummy = new CameraHoverDummy(gridBackdrops, FlxPoint.weak(1, 0))); diff --git a/source/funkin/editors/charter/CharterEvent.hx b/source/funkin/editors/charter/CharterEvent.hx index bf9f8e2a..e574549c 100644 --- a/source/funkin/editors/charter/CharterEvent.hx +++ b/source/funkin/editors/charter/CharterEvent.hx @@ -31,8 +31,10 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable { public override function update(elapsed:Float) { super.update(elapsed); - if (snappedToGrid && eventsBackdrop != null) - x = eventsBackdrop.x + eventsBackdrop.width - (bWidth = 37 + (icons.length * 22)); + if (snappedToGrid && eventsBackdrop != null) { + bWidth = 37 + (icons.length * 22); + x = eventsBackdrop.x + (global ? 0 : eventsBackdrop.width - bWidth); + } for(k=>i in icons) { i.follow(this, (k * 22) + 30 - (i.width / 2), (bHeight - i.height) / 2); @@ -118,6 +120,7 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable { break; } - x = (snappedToGrid && eventsBackdrop != null ? eventsBackdrop.x : 0) - (bWidth = 37 + (icons.length * 22)); + bWidth = 37 + (icons.length * 22); + x = (snappedToGrid && eventsBackdrop != null && global ? eventsBackdrop.x - bWidth : (global ? 0 : -bWidth)); } } \ No newline at end of file